diff options
| -rw-r--r-- | apt/package.py | 10 | ||||
| -rw-r--r-- | debian/changelog | 47 | ||||
| -rw-r--r-- | debian/control | 34 | ||||
| -rw-r--r-- | debian/python-apt-common.lintian-overrides | 2 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | debian/source/format | 1 | ||||
| -rw-r--r-- | doc/source/library/apt.progress.base.rst | 6 | ||||
| -rw-r--r-- | doc/source/library/apt_pkg.rst | 2 | ||||
| -rw-r--r-- | doc/source/tutorials/contributing.rst | 6 | ||||
| -rw-r--r-- | po/eo.po | 485 | ||||
| -rw-r--r-- | po/urd.po | 495 | ||||
| -rw-r--r-- | python/arfile.cc | 52 | ||||
| -rw-r--r-- | python/cdrom.cc | 2 | ||||
| -rw-r--r-- | python/pkgmanager.cc | 12 | ||||
| -rw-r--r-- | tests/data/test_debs/data-tar-broken.deb | bin | 0 -> 626 bytes | |||
| -rw-r--r-- | tests/test_aptsources.py | 3 | ||||
| -rw-r--r-- | tests/test_aptsources_ports.py | 4 | ||||
| -rw-r--r-- | tests/test_debfile.py | 6 | ||||
| -rwxr-xr-x | utils/get_debian_mirrors.py | 5 |
19 files changed, 441 insertions, 733 deletions
diff --git a/apt/package.py b/apt/package.py index 14e80594..9223ed22 100644 --- a/apt/package.py +++ b/apt/package.py @@ -343,7 +343,7 @@ class Version(object): def description(self): """Return the formatted long description. - Return the formated long description according to the Debian policy + Return the formatted long description according to the Debian policy (Chapter 5.6.13). See http://www.debian.org/doc/debian-policy/ch-controlfields.html for more information. @@ -892,7 +892,7 @@ class Package(object): def description(self): """Return the formatted long description. - Return the formated long description according to the Debian policy + Return the formatted long description according to the Debian policy (Chapter 5.6.13). See http://www.debian.org/doc/debian-policy/ch-controlfields.html for more information. @@ -1142,7 +1142,7 @@ class Package(object): return u"" # Read changelog line by line line_raw = changelog_file.readline() - if line_raw == "": + if not line_raw: break # The changelog is encoded in utf-8, but since there isn't # any http header, urllib2 seems to treat it as ascii @@ -1360,8 +1360,8 @@ def _test(): print "SourcePkg: %s " % pkg.candidate.source_name print "Section: %s " % pkg.section print "Summary: %s" % pkg.candidate.summary - print "Description (formated) :\n%s" % pkg.candidate.description - print "Description (unformated):\n%s" % pkg.candidate.raw_description + print "Description (formatted) :\n%s" % pkg.candidate.description + print "Description (unformatted):\n%s" % pkg.candidate.raw_description print "InstalledSize: %s " % pkg.candidate.installed_size print "PackageSize: %s " % pkg.candidate.size print "Dependencies: %s" % pkg.installed.dependencies diff --git a/debian/changelog b/debian/changelog index 48ef958d..02fb2a9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,50 @@ +python-apt (0.8.1ubuntu1) UNRELEASED; urgency=low + + * merged from the debian/sid bzr branch + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 01 Aug 2011 09:29:06 +0200 + +python-apt (0.8.1) UNRELEASED; urgency=low + + [ Julian Andres Klode ] + * Breaks: debsecan (<< 0.4.15) [not only << 0.4.14] (Closes: #629512) + + [ Michael Vogt ] + * python/arfile.cc: + - use APT::Configuration::getCompressionTypes() instead of duplicating + the supported methods here + * tests/test_debfile.py: + - add test for raise on unknown data.tar.xxx + * tests/test_aptsources_ports.py, tests/test_aptsources.py: + - use tmpdir during the tests to fix test failure with apt from + experimental + + -- Julian Andres Klode <jak@debian.org> Tue, 07 Jun 2011 14:00:22 +0200 + +python-apt (0.8.0) unstable; urgency=low + + * Upload to unstable + + [ Julian Andres Klode ] + * Increase Breaks for update-notifier to 0.99.3debian9 + * utils/get_debian_mirrors.py: Adjust for new Alioth SCM urls + * debian/control: Standards-Version 3.9.2 + * Fix Lintian overrides + * Fix spelling errors reported by Lintian (sep[a->e]rated, overrid[d]en) + * po/urd.po: Remove, ur.po is the correct file + * debian/source/format: Add, set it to "3.0 (native)" + + [ Tshepang Lekhonkhobe ] + * Fix get_changelog in Python 3 (Closes: #626532) + * apt/package.py: fix a few typos [formated->formatted] (Closes: #597054) + * doc/source/tutorials/contributing.rst: minor improvements (Closes: #625225) + - one typo [2to => 2to3], one broken link [pep8.py link] + + [ Translation updates ] + * Esperanto (Closes: #626430) + + -- Julian Andres Klode <jak@debian.org> Fri, 27 May 2011 16:12:46 +0200 + python-apt (0.8.0~exp4ubuntu2) UNRELEASED; urgency=low * add missing bits for the xz compression support for the diff --git a/debian/control b/debian/control index 8969af63..2945e1b3 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: standard Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com> XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org> Uploaders: Michael Vogt <mvo@debian.org>, Julian Andres Klode <jak@debian.org> -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 XS-Python-Version: >= 2.6 X-Python3-Version: >= 3.1 Build-Depends: apt-utils, @@ -23,8 +23,36 @@ XS-Debian-Vcs-Browser: http://bzr.debian.org/loggerhead/apt/python-apt/debian-si Package: python-apt Architecture: any Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-apt-common -Recommends: lsb-release, iso-codes -Breaks: debdelta (<< 0.28~), packagekit-backend-apt (<= 0.4.8-0ubuntu4) +Recommends: lsb-release, iso-codes, python2.6 +Breaks: packagekit-backend-apt (<= 0.4.8-0ubuntu4), + computer-janitor (<< 1.14.1-1+), + debdelta (<< 0.41+), + python-dogtail (<< 0.6.1-3.1+), + python-debian (<< 0.1.18+), + python-software-properties (<< 0.70.debian-1+), + aptdaemon (<< 0.11+bzr343-1~), + apt-forktracer (<< 0.3), + apt-listchanges (<< 2.85), + aptoncd (<< 0.1.98+bzr117), + apt-p2p (<< 0.1.6), + apt-xapian-index (<< 0.25), + bcfg2 (<< 1.0.1), + bzr-builddeb (<< 2.4), + debpartial-mirror (<< 0.2.98), + debsecan (<< 0.4.15), + gdebi (<< 0.6.1), + germinate (<< 1.21), + gnome-codec-install (<< 0.4.5), + mini-dinstall (<< 0.6.28), + python-cdd (<< 0.0.10), + rebuildd (<< 0.3.9), + software-center (<< 1.1.21debian2), + tla-buildpackage (<< 0.9.14), + ubuntu-dev-tools (<< 0.93debian1), + unattended-upgrades (<< 0.42debian2), + update-manager (<< 0.200.2-1), + update-notifier (<< 0.99.3debian9), + wajig (<< 2.0.46) Provides: ${python:Provides} Suggests: python-apt-dbg, python-gtk2, python-vte, python-apt-doc XB-Python-Version: ${python:Versions} diff --git a/debian/python-apt-common.lintian-overrides b/debian/python-apt-common.lintian-overrides index 3ae30560..f0eddf6b 100644 --- a/debian/python-apt-common.lintian-overrides +++ b/debian/python-apt-common.lintian-overrides @@ -1,2 +1,2 @@ # package depends on python | python3 -python-script-but-no-python-dep ./usr/share/python-apt/migrate-0.8.py +python-script-but-no-python-dep usr/share/python-apt/migrate-0.8.py diff --git a/debian/rules b/debian/rules index a85d1eb2..5f1132f1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,9 @@ #!/usr/bin/make -f # Should be include-links, but that somehow fails. export DEBVER=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') + export CFLAGS=-Wno-write-strings -DCOMPAT_0_7 + export PATH := $(CURDIR)/utils:$(PATH) export pyversions := $(CURDIR)/utils/pyversions diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..89ae9db8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/doc/source/library/apt.progress.base.rst b/doc/source/library/apt.progress.base.rst index 3fd2a7a0..22006f77 100644 --- a/doc/source/library/apt.progress.base.rst +++ b/doc/source/library/apt.progress.base.rst @@ -233,7 +233,7 @@ InstallProgress (Abstract) Called when a error is detected during the install. - The following method should be overriden to implement progress reporting + The following method should be overridden to implement progress reporting for dpkg-based runs i.e. calls to :meth:`run` with a filename: .. method:: processing(pkg, stage) @@ -252,7 +252,7 @@ InstallProgress file (:file:`/var/lib/dpkg/status`) and documented in :manpage:`dpkg(1)`. - The following methods should be overriden to implement progress reporting + The following methods should be overridden to implement progress reporting for :meth:`run` calls with an :class:`apt_pkg.PackageManager` object as their parameter: @@ -274,7 +274,7 @@ InstallProgress This method is called when all changes have been applied. There are also several methods which are fully implemented and should not - be overriden by subclasses unless the subclass has very special needs: + be overridden by subclasses unless the subclass has very special needs: .. method:: fork() -> int diff --git a/doc/source/library/apt_pkg.rst b/doc/source/library/apt_pkg.rst index 81f2d408..ffef9c50 100644 --- a/doc/source/library/apt_pkg.rst +++ b/doc/source/library/apt_pkg.rst @@ -45,7 +45,7 @@ Working with the cache .. note:: - The cache supports colon-seperated name:architecture pairs. For + The cache supports colon-separated name:architecture pairs. For normal architectures, they are equal to a (name, architecture) tuple. For the the "any" architecture behavior is different, as "name:any" is equivalent to ("name:any", "any"). This is done so diff --git a/doc/source/tutorials/contributing.rst b/doc/source/tutorials/contributing.rst index 0735982b..aae7f382 100644 --- a/doc/source/tutorials/contributing.rst +++ b/doc/source/tutorials/contributing.rst @@ -232,12 +232,12 @@ The coding style for all code written in python is :PEP:`8`. Exceptions from this rule are the documentation, where code is sometimes formatted differently to explain aspects, and functions provided for 0.7 compatibility purposes. -When writing code, use tools like pylint, pyflakes, pychecker and pep8.py from -http://svn.browsershots.org/trunk/devtools/pep8/ to verify that your code is +When writing code, use tools like pylint, pyflakes, pychecker and pep8.py +(all available from Debian/Ubuntu) to verify that your code is OK. Fix all the problems which seem reasonable, and mention the unfixed issues when asking for merge. -In order to make the automatic generation of Python 3 code using 2to possible, +In order to make the automatic generation of Python 3 code using 2to3 possible, code written in Python may not utilize any functionality unsupported by 2to3 or deprecated as of Python 2.6. @@ -1,272 +1,329 @@ # Esperanto translation for update-manager -# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006 +# Copyright (c) 2006 Canonical Ltd, and Rosetta Contributors 2006 # This file is distributed under the same license as the update-manager package. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2006. +# Ed GLEZ <herzo2@gmail.com>, 2006. +# Aisano < >, 2010. +# Patrick (Petriko) OUDEJANS < >, 2010. +# Roĉjo HUURMAN < >, 2010. +# Michael MORONI < >, 2009, 2011. +# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2011. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" -"PO-Revision-Date: 2006-10-16 04:05+0000\n" -"Last-Translator: Ed Glez <herzo2@gmail.com>\n" -"Language-Team: Esperanto <eo@li.org>\n" +"POT-Creation-Date: 2011-05-27 15:56+0200\n" +"PO-Revision-Date: 2011-05-09 16:09+0200\n" +"Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\n" +"Language-Team: Esperanto <ubuntu-l10n-eo@lists.launchpad.net>\n" +"Language: eo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1\n" +"X-Launchpad-Export-Date: 2011-05-09 14:00+0000\n" +"X-Generator: Launchpad (build 12981)\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" #. ChangelogURI #: ../data/templates/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Ubuntu.info.in:13 -msgid "Ubuntu 9.10 'Karmic Koala'" -msgstr "" +msgid "Ubuntu 10.10 'Maverick Meerkat'" +msgstr "Ubuntu 10.10 'Maverick Meerkat'" #. Description #: ../data/templates/Ubuntu.info.in:31 +msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" +msgstr "KD kun Ubuntu 10.10 'Maverick Meerkat'" + +#. Description +#: ../data/templates/Ubuntu.info.in:43 +msgid "Canonical Partners" +msgstr "Partneroj de Canonical" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:45 +msgid "Software packaged by Canonical for their partners" +msgstr "Programaro pakita de Canonical por iliaj partneroj" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:46 +msgid "This software is not part of Ubuntu." +msgstr "Tiuj ĉi programoj ne estas parto de Ubuntu." + +#. Description +#: ../data/templates/Ubuntu.info.in:53 +msgid "Independent" +msgstr "Sendepende" + +#. CompDescription +#: ../data/templates/Ubuntu.info.in:55 +msgid "Provided by third-party software developers" +msgstr "Ofertitaj de aliaj programistoj kaj firmaoj" + +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:56 +msgid "Software offered by third party developers." +msgstr "Programoj ofertitaj de aliaj programistoj kaj firmaoj" + +#. Description +#: ../data/templates/Ubuntu.info.in:94 +msgid "Ubuntu 10.04 'Lucid Lynx'" +msgstr "Ubuntu 10.04 'Lucid Lynx'" + +#. Description +#: ../data/templates/Ubuntu.info.in:112 +msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" +msgstr "KD kun Ubuntu 10.04 'Lucid Lynx'" + +#. Description +#: ../data/templates/Ubuntu.info.in:155 +msgid "Ubuntu 9.10 'Karmic Koala'" +msgstr "Ubuntu 9.10 'Karmic Koala'" + +#. Description +#: ../data/templates/Ubuntu.info.in:173 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "" +msgstr "KD kun Ubuntu 9.10 'Karmic Koala'" #. Description -#: ../data/templates/Ubuntu.info.in:74 +#: ../data/templates/Ubuntu.info.in:216 msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" +msgstr "Ubuntu 9.04 'Jaunty Jackalope'" #. Description -#: ../data/templates/Ubuntu.info.in:92 +#: ../data/templates/Ubuntu.info.in:234 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" +msgstr "KD kun Ubuntu 9.04 'Jaunty Jackalope'" #. Description -#: ../data/templates/Ubuntu.info.in:135 +#: ../data/templates/Ubuntu.info.in:277 msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" +msgstr "Ubuntu 8.10 'Intrepid Ibex'" #. Description -#: ../data/templates/Ubuntu.info.in:153 +#: ../data/templates/Ubuntu.info.in:295 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" +msgstr "KD kun Ubuntu 8.10 'Intrepid Ibex'" #. Description -#: ../data/templates/Ubuntu.info.in:197 +#: ../data/templates/Ubuntu.info.in:339 msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "" +msgstr "Ubuntu 8.04 'Hardy Heron'" #. Description -#: ../data/templates/Ubuntu.info.in:215 +#: ../data/templates/Ubuntu.info.in:357 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "" +msgstr "KD kun Ubuntu 8.04 'Hardy Heron'" #. Description -#: ../data/templates/Ubuntu.info.in:252 +#: ../data/templates/Ubuntu.info.in:402 msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" +msgstr "Ubuntu 7.10 'Gutsy Gibbon'" #. Description -#: ../data/templates/Ubuntu.info.in:270 +#: ../data/templates/Ubuntu.info.in:420 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" +msgstr "KD kun Ubuntu 7.10 'Gutsy Gibbon'" #. Description -#: ../data/templates/Ubuntu.info.in:305 +#: ../data/templates/Ubuntu.info.in:465 msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "" +msgstr "Ubuntu 7.04 'Feisty Fawn'" #. Description -#: ../data/templates/Ubuntu.info.in:323 +#: ../data/templates/Ubuntu.info.in:483 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "" +msgstr "KD kun Ubuntu 7.04 'Feisty Fawn'" #. Description -#: ../data/templates/Ubuntu.info.in:357 +#: ../data/templates/Ubuntu.info.in:525 msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "" +msgstr "Ubuntu 6.10 'Edgy Eft'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:362 +#: ../data/templates/Ubuntu.info.in:530 msgid "Community-maintained" -msgstr "" +msgstr "Komunume prizorgata" #. CompDescription -#: ../data/templates/Ubuntu.info.in:368 +#: ../data/templates/Ubuntu.info.in:536 msgid "Restricted software" -msgstr "" +msgstr "Limigita programaro" #. Description -#: ../data/templates/Ubuntu.info.in:375 +#: ../data/templates/Ubuntu.info.in:543 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "" +msgstr "KD kun Ubuntu 6.10 'Edgy Eft'" #. Description -#: ../data/templates/Ubuntu.info.in:409 +#: ../data/templates/Ubuntu.info.in:585 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" +msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 +#: ../data/templates/Ubuntu.info.in:588 msgid "Canonical-supported Open Source software" -msgstr "" +msgstr "Malfermitkoda programaro subtenata de Canonical" #. CompDescription -#: ../data/templates/Ubuntu.info.in:414 +#: ../data/templates/Ubuntu.info.in:590 msgid "Community-maintained (universe)" -msgstr "" +msgstr "Komunume prizorgata (universo)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 +#: ../data/templates/Ubuntu.info.in:591 msgid "Community-maintained Open Source software" -msgstr "" +msgstr "Komunume prizorgata malfermitkoda programaro" #. CompDescription -#: ../data/templates/Ubuntu.info.in:417 +#: ../data/templates/Ubuntu.info.in:593 msgid "Non-free drivers" -msgstr "" +msgstr "Neliberaj peliloj" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 +#: ../data/templates/Ubuntu.info.in:594 msgid "Proprietary drivers for devices" -msgstr "" +msgstr "Fermitkoda peliloj por aparatoj" #. CompDescription -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:596 msgid "Restricted software (Multiverse)" -msgstr "" +msgstr "Limigita programaro (multiverso)" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 +#: ../data/templates/Ubuntu.info.in:597 msgid "Software restricted by copyright or legal issues" -msgstr "" +msgstr "Programaro limigita per kopirajto aŭ leĝaj temoj" #. Description -#: ../data/templates/Ubuntu.info.in:427 +#: ../data/templates/Ubuntu.info.in:603 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" +msgstr "KD kun Ubuntu 6.06 LTS 'Dapper Drake'" #. Description -#: ../data/templates/Ubuntu.info.in:439 +#: ../data/templates/Ubuntu.info.in:619 msgid "Important security updates" -msgstr "" +msgstr "Gravaj sekurecaj ĝisdatigoj" #. Description -#: ../data/templates/Ubuntu.info.in:444 +#: ../data/templates/Ubuntu.info.in:624 msgid "Recommended updates" -msgstr "" +msgstr "Rekomenditaj ĝisdatigoj" #. Description -#: ../data/templates/Ubuntu.info.in:449 +#: ../data/templates/Ubuntu.info.in:629 msgid "Pre-released updates" -msgstr "" +msgstr "Antaŭ-eldonataj ĝisdatigoj" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:634 msgid "Unsupported updates" -msgstr "" +msgstr "Nesubtenataj ĝisdatigoj" #. Description -#: ../data/templates/Ubuntu.info.in:461 +#: ../data/templates/Ubuntu.info.in:645 msgid "Ubuntu 5.10 'Breezy Badger'" -msgstr "" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:475 +#: ../data/templates/Ubuntu.info.in:659 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "" +msgstr "KD kun Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/templates/Ubuntu.info.in:487 +#: ../data/templates/Ubuntu.info.in:675 msgid "Ubuntu 5.10 Security Updates" -msgstr "" +msgstr "Ubuntu 5.10 Sekurecaj ĝisdatigoj" #. Description -#: ../data/templates/Ubuntu.info.in:492 +#: ../data/templates/Ubuntu.info.in:680 msgid "Ubuntu 5.10 Updates" -msgstr "" +msgstr "Ubuntu 5.10 Ĝisdatigoj" #. Description -#: ../data/templates/Ubuntu.info.in:497 +#: ../data/templates/Ubuntu.info.in:685 msgid "Ubuntu 5.10 Backports" -msgstr "" +msgstr "Ubuntu 5.10 Retroportoj" #. Description -#: ../data/templates/Ubuntu.info.in:504 +#: ../data/templates/Ubuntu.info.in:696 msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" +msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description -#: ../data/templates/Ubuntu.info.in:518 +#: ../data/templates/Ubuntu.info.in:710 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" +msgstr "KD kun Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:713 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "Oficiale subtenata" #. Description -#: ../data/templates/Ubuntu.info.in:530 +#: ../data/templates/Ubuntu.info.in:726 msgid "Ubuntu 5.04 Security Updates" -msgstr "" +msgstr "Ubuntu 5.04 Sekurecaj ĝisdatigoj" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:731 msgid "Ubuntu 5.04 Updates" -msgstr "" +msgstr "Ubuntu 5.04 Ĝisdatigoj" #. Description -#: ../data/templates/Ubuntu.info.in:540 +#: ../data/templates/Ubuntu.info.in:736 msgid "Ubuntu 5.04 Backports" -msgstr "" +msgstr "Ubuntu 5.04 Retroportoj" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:742 msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "" +msgstr "Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:552 +#: ../data/templates/Ubuntu.info.in:748 msgid "Community-maintained (Universe)" -msgstr "" +msgstr "Komunume flegata (univreso)" #. CompDescription -#: ../data/templates/Ubuntu.info.in:554 +#: ../data/templates/Ubuntu.info.in:750 msgid "Non-free (Multiverse)" -msgstr "" +msgstr "Mallibere (Multiverse)" #. Description -#: ../data/templates/Ubuntu.info.in:560 +#: ../data/templates/Ubuntu.info.in:756 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "" +msgstr "KD kun Ubuntu 4.10 'Warty Warthog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:563 +#: ../data/templates/Ubuntu.info.in:759 msgid "No longer officially supported" -msgstr "" +msgstr "Ne plu oficiale subtenata" #. CompDescription -#: ../data/templates/Ubuntu.info.in:565 +#: ../data/templates/Ubuntu.info.in:761 msgid "Restricted copyright" -msgstr "" +msgstr "Limigita kopirajto" #. Description -#: ../data/templates/Ubuntu.info.in:572 +#: ../data/templates/Ubuntu.info.in:768 msgid "Ubuntu 4.10 Security Updates" -msgstr "" +msgstr "Ubuntu 4.10 Sekurecaj ĝisdatigoj" #. Description -#: ../data/templates/Ubuntu.info.in:577 +#: ../data/templates/Ubuntu.info.in:773 msgid "Ubuntu 4.10 Updates" -msgstr "" +msgstr "Ubuntu 4.10 Ĝisdatigoj" #. Description -#: ../data/templates/Ubuntu.info.in:582 +#: ../data/templates/Ubuntu.info.in:778 msgid "Ubuntu 4.10 Backports" -msgstr "" +msgstr "Ubuntu 4.10 Retroportoj" #. ChangelogURI #: ../data/templates/Debian.info.in.h:4 @@ -276,114 +333,110 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Debian.info.in:8 -#, fuzzy msgid "Debian 6.0 'Squeeze' " -msgstr "Debian 3.1 \"Sarge\"" +msgstr "Debiano 6.0 'Squeeze' " #. Description #: ../data/templates/Debian.info.in:33 -#, fuzzy msgid "Debian 5.0 'Lenny' " -msgstr "Debian 3.1 \"Sarge\"" +msgstr "Debiano 5.0 'Lenny' " #. Description #: ../data/templates/Debian.info.in:58 -#, fuzzy msgid "Debian 4.0 'Etch'" -msgstr "Debian 3.1 \"Sarge\"" +msgstr "Debiano 4.0 'Etch'" #. Description #: ../data/templates/Debian.info.in:83 -#, fuzzy msgid "Debian 3.1 'Sarge'" -msgstr "Debian 3.1 \"Sarge\"" +msgstr "Debiano 3.1 'Sarge'" #. Description #: ../data/templates/Debian.info.in:94 msgid "Proposed updates" -msgstr "" +msgstr "Proponitaj ĝisdatigoj" #. Description #: ../data/templates/Debian.info.in:101 msgid "Security updates" -msgstr "" +msgstr "Sekurecaj ĝisdatigoj" #. Description #: ../data/templates/Debian.info.in:108 msgid "Debian current stable release" -msgstr "" +msgstr "Debiana aktuala stabila eldono" #. Description #: ../data/templates/Debian.info.in:121 msgid "Debian testing" -msgstr "" +msgstr "Debiana testado" #. Description -#: ../data/templates/Debian.info.in:146 +#: ../data/templates/Debian.info.in:147 msgid "Debian 'Sid' (unstable)" -msgstr "" +msgstr "Debiano 'Sid' (nestabile)" #. CompDescription -#: ../data/templates/Debian.info.in:150 +#: ../data/templates/Debian.info.in:151 msgid "DFSG-compatible Software with Non-Free Dependencies" -msgstr "" +msgstr "DFSG-kongrua programaro kun malliberaj dependecoj" #. CompDescription -#: ../data/templates/Debian.info.in:152 +#: ../data/templates/Debian.info.in:153 msgid "Non-DFSG-compatible Software" -msgstr "" +msgstr "Ne-DFSG-kongruaj programaroj" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:209 ../aptsources/distro.py:427 #, python-format msgid "Server for %s" -msgstr "" +msgstr "Servilo por %s" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 +#: ../aptsources/distro.py:227 ../aptsources/distro.py:233 +#: ../aptsources/distro.py:249 msgid "Main server" -msgstr "" +msgstr "Ĉefa servilo" -#: ../aptsources/distro.py:252 +#: ../aptsources/distro.py:253 msgid "Custom servers" -msgstr "" +msgstr "Propraj serviloj" -#: ../apt/progress/gtk2.py:259 +#: ../apt/progress/gtk2.py:260 ../apt/progress/gtk2.py:316 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "" +msgstr "Elŝutante dosieron %(current)li sur %(total)li per %(speed)s/s" -#: ../apt/progress/gtk2.py:265 +#: ../apt/progress/gtk2.py:266 ../apt/progress/gtk2.py:322 #, python-format msgid "Downloading file %(current)li of %(total)li" -msgstr "" +msgstr "Elŝutante dosieron %(current)li sur %(total)li" #. Setup some child widgets -#: ../apt/progress/gtk2.py:285 +#: ../apt/progress/gtk2.py:342 msgid "Details" msgstr "Detaloj" -#: ../apt/progress/gtk2.py:367 +#: ../apt/progress/gtk2.py:430 msgid "Starting..." -msgstr "" +msgstr "Komencante..." -#: ../apt/progress/gtk2.py:373 +#: ../apt/progress/gtk2.py:436 msgid "Complete" -msgstr "" +msgstr "Komplete" -#: ../apt/package.py:301 +#: ../apt/package.py:358 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." -msgstr "" +msgstr "Nevalida unikodaĵo en priskribo por '%s' (%s). Bonvolu raporti." -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:1065 ../apt/package.py:1171 msgid "The list of changes is not available" -msgstr "" +msgstr "La listo de ŝanĝoj ne haveblas" -#: ../apt/package.py:1047 +#: ../apt/package.py:1177 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -391,109 +444,161 @@ msgid "" "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "until the changes become available or try again later." msgstr "" +"La listo de ŝanĝoj ankoraŭ ne haveblas.\n" +"\n" +"Bonvolu uzi http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" +"ĝis kiam la ŝanĝoj havebliĝos aŭ poste reklopodi." -#: ../apt/package.py:1053 -#, fuzzy +#: ../apt/package.py:1184 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." -msgstr "Bonvolu kontroli vian interretan konekton." +msgstr "" +"Malsukcesis elŝuti la liston de ŝanĝoj. \n" +"Bonvolu kontroli vian interretan konekton." -#: ../apt/debfile.py:56 +#: ../apt/debfile.py:82 #, python-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "" +msgid "List of files for '%s' could not be read" +msgstr "Listo de dosieroj de '%s' ne legeblis" + +#: ../apt/debfile.py:167 +#, python-format +msgid "Dependency is not satisfiable: %s\n" +msgstr "Dependeco ne plenumita: %s\n" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:188 #, python-format -msgid "List of files for '%s'could not be read" +msgid "Conflicts with the installed package '%s'" +msgstr "Konfliktas kun la instalita pakaĵo '%s'" + +#. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation +#: ../apt/debfile.py:327 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" msgstr "" +"Malfunkciigas la ekzistantan pakaĵon '%(pkgname)s' dependaĵo %(depname)s " +"(%(deprelation)s %(depversion)s)" -#: ../apt/debfile.py:149 +#. TRANSLATORS: the first '%s' is the package that conflicts, the second the packagename that it conflicts with (so the name of the deb the user tries to install), the third is the relation (e.g. >=) and the last is the version for the relation +#: ../apt/debfile.py:343 #, python-format -msgid "Dependency is not satisfiable: %s\n" +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" msgstr "" +"Malfunkciigas la ekzistantan pakaĵon '%(pkgname)s' konflikto: %(targetpkg)s " +"(%(comptype)s %(targetver)s)" -#: ../apt/debfile.py:173 +#: ../apt/debfile.py:353 #, python-format -msgid "Conflicts with the installed package '%s'" +msgid "" +"Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But " +"the '%(debfile)s' provides it via: '%(provides)s'" msgstr "" +"Malfunkciigas la ekzistantan pakaĵon '%(pkgname)s' kiu konfliktas kun: " +"'%(targetpkg)s'. Sed la '%(debfile)s' ofertas ĝin per: '%(provides)s'" + +#: ../apt/debfile.py:399 +msgid "No Architecture field in the package" +msgstr "Neniu arĥitekturo-kampo en la pakaĵo" -#: ../apt/debfile.py:319 +#: ../apt/debfile.py:404 #, python-format msgid "Wrong architecture '%s'" -msgstr "" +msgstr "Malkorekta arĥitekturo: '%s'" #. the deb is older than the installed -#: ../apt/debfile.py:325 +#: ../apt/debfile.py:411 msgid "A later version is already installed" -msgstr "" +msgstr "Pli nova versio estas jam instalita" -#: ../apt/debfile.py:345 +#: ../apt/debfile.py:436 msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" +msgstr "Fiaskis plenumi ĉiujn dependecojn (difektita kaŝmemoro)" -#: ../apt/debfile.py:376 -#, fuzzy, python-format +#: ../apt/debfile.py:466 +#, python-format msgid "Cannot install '%s'" -msgstr "Ne eblis instalo de '%s'" +msgstr "Ne instaleblas '%s'" -#: ../apt/debfile.py:484 +#: ../apt/debfile.py:508 +msgid "Python-debian module not available" +msgstr "Modulo Python-debian ne haveblas" + +#: ../apt/debfile.py:542 +msgid "" +"Automatically decompressed:\n" +"\n" +msgstr "" +"Aŭtomate malpakita:\n" +"\n" + +#: ../apt/debfile.py:548 +msgid "Automatically converted to printable ascii:\n" +msgstr "Aŭtomate konvertita al presebla 'ascii':\n" + +#: ../apt/debfile.py:638 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" -msgstr "" +msgstr "Instali kunmet-dependecojn por fontpakaĵo '%s', kiu kunmetas %s\n" -#: ../apt/debfile.py:494 +#: ../apt/debfile.py:648 msgid "An essential package would be removed" -msgstr "" +msgstr "Esenca pakaĵo estus forigita" -#: ../apt/progress/text.py:81 +#: ../apt/progress/text.py:82 #, python-format msgid "%c%s... Done" -msgstr "" +msgstr "%c%s... Farite" -#: ../apt/progress/text.py:118 +#: ../apt/progress/text.py:122 msgid "Hit " -msgstr "" +msgstr "Trafo " -#: ../apt/progress/text.py:126 +#: ../apt/progress/text.py:131 msgid "Ign " -msgstr "" +msgstr "Ign " -#: ../apt/progress/text.py:128 +#: ../apt/progress/text.py:133 msgid "Err " -msgstr "" +msgstr "Era " -#: ../apt/progress/text.py:138 +#: ../apt/progress/text.py:144 msgid "Get:" -msgstr "" +msgstr "Akiri:" -#: ../apt/progress/text.py:198 +#: ../apt/progress/text.py:203 msgid " [Working]" -msgstr "" +msgstr " [laborante]" -#: ../apt/progress/text.py:208 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" +"Ŝanĝo de datenportilo: bonvolu enmeti la diskon nomitan\n" +" '%s'\n" +"en la diskingon '%s' kaj puŝi la enigan klavon\n" #. Trick for getting a translation from apt -#: ../apt/progress/text.py:216 +#: ../apt/progress/text.py:223 #, python-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" +msgstr "Prenis %sB en %s (%sB/s)\n" -#: ../apt/progress/text.py:229 +#: ../apt/progress/text.py:239 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" +msgstr "Bonvolu doni nomon al tiu ĉi disko, ekzemple 'Disko 1 de Debian 2.1r1'" -#: ../apt/progress/text.py:241 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" -msgstr "" +msgstr "Bonvolu enmeti diskon en la diskingon kaj puŝi la enigan klavon" -#: ../apt/cache.py:96 +#: ../apt/cache.py:149 msgid "Building data structures" -msgstr "" +msgstr "Konstruado de datenaj strukturoj" diff --git a/po/urd.po b/po/urd.po deleted file mode 100644 index fc492682..00000000 --- a/po/urd.po +++ /dev/null @@ -1,495 +0,0 @@ -# Urdu translation for update-manager -# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006 -# This file is distributed under the same license as the update-manager package. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2006. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 15:59+0200\n" -"PO-Revision-Date: 2006-05-07 01:53+0000\n" -"Last-Translator: Hameed محمد حمید <hameeduddin517@yahoo.com>\n" -"Language-Team: Urdu <urd@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1\n" - -#. ChangelogURI -#: ../data/templates/Ubuntu.info.in.h:4 -#, no-c-format -msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:13 -msgid "Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:31 -msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:74 -msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:92 -msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:135 -msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:153 -msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:197 -msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:215 -msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:252 -msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:270 -msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:305 -msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:323 -msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:357 -msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:362 -msgid "Community-maintained" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:368 -msgid "Restricted software" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:375 -msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:409 -msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:412 -msgid "Canonical-supported Open Source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:414 -msgid "Community-maintained (universe)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:415 -msgid "Community-maintained Open Source software" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:417 -msgid "Non-free drivers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:418 -msgid "Proprietary drivers for devices" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:420 -msgid "Restricted software (Multiverse)" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:421 -msgid "Software restricted by copyright or legal issues" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:427 -msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:439 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:444 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:449 -msgid "Pre-released updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:454 -msgid "Unsupported updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:461 -msgid "Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:475 -msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:487 -msgid "Ubuntu 5.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:492 -msgid "Ubuntu 5.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:497 -msgid "Ubuntu 5.10 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:504 -msgid "Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:518 -msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 -msgid "Officially supported" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:530 -msgid "Ubuntu 5.04 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:535 -msgid "Ubuntu 5.04 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:540 -msgid "Ubuntu 5.04 Backports" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:546 -msgid "Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:552 -msgid "Community-maintained (Universe)" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:554 -msgid "Non-free (Multiverse)" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:560 -msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:563 -msgid "No longer officially supported" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:565 -msgid "Restricted copyright" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:572 -msgid "Ubuntu 4.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:577 -msgid "Ubuntu 4.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:582 -msgid "Ubuntu 4.10 Backports" -msgstr "" - -#. ChangelogURI -#: ../data/templates/Debian.info.in.h:4 -#, no-c-format -msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:8 -msgid "Debian 6.0 'Squeeze' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:33 -msgid "Debian 5.0 'Lenny' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:58 -msgid "Debian 4.0 'Etch'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:83 -msgid "Debian 3.1 'Sarge'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:94 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:101 -msgid "Security updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:108 -msgid "Debian current stable release" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:121 -msgid "Debian testing" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:146 -msgid "Debian 'Sid' (unstable)" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:150 -msgid "DFSG-compatible Software with Non-Free Dependencies" -msgstr "" - -#. CompDescription -#: ../data/templates/Debian.info.in:152 -msgid "Non-DFSG-compatible Software" -msgstr "" - -#. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 -#, python-format -msgid "Server for %s" -msgstr "" - -#. More than one server is used. Since we don't handle this case -#. in the user interface we set "custom servers" to true and -#. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 -#: ../aptsources/distro.py:248 -msgid "Main server" -msgstr "" - -#: ../aptsources/distro.py:252 -msgid "Custom servers" -msgstr "" - -#: ../apt/progress/gtk2.py:259 -#, python-format -msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "" - -#: ../apt/progress/gtk2.py:265 -#, python-format -msgid "Downloading file %(current)li of %(total)li" -msgstr "" - -#. Setup some child widgets -#: ../apt/progress/gtk2.py:285 -#, fuzzy -msgid "Details" -msgstr "روز" - -#: ../apt/progress/gtk2.py:367 -msgid "Starting..." -msgstr "" - -#: ../apt/progress/gtk2.py:373 -msgid "Complete" -msgstr "" - -#: ../apt/package.py:301 -#, python-format -msgid "Invalid unicode in description for '%s' (%s). Please report." -msgstr "" - -#: ../apt/package.py:937 ../apt/package.py:1043 -msgid "The list of changes is not available" -msgstr "" - -#: ../apt/package.py:1047 -#, python-format -msgid "" -"The list of changes is not available yet.\n" -"\n" -"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" -"until the changes become available or try again later." -msgstr "" - -#: ../apt/package.py:1053 -msgid "" -"Failed to download the list of changes. \n" -"Please check your Internet connection." -msgstr "" - -#: ../apt/debfile.py:56 -#, python-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "" - -#: ../apt/debfile.py:81 -#, python-format -msgid "List of files for '%s'could not be read" -msgstr "" - -#: ../apt/debfile.py:149 -#, python-format -msgid "Dependency is not satisfiable: %s\n" -msgstr "" - -#: ../apt/debfile.py:173 -#, python-format -msgid "Conflicts with the installed package '%s'" -msgstr "" - -#: ../apt/debfile.py:319 -#, python-format -msgid "Wrong architecture '%s'" -msgstr "" - -#. the deb is older than the installed -#: ../apt/debfile.py:325 -msgid "A later version is already installed" -msgstr "" - -#: ../apt/debfile.py:345 -msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" - -#: ../apt/debfile.py:376 -#, python-format -msgid "Cannot install '%s'" -msgstr "" - -#: ../apt/debfile.py:484 -#, python-format -msgid "Install Build-Dependencies for source package '%s' that builds %s\n" -msgstr "" - -#: ../apt/debfile.py:494 -msgid "An essential package would be removed" -msgstr "" - -#: ../apt/progress/text.py:81 -#, python-format -msgid "%c%s... Done" -msgstr "" - -#: ../apt/progress/text.py:118 -msgid "Hit " -msgstr "" - -#: ../apt/progress/text.py:126 -msgid "Ign " -msgstr "" - -#: ../apt/progress/text.py:128 -msgid "Err " -msgstr "" - -#: ../apt/progress/text.py:138 -msgid "Get:" -msgstr "" - -#: ../apt/progress/text.py:198 -msgid " [Working]" -msgstr "" - -#: ../apt/progress/text.py:208 -#, python-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" - -#. Trick for getting a translation from apt -#: ../apt/progress/text.py:216 -#, python-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" - -#: ../apt/progress/text.py:229 -msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" - -#: ../apt/progress/text.py:241 -msgid "Please insert a Disc in the drive and press enter" -msgstr "" - -#: ../apt/cache.py:96 -msgid "Building data structures" -msgstr "" diff --git a/python/arfile.cc b/python/arfile.cc index c3aa74d1..c31ea35e 100644 --- a/python/arfile.cc +++ b/python/arfile.cc @@ -25,6 +25,8 @@ #include <apt-pkg/arfile.h> #include <apt-pkg/error.h> #include <apt-pkg/sptr.h> +#include <apt-pkg/aptconfiguration.h> +#include <apt-pkg/configuration.h> #include <utime.h> #include <unistd.h> @@ -477,8 +479,8 @@ PyTypeObject PyArArchive_Type = { * Representation of a Debian package. * * This does not resemble debDebFile in apt-inst, but instead is a subclass - * of ArFile which adds properties for the control.tar.{xz,lzma,bz2,gz} and - * data.tar.{xz,lzma,bz2,gz} members which return TarFile objects. It also adds + * of ArFile which adds properties for the control.tar.$compression and + * data.tar.$compression members which return TarFile objects. It also adds * a descriptor 'version' which returns the content of 'debian-binary'. * * We are using it this way as it seems more natural to represent this special @@ -532,21 +534,28 @@ static PyObject *debfile_new(PyTypeObject *type, PyObject *args, PyObject *kwds) return PyErr_Format(PyExc_SystemError, "No debian archive, missing %s", "control.tar.gz"); - self->data = _gettar(self, self->Object->FindMember("data.tar.gz"), - "gzip"); - if (!self->data) - self->data = _gettar(self, self->Object->FindMember("data.tar.bz2"), - "bzip2"); - if (!self->data) - self->data = _gettar(self, self->Object->FindMember("data.tar.lzma"), - "lzma"); - if (!self->data) - self->data = _gettar(self, self->Object->FindMember("data.tar.xz"), - "xz"); - if (!self->data) - return PyErr_Format(PyExc_SystemError, "No debian archive, missing %s", - "data.tar.gz or data.tar.bz2 or data.tar.lzma " - "or data.tar.xz"); + // try all compression types + std::vector<std::string> types = APT::Configuration::getCompressionTypes(); + for (std::vector<std::string>::const_iterator t = types.begin(); + t != types.end(); ++t) + { + string member = string("data.tar.").append(*t); + string comp = _config->Find(string("Acquire::CompressionTypes::").append(*t)); + self->data = _gettar(self, self->Object->FindMember(member.c_str()), + comp.c_str()); + if (self->data) + break; + } + // no data found, we need to + if (!self->data) { + string error; + for (std::vector<std::string>::const_iterator t = types.begin(); + t != types.end(); ++t) + error.append(*t + ","); + return PyErr_Format(PyExc_SystemError, + "No debian archive, missing data.tar.{%s}", + error.c_str()); + } const ARArchive::Member *member = self->Object->FindMember("debian-binary"); @@ -590,7 +599,9 @@ static PyGetSetDef debfile_getset[] = { {"control",(getter)debfile_get_control,0, "The TarFile object associated with the control.tar.gz member."}, {"data",(getter)debfile_get_data,0, - "The TarFile object associated with the data.tar.{gz,bz2,lzma,xz}) member."}, + "The TarFile object associated with the data.tar.$compression member. " + "All apt compression methods are supported. " + }, {"debian_binary",(getter)debfile_get_debian_binary,0, "The package version, as contained in debian-binary."}, {NULL} @@ -604,8 +615,9 @@ static const char *debfile_doc = "specifying a file descriptor (returned by e.g. os.open()).\n" "The recommended way of using it is to pass in the path to the file.\n\n" "It differs from ArArchive by providing the members 'control', 'data'\n" - "and 'version' for accessing the control.tar.gz, data.tar.{gz,bz2,lzma,xz},\n" - "and debian-binary members in the archive."; + "and 'version' for accessing the control.tar.gz, data.tar.$compression \n" + "(all apt compression methods are supported), and debian-binary members \n" + "in the archive."; PyTypeObject PyDebFile_Type = { PyVarObject_HEAD_INIT(&PyType_Type, 0) diff --git a/python/cdrom.cc b/python/cdrom.cc index 7f89e9d3..6ac16d59 100644 --- a/python/cdrom.cc +++ b/python/cdrom.cc @@ -52,7 +52,7 @@ static PyObject *cdrom_add(PyObject *Self,PyObject *Args) static char *cdrom_ident_doc = "ident(progress: apt_pkg.CdromProgress) -> str\n\n" "Try to identify the CD-ROM and if successful return the hexadecimal\n" - "CDROM-ID (and a integer version suffix seperated by -) as a\n" + "CDROM-ID (and a integer version suffix separated by -) as a\n" "string. Otherwise, return None or raise an error.\n\n" "The ID is created by hashing all file and directory names on the\n" "CD-ROM and appending the version."; diff --git a/python/pkgmanager.cc b/python/pkgmanager.cc index b7bed658..f51dbbbc 100644 --- a/python/pkgmanager.cc +++ b/python/pkgmanager.cc @@ -295,24 +295,24 @@ static PyMethodDef PkgManager2Methods[] = { {"install",PkgManagerInstall,METH_VARARGS, "install(pkg: Package, filename: str) -> bool \n\n" - "Add a install action. Can be overriden in subclasses.\n\n" + "Add a install action. Can be overridden in subclasses.\n\n" "New in version 0.8.0."}, {"configure",PkgManagerConfigure,METH_VARARGS, "configure(pkg: Package) -> bool \n\n" - "Add a configure action. Can be overriden in subclasses.\n\n" + "Add a configure action. Can be overridden in subclasses.\n\n" "New in version 0.8.0."}, {"remove",PkgManagerRemove,METH_VARARGS, "remove(pkg: Package, purge: bool) -> bool \n\n" - "Add a removal action. Can be overriden in subclasses.\n\n" + "Add a removal action. Can be overridden in subclasses.\n\n" "New in version 0.8.0."}, {"go",PkgManagerGo,METH_VARARGS, "go(status_fd: int) -> bool \n\n" - "Start dpkg. Can be overriden in subclasses.\n\n" + "Start dpkg. Can be overridden in subclasses.\n\n" "New in version 0.8.0."}, {"reset",PkgManagerReset,METH_VARARGS, "reset()\n\n" "Reset the package manager for a new round.\n" - "Can be overriden in subclasses.\n\n" + "Can be overridden in subclasses.\n\n" "New in version 0.8.0."}, {} }; @@ -323,7 +323,7 @@ static const char *packagemanager2_doc = "installation and the installation of those packages. The parameter\n" "'depcache' specifies an apt_pkg.DepCache object where information\n" "about the package selections is retrieved from.\n\n" - "Methods in this class can be overriden in sub classes\n" + "Methods in this class can be overridden in sub classes\n" "to implement behavior different from APT's dpkg implementation."; PyTypeObject PyPackageManager2_Type = { diff --git a/tests/data/test_debs/data-tar-broken.deb b/tests/data/test_debs/data-tar-broken.deb Binary files differnew file mode 100644 index 00000000..4fd42e0f --- /dev/null +++ b/tests/data/test_debs/data-tar-broken.deb diff --git a/tests/test_aptsources.py b/tests/test_aptsources.py index 1597674e..193d3806 100644 --- a/tests/test_aptsources.py +++ b/tests/test_aptsources.py @@ -3,6 +3,7 @@ import unittest import os import copy +import tempfile import apt_pkg import aptsources.sourceslist @@ -17,7 +18,7 @@ class TestAptSources(unittest.TestCase): if apt_pkg.config["APT::Architecture"] not in ('i386', 'amd64'): apt_pkg.config.set("APT::Architecture", "i386") apt_pkg.config.set("Dir::Etc", os.getcwd()) - apt_pkg.config.set("Dir::Etc::sourceparts", "/xxx") + apt_pkg.config.set("Dir::Etc::sourceparts", tempfile.mkdtemp()) if os.path.exists("./build/data/templates"): self.templates = os.path.abspath("./build/data/templates") elif os.path.exists("../build/data/templates"): diff --git a/tests/test_aptsources_ports.py b/tests/test_aptsources_ports.py index 991b532a..67c21b9c 100644 --- a/tests/test_aptsources_ports.py +++ b/tests/test_aptsources_ports.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import os import unittest - +import tempfile import apt_pkg import aptsources.sourceslist @@ -17,7 +17,7 @@ class TestAptSourcesPorts(unittest.TestCase): apt_pkg.config.set("APT::Architecture", "powerpc") apt_pkg.config.set("Dir::Etc", os.path.abspath("data/aptsources_ports")) - apt_pkg.config.set("Dir::Etc::sourceparts", "/xxx") + apt_pkg.config.set("Dir::Etc::sourceparts", tempfile.mkdtemp()) if os.path.exists("../build/data/templates"): self.templates = os.path.abspath("../build/data/templates") else: diff --git a/tests/test_debfile.py b/tests/test_debfile.py index 5f6d1aa2..86a51cb9 100644 --- a/tests/test_debfile.py +++ b/tests/test_debfile.py @@ -119,6 +119,12 @@ Description: testpackage for gdebi - contains usr/bin/binary for file reading deb = apt.debfile.DebPackage("./data/test_debs/data-tar-xz.deb") self.assertEqual(deb.filelist, ["./", "usr/", "usr/bin/"]) + def test_no_supported_data_tar(self): + # ensure that a unknown data.tar.xxx raises a exception + with self.assertRaises(SystemError): + deb = apt.debfile.DebPackage("./data/test_debs/data-tar-broken.deb") + + if __name__ == "__main__": #logging.basicConfig(level=logging.DEBUG) diff --git a/utils/get_debian_mirrors.py b/utils/get_debian_mirrors.py index 9fb4dd37..c1ec3be8 100755 --- a/utils/get_debian_mirrors.py +++ b/utils/get_debian_mirrors.py @@ -1,7 +1,7 @@ #!/usr/bin/python # get_debian_mirrors.py - Parse Mirrors.masterlist and create a mirror list. # -# Copyright (c) 2010 Julian Andres Klode <jak@debian.org> +# Copyright (c) 2010-2011 Julian Andres Klode <jak@debian.org> # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -22,7 +22,8 @@ import urllib2 from debian_bundle import deb822 mirrors = collections.defaultdict(set) -masterlist = urllib2.urlopen("http://cvs.debian.org/webwml/webwml/english/" +masterlist = urllib2.urlopen("http://anonscm.debian.org/viewvc/" + "webwml/webwml/english/" "mirror/Mirrors.masterlist?revision=HEAD") for mirror in deb822.Deb822.iter_paragraphs(masterlist): |