merged from debian-sid

15 files changed, 435 insertions, 236 deletions

diff --git a/apt/debfile.py b/apt/debfile.py
index 25a45e98..0a740c63 100644
--- a/apt/debfile.py
+++ b/apt/debfile.py
@@ -531,7 +531,7 @@ class DebPackage(object):
         return s
         
     def _get_content(self, part, name, auto_decompress=True, auto_hex=True):
-        data = part.get_content(name)
+        data = part.extractdata(name)
         # check for zip content
         if name.endswith(".gz") and auto_decompress:
             io = StringIO(data)
@@ -550,24 +550,16 @@ class DebPackage(object):
     def control_content(self, name):
         """ return the content of a specific control.tar.gz file """
         try:
-            from debian.debfile import DebFile
-        except:
-            raise Exception(_("Python-debian module not available"))
-        control = DebFile(self.filename).control
-        if name in control:
-            return self._get_content(control, name)
-        return ""
+            return self._get_content(self._debfile.control, name)
+        except LookupError:
+            return ""
 
     def data_content(self, name):
         """ return the content of a specific control.tar.gz file """
         try:
-            from debian.debfile import DebFile
-        except:
-            raise Exception(_("Python-debian module not available"))
-        data = DebFile(self.filename).data
-        if name in data:
-            return self._get_content(data, name)
-        return ""
+            return self._get_content(self._debfile.data, name)
+        except LookupError:
+            return ""
 
     def _dbg(self, level, msg):
         """Write debugging output to sys.stderr."""
diff --git a/apt/package.py b/apt/package.py
index 871c1e16..475edb76 100644
--- a/apt/package.py
+++ b/apt/package.py
@@ -1170,7 +1170,7 @@ class Package(object):
 
     @deprecated_args
     def mark_delete(self, auto_fix=True, purge=False):
-        """Mark a package for install.
+        """Mark a package for deletion.
 
         If *auto_fix* is ``True``, the resolver will be run, trying to fix
         broken packages.  This is the default.
diff --git a/debian/changelog b/debian/changelog
index a198781b..8c8613d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+python-apt (0.7.100) unstable; urgency=low
+
+  * Final 0.7.100 release; targeted at Squeeze.
+  * apt/debfile.py:
+    - Replace (undocumented) use of python-debian debfile.DebFile API with
+      the equivalent apt_inst.DebFile API (Closes: #603043)
+  * apt/package.py:
+    - Fix docstring of Package.mark_delete() (Closes: #599042)
+  * doc:
+    - Various documentation updates.
+    - The C++ API/ABI is stable now.
+  * po
+    - Update sl.po (Closes: #603359)
+
+ -- Julian Andres Klode <jak@debian.org>  Wed, 17 Nov 2010 16:53:55 +0100
+
+python-apt (0.7.98.1) unstable; urgency=low
+
+  [ Piotr Ozarowski ]
+  * Use dh_python3 to handle Python 3 files
+    - bump minimum required versions of python-central and python3-all-dev
+    - add new python3-apt, python3-apt-bdg and python-common binary packages
+  * Replace python-central with dh_python2
+
+ -- Michael Vogt <mvo@debian.org>  Wed, 29 Sep 2010 20:38:25 +0200
+
 python-apt (0.7.98) unstable; urgency=low
 
   [ Michael Vogt ]
diff --git a/debian/control b/debian/control
index d478a30d..2e5226af 100644
--- a/debian/control
+++ b/debian/control
@@ -9,11 +9,10 @@ X-Python3-Version: >= 3.1
 Build-Depends: apt-utils,
                debhelper (>= 7.3.5),
                libapt-pkg-dev (>= 0.8),
-               python-all-dev,
+               python-all-dev (>= 2.6.6-3~),
                python-all-dbg,
-               python3-all-dev (>= 3.1.2-6~),
+               python3-all-dev (>= 3.1.2-10~),
                python3-all-dbg (>= 3.1.2-6~),
-               python-central (>= 0.5),
                python-distutils-extra (>= 2.0),
                python-sphinx (>= 0.5),
                python-debian
@@ -22,10 +21,10 @@ Vcs-Browser: http://bzr.debian.org/loggerhead/apt/python-apt/debian-sid/changes
 
 Package: python-apt
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-apt-common
 Recommends: lsb-release, iso-codes, python2.6
-Breaks: debdelta (<< 0.28~), packagekit-backend-apt (<= 0.4.8-0ubuntu4)
-Provides: python3-apt, ${python:Provides}
+Breaks: debdelta (<< 0.28~), packagekit-backend-apt (<= 0.4.8-0ubuntu4), ${python:Breaks}
+Provides: ${python:Provides}
 Suggests: python-apt-dbg, python-gtk2, python-vte, python-apt-doc
 XB-Python-Version: ${python:Versions}
 Description: Python interface to libapt-pkg
@@ -82,3 +81,52 @@ Description: Python interface to libapt-pkg (development files)
  .
  This package contains the header files needed to use python-apt objects from
  C++ applications.
+
+Package: python-apt-common
+Priority: optional
+Architecture: all
+Depends: ${misc:Depends}, python | python3
+Enhances: python-apt, python3-apt
+Breaks: python-apt (<< 0.7.98+nmu1)
+Description: Python interface to libapt-pkg (locales)
+ The apt_pkg Python interface will provide full access to the internal
+ libapt-pkg structures allowing Python programs to easily perform a
+ variety of functions.
+ .
+ This package contains locales.
+
+Package: python3-apt
+Architecture: any
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-apt-common
+Recommends: lsb-release, iso-codes
+Provides: ${python3:Provides}
+Suggests: python3-apt-dbg, python-apt-doc
+Breaks: python-apt (<< 0.7.98+nmu1)
+Replaces: python-apt (<< 0.7.98+nmu1)
+Description: Python 3 interface to libapt-pkg
+ The apt_pkg Python 3 interface will provide full access to the internal
+ libapt-pkg structures allowing Python 3 programs to easily perform a
+ variety of functions, such as:
+ .
+  - Access to the APT configuration system
+  - Access to the APT package information database
+  - Parsing of Debian package control files, and other files with a
+    similar structure
+ .
+ The included 'aptsources' Python interface provides an abstraction of
+ the sources.list configuration on the repository and the distro level.
+
+Package: python3-apt-dbg
+Priority: extra
+Architecture: any
+Section: debug
+Breaks: python-apt (<< 0.7.98+nmu1)
+Depends: python3-dbg, python3-apt (= ${binary:Version}), ${shlibs:Depends},
+         ${misc:Depends}
+Description: Python 3 interface to libapt-pkg (debug extension)
+ The apt_pkg Python 3 interface will provide full access to the internal
+ libapt-pkg structures allowing Python 3 programs to easily perform a
+ variety of functions.
+ .
+ This package contains the extension built for the Python debug interpreter.
+
diff --git a/debian/python-apt-common.install b/debian/python-apt-common.install
new file mode 100644
index 00000000..bea48037
--- /dev/null
+++ b/debian/python-apt-common.install
@@ -0,0 +1,4 @@
+usr/share/locale
+usr/share/python-apt
+# Install the migration helper
+utils/migrate-0.8.py usr/share/python-apt
diff --git a/debian/python-apt-common.lintian-overrides b/debian/python-apt-common.lintian-overrides
new file mode 100644
index 00000000..3ae30560
--- /dev/null
+++ b/debian/python-apt-common.lintian-overrides
@@ -0,0 +1,2 @@
+# package depends on python | python3
+python-script-but-no-python-dep ./usr/share/python-apt/migrate-0.8.py
diff --git a/debian/python-apt-dbg.install b/debian/python-apt-dbg.install
index 1bbba721..91faafc7 100644
--- a/debian/python-apt-dbg.install
+++ b/debian/python-apt-dbg.install
@@ -1 +1 @@
-usr/lib/python*/*/*_d.so
+usr/lib/python2.*/*/*_d.so
diff --git a/debian/python-apt.install b/debian/python-apt.install
index 29028531..0d713e3c 100644
--- a/debian/python-apt.install
+++ b/debian/python-apt.install
@@ -1,8 +1,4 @@
-usr/lib/python*/*/apt_pkg.so
-usr/lib/python*/*/apt_inst.so
-usr/lib/python*/*/*/
-usr/lib/python*/*/*.egg-info
-usr/share/locale
-usr/share/python-apt
-# Install the migration helper
-utils/migrate-0.8.py usr/share/python-apt
+usr/lib/python2.*/*/apt_pkg.so
+usr/lib/python2.*/*/apt_inst.so
+usr/lib/python2.*/*/*/
+usr/lib/python2.*/*/*.egg-info
diff --git a/debian/python3-apt-dbg.install b/debian/python3-apt-dbg.install
new file mode 100644
index 00000000..011ab164
--- /dev/null
+++ b/debian/python3-apt-dbg.install
@@ -0,0 +1 @@
+usr/lib/python3*/*/*_d.so
diff --git a/debian/python3-apt.install b/debian/python3-apt.install
new file mode 100644
index 00000000..16c3317a
--- /dev/null
+++ b/debian/python3-apt.install
@@ -0,0 +1,4 @@
+usr/lib/python3*/*/apt_pkg.so
+usr/lib/python3*/*/apt_inst.so
+usr/lib/python3*/*/*/
+usr/lib/python3*/*/*.egg-info
diff --git a/debian/rules b/debian/rules
index f7cca130..a38b4605 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,12 @@
 #!/usr/bin/make -f
 # Should be include-links, but that somehow fails.
-export DH_PYCENTRAL=nomove
 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 SHELL = env PATH=$(PATH) sh
 
 %:
-	dh --with python-central $@
+	dh --with python2,python3 $@
 
 override_dh_auto_build:
 	dh_auto_build
@@ -18,10 +17,13 @@ override_dh_installdocs:
 		dh_installdirs -ppython-apt-doc usr/share/doc/python-apt; \
 	fi
 	dh_installdirs -ppython-apt-dev usr/share/doc/python-apt
-	dh_installdocs --link-doc=python-apt
+	dh_installdocs -Npython-apt-common -Npython3-apt -Npython3-apt-dbg --link-doc=python-apt
+	dh_installdocs -p python3-apt -p python3-apt-dbg --link-doc=python3-apt
+	dh_installdocs -p python-apt-common
 
 override_dh_strip:
-	dh_strip --dbg-package=python-apt-dbg
+	dh_strip -p python-apt --dbg-package=python-apt-dbg
+	dh_strip -p python3-apt --dbg-package=python3-apt-dbg
 	
 override_dh_compress:
 	dh_compress -X.js -X_static/* -X _sources/* -X_sources/*/* -X.inv
@@ -31,5 +33,5 @@ override_dh_auto_test:
 		$$python tests/test_all.py -q; \
 	done;
 
-override_dh_pycentral:
-	dh_pycentral --exclude=migrate-0.8.py
+override_dh_python2:
+	dh_python2 -N python-apt-common
diff --git a/doc/source/c++/api.rst b/doc/source/c++/api.rst
index e807f4bb..97ab24d1 100644
--- a/doc/source/c++/api.rst
+++ b/doc/source/c++/api.rst
@@ -10,10 +10,7 @@ The C++ API names use the name of the class in apt_pkg and are prefixed with
 Py. For each supported class, there is a _Type object, a _Check() function,
 a _CheckExact() function, a _FromCpp() and a _ToCpp() function.
 
-.. note::
-
-    This API is experimental and should not be used in stable program
-    releases.
+.. versionadded:: 0.7.100
 
 Acquire (pkgAcquire)
 --------------------
diff --git a/doc/source/library/apt_pkg.rst b/doc/source/library/apt_pkg.rst
index 81dafd54..f1bc4845 100644
--- a/doc/source/library/apt_pkg.rst
+++ b/doc/source/library/apt_pkg.rst
@@ -1600,6 +1600,10 @@ section as a string.
         tagf = apt_pkg.TagFile(open('/var/lib/dpkg/status'))
         for section in tagfile:
             print section['Package']
+
+    .. versionchanged:: 0.7.100
+        Added support for using gzip files, via :class:`gzip.GzipFile` or any
+        file containing a compressed gzip stream.
         
     .. method:: next()
 
@@ -1653,7 +1657,7 @@ section as a string.
 
         Return ``True`` if *section* has a key *key*, else ``False``.
 
-      .. versionadded:: 0.8.0
+      .. versionadded:: 0.7.100
 
     .. method:: bytes() -> int
 
@@ -1833,6 +1837,8 @@ Configuration and Command-line parsing
         Return a string containing the values in the configuration object,
         in the standard :manpage:`apt.conf(5)` format.
 
+        .. versionadded:: 0.7.100
+
     .. method:: exists(key)
 
         Check whether an option named *key* exists in the configuration.
diff --git a/doc/source/whatsnew/0.7.100.rst b/doc/source/whatsnew/0.7.100.rst
index b7768405..eda27647 100644
--- a/doc/source/whatsnew/0.7.100.rst
+++ b/doc/source/whatsnew/0.7.100.rst
@@ -8,10 +8,14 @@ Despite the many changes made in python-apt 0.7.100, the release still provides
 backwards compatibility to the 0.7 series. This makes it possible to run your
 old applications.
 
+This documents describes the important changes introduced since the release
+of python-apt 0.7.10.3, starting with the first development release 0.7.90
+from April 2009.
+
 .. note::
 
     Applications using the old API should be updated to the new API because
-    the old ones will be dropped in the 0.8 release. To build a python-apt
+    the old ones will be dropped in a future release. To build a python-apt
     variant without the deprecated API, build it without the -DCOMPAT_0_7
     compiler flag.
 
@@ -158,9 +162,12 @@ C++ headers
 The 0.7.100 release introduces python-apt-dev which provides headers for
 developers to provide Python support in the libapt-pkg-using application.
 
-.. warning::
-
-    The ABI is not considered stable yet.
+Redesign of :mod:`apt_inst`
+---------------------------
+The 0.7.100 series redesigns the :mod:`apt_inst` module to provide
+more flexible classes replacing the older functions. The older functions
+are still available in Python 2 builds, but are deprecated and will be
+removed in the future.
 
 Other changes
 -------------
@@ -170,14 +177,20 @@ This release of python-apt also features several other, smaller changes:
       :class:`apt.Package()` object dynamically, instead of creating all of
       them during the cache initialization.
     * Support to set the candidate version in :class:`apt.package.Package`
+    * Support for reading gzip-compressed files in apt_pkg.TagFile.
+    * Various changes to :mod:`apt.debfile` have been merged from gdebi.
+
+There have been various other changes, see the changelog for a complete list
+of changes.
+
 
-Porting your applications to python-apt 0.8 API
-------------------------------------------------
-Porting your application to the new python-apt 0.8 API may be trivial. You
+Porting your applications to the new python-apt API
+----------------------------------------------------
+Porting your application to the new python-apt API may be trivial. You
 should download the source tarball of python-apt and run the tool
-utils/migrate-0.8 using Python 2.6 over your code::
+utils/migrate-0.8 over your code::
 
-    python2.6 utils/migrate-0.8.py -c myapp.py mypackage/
+    utils/migrate-0.8.py -c myapp.py mypackage/
 
 This will search your code for places where possibly deprecated names are
 used. Using the argument ``-c``, you can turn colorized output on.
diff --git a/po/sl.po b/po/sl.po
index 74822103..323cf9ac 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,387 +1,441 @@
-# Slovenian translation for update-manager
+# Slovenian translation for python-apt-rosetta.
 # Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
-# This file is distributed under the same license as the update-manager package.
+# This file is distributed under the same license as the python-apt-rosetta package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: update-manager\n"
+"Project-Id-Version: python-apt-rosetta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
-"PO-Revision-Date: 2006-10-16 04:06+0000\n"
-"Last-Translator: Tadej <tadej.888@gmail.com>\n"
+"POT-Creation-Date: 2010-11-17 16:13+0100\n"
+"PO-Revision-Date: 2010-09-01 08:08+0200\n"
+"Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%"
-"100==4 ? 2 : 3\n"
+"X-Launchpad-Export-Date: 2010-08-30 17:55+0000\n"
+"X-Generator: Launchpad (build Unknown)\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 9.10 'Karmic Koala'"
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Nosilec CD z Ubuntu 10.10 'Maverick Meerkat'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:43
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:45
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:46
+msgid "This software is not part of Ubuntu."
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
+#: ../data/templates/Ubuntu.info.in:53
+msgid "Independent"
 msgstr ""
 
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:55
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:56
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. 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 "Nosilec CD z Ubuntu 10.04 'Lucid Lynx'"
+
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../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 "Nosilec CD z Ubuntu 9.10 'Karmic Koala'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:216
+msgid "Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "Ubuntu 9.04 'Jaunty Jackalope'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:234
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
+msgstr "Nosilec CD z 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 "Nosilec CD z 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 "Nosilec CD z 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 "Nosilec CD z 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 "Nosilec CD z 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 "Paketi skupnosti"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:536
 msgid "Restricted software"
-msgstr ""
+msgstr "Avtorsko omejena programska oprema"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:543
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "Nosilec CD z 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 "Odprtokodna programska oprema podprta s strani Canonical Ltd"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:590
 msgid "Community-maintained (universe)"
-msgstr ""
+msgstr "Paketi skupnosti (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:591
 msgid "Community-maintained Open Source software"
-msgstr ""
+msgstr "Programska oprema, ki jo vzdržuje odprtokodna skupnost"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:593
 msgid "Non-free drivers"
-msgstr ""
+msgstr "Neprosti gonilniki"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:594
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Lastniški gonilniki za naprave"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:596
 msgid "Restricted software (Multiverse)"
-msgstr ""
+msgstr "Avtorsko omejena programska oprema (multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:597
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
+"Programska oprema, ki je omejena z avtorskimi pravicami ali drugimi pravnimi "
+"vidiki"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:603
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
+msgstr "Nosilec CD z 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 "Pomembne varnostne posodobitve"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:624
 msgid "Recommended updates"
-msgstr ""
+msgstr "Priporočene posodobitve"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:629
 msgid "Pre-released updates"
-msgstr ""
+msgstr "Predhodno izdane posodobitve"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:634
 msgid "Unsupported updates"
-msgstr ""
+msgstr "Nepodprte posodobitve"
 
 #. 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 "Nosilec CD z 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 varnostne posodobitve"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:680
 msgid "Ubuntu 5.10 Updates"
-msgstr ""
+msgstr "Ubuntu 5.10 posodobitve"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:685
 msgid "Ubuntu 5.10 Backports"
-msgstr ""
+msgstr "Ubuntu 5.10 postarani paketi"
 
 #. 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 "Nosilec CD z 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 ""
+msgstr "Uradno podprto"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:726
 msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
+msgstr "Ubuntu 5.04 varnostne posodobitve"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:731
 msgid "Ubuntu 5.04 Updates"
-msgstr ""
+msgstr "Ubuntu 5.04 posodobitve"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:736
 msgid "Ubuntu 5.04 Backports"
-msgstr ""
+msgstr "Ubuntu 5.04 postarani paketi"
 
 #. 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 "Paketi skupnosti (universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:750
 msgid "Non-free (Multiverse)"
-msgstr ""
+msgstr "Ne-prosti paketi (multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:756
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "Nosilec CD z 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 "Brez uradne podpore"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:761
 msgid "Restricted copyright"
-msgstr ""
+msgstr "Omejeno z avtorskimi pravicami"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:768
 msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
+msgstr "Ubuntu 4.10 varnostne posodobitve"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:773
 msgid "Ubuntu 4.10 Updates"
-msgstr ""
+msgstr "Ubuntu 4.10 posodobitve"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:778
 msgid "Ubuntu 4.10 Backports"
-msgstr ""
+msgstr "Ubuntu 4.10 postarani paketi"
 
 #. 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 ""
+msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/templates/Debian.info.in:8
 msgid "Debian 6.0 'Squeeze' "
-msgstr ""
+msgstr "Debian 6.0 'Squeeze' "
 
 #. Description
 #: ../data/templates/Debian.info.in:33
 msgid "Debian 5.0 'Lenny' "
-msgstr ""
+msgstr "Debian 5.0 'Lenny' "
 
 #. Description
 #: ../data/templates/Debian.info.in:58
 msgid "Debian 4.0 'Etch'"
-msgstr ""
+msgstr "Debian 4.0 'Etch'"
 
 #. Description
 #: ../data/templates/Debian.info.in:83
 msgid "Debian 3.1 'Sarge'"
-msgstr ""
+msgstr "Debian 3.1 'Sarge'"
 
 #. Description
 #: ../data/templates/Debian.info.in:94
 msgid "Proposed updates"
-msgstr ""
+msgstr "Predlagane posodobitve"
 
 #. Description
 #: ../data/templates/Debian.info.in:101
 msgid "Security updates"
-msgstr ""
+msgstr "Varnostne posodobitve"
 
 #. Description
 #: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
-msgstr ""
+msgstr "Debian trenutna stabilna različica"
 
 #. Description
 #: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
-msgstr ""
+msgstr "Debian preizkusna različica"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 msgid "Debian 'Sid' (unstable)"
-msgstr ""
+msgstr "Debian \"Sid\" (razvojna različica)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
+msgstr "Program je skladen z DFSG-compatible ne prostimi odvisnostmi"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
-msgstr ""
+msgstr "Program ni skladen z DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:209 ../aptsources/distro.py:424
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "Strežnik za %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 "Glavni strežnik"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:253
 msgid "Custom servers"
-msgstr ""
+msgstr "Strežniki po meri"
 
-#: ../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 ""
+"Prejemanje %(current)li. datoteke od skupno %(total)li s hitrostjo %(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 "Prejemanje %(current)li. datoteke od skupno %(total)li."
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-#, fuzzy
+#: ../apt/progress/gtk2.py:342
 msgid "Details"
-msgstr "Dnevno"
+msgstr "Podrobnosti"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:430
 msgid "Starting..."
-msgstr ""
+msgstr "Začenjanje ..."
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:436
 msgid "Complete"
-msgstr ""
+msgstr "Končano"
 
-#: ../apt/package.py:301
+#: ../apt/package.py:342
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
+"Neveljaven unicode znak v opisu za '%s' (%s). Pošljite poročilo o napaki."
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1012 ../apt/package.py:1117
 msgid "The list of changes is not available"
-msgstr ""
+msgstr "Seznam sprememb ni na voljo"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1123
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -389,109 +443,163 @@ msgid ""
 "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "until the changes become available or try again later."
 msgstr ""
+"Seznam sprememb še ni na voljo.\n"
+"\n"
+"Več podrobnosti je na http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
+"dokler dnevnik ne bo posodobljen ali pa poskusite kasneje."
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1130
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
 msgstr ""
+"Prjemanje seznama sprememb je spodletelo.\n"
+"Preverite internetno povezavo."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:81
 #, 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 "Seznama datotek za '%s' ni mogoče prebrati"
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:166
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "Dependency is not satisfiable: %s\n"
+msgstr "Odvisnost ni razrešena: %s\n"
+
+#: ../apt/debfile.py:187
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr "Spor z nameščenim paketom '%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:326
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
 msgstr ""
+"Pokvari odvisnost obstoječega paketa '%(pkgname)s' %(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:342
 #, python-format
-msgid "Dependency is not satisfiable: %s\n"
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
 msgstr ""
+"Pokvari spor obstoječega paketa '%(pkgname)s': %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:352
 #, 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 ""
+"Pokvari obstoječi paket '%(pkgname)s', ki je v sporu z: '%(targetpkg)s'. "
+"Toda '%(debfile)s' ga zagotavlja preko: '%(provides)s'"
 
-#: ../apt/debfile.py:319
+#: ../apt/debfile.py:398
+msgid "No Architecture field in the package"
+msgstr "Ni polja določila arhitekture sistema v paketu"
+
+#: ../apt/debfile.py:403
 #, python-format
 msgid "Wrong architecture '%s'"
-msgstr ""
+msgstr "Napačna arhitektura '%s'"
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:410
 msgid "A later version is already installed"
-msgstr ""
+msgstr "Novejša različica je že nameščena."
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:435
 msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
+msgstr "Ni mogoče razrešiti vseh odvisnosti (napaka v predpomnilniku)"
 
-#: ../apt/debfile.py:376
-#, fuzzy, python-format
+#: ../apt/debfile.py:465
+#, python-format
 msgid "Cannot install '%s'"
-msgstr "Ne morem namestiti '%s'"
+msgstr "Ni mogoče namestiti '%s'"
+
+#: ../apt/debfile.py:507
+msgid "Python-debian module not available"
+msgstr "Modul Python-debian ni na voljo"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:539
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+"Samodejno razširjeno:\n"
+"\n"
+
+#: ../apt/debfile.py:545
+msgid "Automatically converted to printable ascii:\n"
+msgstr "Samodejno pretvorjeno v zapis ascii:\n"
+
+#: ../apt/debfile.py:635
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
+"Namestiti je treba pakete za izgradnjo iz izvorne kode '%s' s katerimi je "
+"mogoče izgraditi %s\n"
 
-#: ../apt/debfile.py:494
-#, fuzzy
+#: ../apt/debfile.py:645
 msgid "An essential package would be removed"
-msgstr "Bistven paket se bo moral odstraniti"
+msgstr "Z dejanjem bi bil odstranjen sistemski paket"
 
 #: ../apt/progress/text.py:81
 #, python-format
 msgid "%c%s... Done"
-msgstr ""
+msgstr "%c%s... Končano."
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:120
 msgid "Hit "
-msgstr ""
+msgstr "Zad "
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:129
 msgid "Ign "
-msgstr ""
+msgstr "Prz "
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:131
 msgid "Err "
-msgstr ""
+msgstr "Nap "
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:142
 msgid "Get:"
-msgstr ""
+msgstr "Pridobi:"
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:202
 msgid " [Working]"
-msgstr ""
+msgstr " [V delovanju]"
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:213
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
+"Zamenjava nosilca: vstavite disk z oznako\n"
+" '%s'\n"
+"v enoto '%s' in pritisnite vnosno tipko\n"
 
 #. Trick for getting a translation from apt
-#: ../apt/progress/text.py:216
+#: ../apt/progress/text.py:222
 #, python-format
 msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
+msgstr "Pridobljenih %sB v %s (%sB/s)\n"
 
-#: ../apt/progress/text.py:229
+#: ../apt/progress/text.py:238
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
+msgstr "Poimenujte disk, na primer 'Debian 2.1r1 Disk 1'"
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:254
 msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
+msgstr "Vstavite disk v pogon in pritisnite vnosno tipko"
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:135
 msgid "Building data structures"
-msgstr ""
+msgstr "Izgradnja podatkovnega drevesa"