merged from the debian-sid branch

13 files changed, 290 insertions, 130 deletions

diff --git a/debian/changelog b/debian/changelog
index beb93dd2..40d61b9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,98 @@
+python-apt (0.7.98.1ubuntu1) maverick; urgency=low
+
+  * merged from debian/sid, remaining changes:
+    - updated mirror list
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 15 Oct 2010 10:30:58 +0200
+
+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 ]
+  * python/acquire.cc:
+    - return long long when calling TotalNeeded(), FetchNeeded() and
+      PartialPresent() from pkgAcquire(). This follows the change
+      in libapt.
+  * apt/debfile.py:
+    - add missing init for _installed_conflicts (LP: #618597)
+  * add "provides" property to the apt.Version objects
+  * apt/debfile.py:
+    - fix error when reading binary content and add regresion test
+  * merged patch from Samuel Lidén Borell to fix crash if there utf8 
+    in the control file (LP: #624290) and add test
+  * apt/cache.py:
+    - add "sources_list" parameter to cache.update() to force updating
+      a single sources.list entry only
+  * debian/control:
+    - add missing build-depends on python-debian (needed to run the
+      tests for apt.debfile.DebPackage()
+  * data/templates/Ubuntu.info.in:
+    - add extras.ubuntu.com and archvie.canonical.com to the
+      templates
+  * aptsources/distinfo.py, aptsources/distro.py:
+    - support non-official templates (like extras.ubuntu.com)
+  * fix return type of DebSize() and UsrSize(), thanks to
+    Sebastian Heinlein, LP: #642936
+  * merge fix from Steven Chamberlain <steven@pyro.eu.org> for
+    crash in unattended-upgrades, many many thanks (closes: #596408)
+  * python/acquire-item.cc:
+    - fix two more int -> long long change to follow the changes
+      from libapt
+    - do use PyString_FromFormat(), in python versions below 2.7 it
+      does not support long long (%llu), use strprintf() from libapt
+      instead
+
+  [ Kiwinote ]
+  * apt/debfile:
+    - don't fail if we conflict with the pkgs we are reinstalling
+
+ -- Michael Vogt <mvo@debian.org>  Tue, 28 Sep 2010 15:47:51 +0200
+
+python-apt (0.7.97.1) unstable; urgency=low
+
+  * tests/test_apt_cache.py:
+    - Do not insert ".." into sys.path, fixes FTBFS
+
+ -- Julian Andres Klode <jak@debian.org>  Thu, 26 Aug 2010 14:08:01 +0200
+
+python-apt (0.7.97) unstable; urgency=low
+
+  [ Julian Andres Klode ]
+  * python/tag.cc:
+    - Support gzip compression for control files (Closes: #383617),
+      requires APT (>> 0.7.26~exp10) to work.
+  * doc/conf.py:
+    - Correctly handle non-digit characters in version (ignore everything
+      after them).
+  * python/apt_pkgmodule.cc:
+    - Bind pkgAcquire::Item::StatTransientNetworkError (Closes: #589010)
+  * doc/library/apt_pkg.rst:
+    - Document Configuration.dump().
+  * debian/control:
+    - Adapt to new Python 3 handling (Closes: #593042)
+    - Build-depend on APT >= 0.8 to get gzip compression enabled (optional,
+      can be reverted for backports)
+    - Set Standards-Version to 3.9.1
+  
+  [ Michael Vogt ]
+  * python/configuration.cc:
+    - add binding for the "dump()" method to configruation objects
+  * apt/debfile.py:
+    - fix crash in DscFile handling and add regression test
+  * po/pt_BR.po:
+    - updated, thanks to Sergio Cipolla (Closes: #593754)
+
+ -- Julian Andres Klode <jak@debian.org>  Thu, 26 Aug 2010 12:32:54 +0200
+
 python-apt (0.7.96.1ubuntu12) maverick; urgency=low
 
   * merge fix from Steven Chamberlain <steven@pyro.eu.org> for
diff --git a/debian/control b/debian/control
index 5015022c..e7521c60 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,16 @@ 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.8.4
-XS-Python-Version: all
+Standards-Version: 3.9.1
+XS-Python-Version: >= 2.5
+X-Python3-Version: >= 3.1
 Build-Depends: apt-utils,
                debhelper (>= 7.3.5),
-               libapt-pkg-dev (>= 0.7.26~exp11),
-               python-all-dev,
+               libapt-pkg-dev (>= 0.8),
+               python-all-dev (>= 2.6.6-3~),
                python-all-dbg,
-               python-central (>= 0.5),
+               python3-all-dev (>= 3.1.2-10~),
+               python3-all-dbg (>= 3.1.2-6~),
                python-distutils-extra (>= 2.0),
                python-sphinx (>= 0.5),
                python-debian
@@ -20,9 +22,9 @@ 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)
+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}
@@ -80,3 +82,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/po/pt_BR.po b/po/pt_BR.po
index acbd62ea..7f95b222 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,8 +6,8 @@ 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-21 01:31+0000\n"
-"Last-Translator: Rafael Proença <cypherbios@ubuntu.com>\n"
+"PO-Revision-Date: 2010-08-19 17:13-0300\n"
+"Last-Translator: Sérgio Cipolla <secipolla@gmail.com>\n"
 "Language-Team: Ubuntu-BR <tradutores@listas.ubuntubrasil.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,75 +24,63 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:13
-#, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr "Ubuntu 4.10 'Warty Warthog'"
+msgstr "Ubuntu 9.10 'Karmic Koala'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:31
-#, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr "Cdrom com Ubuntu 4.10 'Warty Warthog'"
+msgstr "CD-ROM com o Ubuntu 9.10 'Karmic Koala'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:74
-#, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr "Ubuntu 4.10 'Warty Warthog'"
+msgstr "Ubuntu 9.04 'Jaunty Jackalope'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:92
-#, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr "Cdrom com Ubuntu 4.10 'Warty Warthog'"
+msgstr "CD-ROM com o Ubuntu 9.04 'Jaunty Jackalope'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:135
-#, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr "Ubuntu 8.10 'Intrepid Ibex'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:153
-#, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr "Cdrom com o Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr "CD-ROM com o Ubuntu 8.10 'Intrepid Ibex'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:197
-#, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr "Ubuntu 8.04 'Hardy Heron'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:215
-#, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr "Cdrom com o Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr "CD-ROM com o Ubuntu 8.04 'Hardy Heron'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:252
-#, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "Atualizações de segurança do Ubuntu 5.04"
+msgstr "Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:270
-#, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "Cdrom com o Ubuntu 5.10 'Breezy Badger'"
+msgstr "CD-ROM com o Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:305
-#, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr "Atualizações de segurança do Ubuntu 5.04"
+msgstr "Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:323
-#, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr "Cdrom com o Ubuntu 5.10 'Breezy Badger'"
+msgstr "CD-ROM com o Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:357
@@ -101,19 +89,18 @@ msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
 #: ../data/templates/Ubuntu.info.in:362
-#, fuzzy
 msgid "Community-maintained"
 msgstr "Mantido pela comunidade"
 
 #. CompDescription
 #: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
-msgstr "Software restrito"
+msgstr "Aplicativos restritos"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr "Cdrom com Ubuntu 6.10 'Edgy Eft'"
+msgstr "CD-ROM com o Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:409
@@ -122,51 +109,48 @@ msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
 #: ../data/templates/Ubuntu.info.in:412
-#, fuzzy
 msgid "Canonical-supported Open Source software"
-msgstr "Programa de Código Aberto mantido pela Canonical"
+msgstr "Aplicativo de Código Aberto suportado pela Canonical"
 
 #. CompDescription
 #: ../data/templates/Ubuntu.info.in:414
-#, fuzzy
 msgid "Community-maintained (universe)"
-msgstr "Mantido pela Comunidade (Universe)"
+msgstr "Mantido pela comunidade (universe)"
 
 #. CompDescriptionLong
 #: ../data/templates/Ubuntu.info.in:415
-#, fuzzy
 msgid "Community-maintained Open Source software"
-msgstr "Programa de Código Aberto mantido pela Comunidade"
+msgstr "Aplicativo de Código Aberto mantido pela comunidade"
 
 #. CompDescription
 #: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
-msgstr "Drivers Não-livres"
+msgstr "Drivers não-livres"
 
 #. CompDescriptionLong
 #: ../data/templates/Ubuntu.info.in:418
 msgid "Proprietary drivers for devices"
-msgstr "Controladores proprietários para dispositivos"
+msgstr "Drivers proprietários para dispositivos"
 
 #. CompDescription
 #: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
-msgstr "Programas restritos (Multiverse)"
+msgstr "Aplicativos restritos (multiverse)"
 
 #. CompDescriptionLong
 #: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
-msgstr "Software restrito por copyright ou problemas legais"
+msgstr "Aplicativos restritos por copyright ou questões legais"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Cdrom com o Ubuntu 6.06 LTS 'Dapper Drake'"
+msgstr "CD-ROM com o Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
-msgstr "Principais Atualizações de Segurança"
+msgstr "Atualizações de segurança importantes"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:444
@@ -175,15 +159,13 @@ msgstr "Atualizações recomendadas"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:449
-#, fuzzy
 msgid "Pre-released updates"
-msgstr "Atualizações sugeridas"
+msgstr "Atualizações de pré-lançamento"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:454
-#, fuzzy
 msgid "Unsupported updates"
-msgstr "Atualizações \"Backport\""
+msgstr "Atualizações não suportadas"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:461
@@ -193,7 +175,7 @@ msgstr "Ubuntu 5.10 'Breezy Badger'"
 #. Description
 #: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "Cdrom com o Ubuntu 5.10 'Breezy Badger'"
+msgstr "CD-ROM com o Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:487
@@ -218,12 +200,13 @@ msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 #. Description
 #: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Cdrom com o Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr "CD-ROM com o Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:521
+#: ../data/templates/Debian.info.in:148
 msgid "Officially supported"
-msgstr "Suportadas oficialmente"
+msgstr "Suportados oficialmente"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:530
@@ -247,24 +230,23 @@ msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/templates/Ubuntu.info.in:552
-#, fuzzy
 msgid "Community-maintained (Universe)"
-msgstr "Mantido pela comunidade (Universo)"
+msgstr "Mantido pela comunidade (universe)"
 
 #. CompDescription
 #: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
-msgstr "Não-livres (Multiverso)"
+msgstr "Não-livres (multiverse)"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr "Cdrom com Ubuntu 4.10 'Warty Warthog'"
+msgstr "CD-ROM com o Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
-msgstr "Não é mais suportado oficialmente"
+msgstr "Não mais suportado oficialmente"
 
 #. CompDescription
 #: ../data/templates/Ubuntu.info.in:565
@@ -294,27 +276,23 @@ 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 "Debian 6.0 'Squeeze' "
 
 #. Description
 #: ../data/templates/Debian.info.in:33
-#, fuzzy
 msgid "Debian 5.0 'Lenny' "
-msgstr "Debian 3.1 \"Sarge\""
+msgstr "Debian 5.0 'Lenny' "
 
 #. Description
 #: ../data/templates/Debian.info.in:58
-#, fuzzy
 msgid "Debian 4.0 'Etch'"
-msgstr "Debian 3.1 \"Sarge\""
+msgstr "Debian 4.0 'Etch'"
 
 #. Description
 #: ../data/templates/Debian.info.in:83
-#, fuzzy
 msgid "Debian 3.1 'Sarge'"
-msgstr "Debian 3.1 \"Sarge\""
+msgstr "Debian 3.1 'Sarge'"
 
 #. Description
 #: ../data/templates/Debian.info.in:94
@@ -323,47 +301,46 @@ msgstr "Atualizações sugeridas"
 
 #. Description
 #: ../data/templates/Debian.info.in:101
-#, fuzzy
 msgid "Security updates"
-msgstr "Principais Atualizações de Segurança"
+msgstr "Atualizações de segurança"
 
 #. Description
 #: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
-msgstr ""
+msgstr "Atual versão estável do Debian"
 
 #. Description
 #: ../data/templates/Debian.info.in:121
-#, fuzzy
 msgid "Debian testing"
-msgstr "Debian \"Etch\" (testing)"
+msgstr "Debian testing"
 
 #. Description
 #: ../data/templates/Debian.info.in:146
-#, fuzzy
 msgid "Debian 'Sid' (unstable)"
-msgstr "Debian \"Sid\" (unstable)"
+msgstr "Debian 'Sid' (unstable)"
 
 #. CompDescription
 #: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr "Programa compatível com a DFSG mas com dependências não-livres"
+msgstr "Aplicativos compatíveis com a DFSG mas com dependências não-livres"
 
 #. CompDescription
 #: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
-msgstr "Programas não compatíveis com a DFSG"
+msgstr "Aplicativos não compatíveis com a DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:208
+#: ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
-msgstr "Servidor no(a) %s"
+msgstr "Servidor - %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:226
+#: ../aptsources/distro.py:232
 #: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "Servidor principal"
@@ -388,20 +365,20 @@ msgid "Details"
 msgstr "Detalhes"
 
 #: ../apt/progress/gtk2.py:367
-#, fuzzy
 msgid "Starting..."
-msgstr "Configurações"
+msgstr "Iniciando..."
 
 #: ../apt/progress/gtk2.py:373
 msgid "Complete"
-msgstr ""
+msgstr "Completo"
 
 #: ../apt/package.py:301
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
+msgstr "Unicode inválido na descrição de '%s' (%s). Por favor, relate o erro."
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:937
+#: ../apt/package.py:1043
 msgid "The list of changes is not available"
 msgstr "A lista de alterações não está disponível"
 
@@ -413,88 +390,91 @@ msgid ""
 "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "until the changes become available or try again later."
 msgstr ""
+"A lista de alterações ainda não está disponível.\n"
+"\n"
+"Por favor, utilize http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
+"até que as alterações estejam disponíveis ou tente novamente mais tarde."
 
 #: ../apt/package.py:1053
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
 msgstr ""
-"Falha ao baixar a lista de mudanças. \n"
-"Por favor verifique sua conexão internet."
+"Falha ao baixar a lista de alterações. \n"
+"Por favor verifique sua conexão com a Internet."
 
 #: ../apt/debfile.py:56
 #, python-format
 msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
+msgstr "Este não é um arquivo DEB válido, membro '%s' faltando"
 
 #: ../apt/debfile.py:81
 #, python-format
 msgid "List of files for '%s'could not be read"
-msgstr ""
+msgstr "A lista de arquivos de '%s' não pôde ser lida"
 
 #: ../apt/debfile.py:149
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
+msgstr "A dependência não é contentável: %s\n"
 
 #: ../apt/debfile.py:173
 #, python-format
 msgid "Conflicts with the installed package '%s'"
-msgstr ""
+msgstr "Conflita com o pacote instalado '%s'"
 
 #: ../apt/debfile.py:319
 #, python-format
 msgid "Wrong architecture '%s'"
-msgstr ""
+msgstr "Arquitetura incorreta '%s'"
 
 #. the deb is older than the installed
 #: ../apt/debfile.py:325
 msgid "A later version is already installed"
-msgstr ""
+msgstr "Uma versão mais atual já está instalada"
 
 #: ../apt/debfile.py:345
 msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
+msgstr "Falha na satisfação de todas as dependências (cache quebrado)"
 
 #: ../apt/debfile.py:376
-#, fuzzy, python-format
+#, python-format
 msgid "Cannot install '%s'"
-msgstr "Não foi possível instalar '%s'"
+msgstr "Incapaz de instalar '%s'"
 
 #: ../apt/debfile.py:484
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
+msgstr "Instalar Dependências-Construtivas para o pacote fonte '%s' que constrói %s\n"
 
 #: ../apt/debfile.py:494
-#, fuzzy
 msgid "An essential package would be removed"
-msgstr "Um pacote essencial teria que ser removido"
+msgstr "Um pacote essencial teria de ser removido"
 
 #: ../apt/progress/text.py:81
 #, python-format
 msgid "%c%s... Done"
-msgstr ""
+msgstr "%c%s... Feito"
 
 #: ../apt/progress/text.py:118
 msgid "Hit "
-msgstr ""
+msgstr "Atingido"
 
 #: ../apt/progress/text.py:126
 msgid "Ign "
-msgstr ""
+msgstr "Ignorado"
 
 #: ../apt/progress/text.py:128
 msgid "Err "
-msgstr ""
+msgstr "Erro"
 
 #: ../apt/progress/text.py:138
 msgid "Get:"
-msgstr ""
+msgstr "Obter:"
 
 #: ../apt/progress/text.py:198
 msgid " [Working]"
-msgstr ""
+msgstr " [Trabalhando]"
 
 #: ../apt/progress/text.py:208
 #, python-format
@@ -503,21 +483,25 @@ msgid ""
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
+"Mudança de mídia: por favor, insira o disco de nome\n"
+"'%s'\n"
+"no drive '%s' e tecle Enter\n"
 
 #. Trick for getting a translation from apt
 #: ../apt/progress/text.py:216
 #, python-format
 msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
+msgstr "Obtidos %sB em %s (%sB/s)\n"
 
 #: ../apt/progress/text.py:229
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
+msgstr "Por favor, forneça um nome para este disco, como 'Debian 2.1r1 Disco 1'"
 
 #: ../apt/progress/text.py:241
 msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
+msgstr "Por favor, insira um disco no drive e tecle Enter"
 
 #: ../apt/cache.py:96
 msgid "Building data structures"
-msgstr ""
+msgstr "Construindo estruturas de dados"
+
diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py
index a5b52ea3..efa73a4f 100644
--- a/tests/test_apt_cache.py
+++ b/tests/test_apt_cache.py
@@ -11,8 +11,9 @@ import os
 import tempfile
 import unittest
 
+from test_all import get_library_dir
 import sys
-sys.path.insert(0, "..")
+sys.path.insert(0, get_library_dir())
 
 import apt
 import apt_pkg
@@ -65,7 +66,20 @@ class TestAptCache(unittest.TestCase):
                                          include_nonvirtual=True)
         self.assertTrue(len(l), 1)
         self.assertTrue("mail-transport-agent" in cache["postfix"].candidate.provides)
-        
+
+    def test_low_level_pkg_provides(self):
+        # low level cache provides list of the pkg
+        cache = apt_pkg.Cache()
+        l = cache["mail-transport-agent"].provides_list
+        # arbitrary number, just needs to be higher enough
+        self.assertTrue(len(l), 5)
+        for (providesname, providesver, version) in l:
+            self.assertEqual(providesname, "mail-transport-agent")
+            if version.parent_pkg.name == "postfix":
+                break
+        else:
+            self.assertNotReached()
+   
 
     def test_dpkg_journal_dirty(self):
         # backup old value
@@ -92,10 +106,10 @@ class TestAptCache(unittest.TestCase):
     def test_apt_update(self):
         rootdir = "./data/tmp"
         if os.path.exists(rootdir):
-	    shutil.rmtree(rootdir)
+            shutil.rmtree(rootdir)
         try:
             os.makedirs(os.path.join(rootdir, "var/lib/apt/lists/partial"))
-        except OSError, e:
+        except OSError:
             pass
         state_dir = os.path.join(rootdir, "var/lib/apt")
         lists_dir = os.path.join(rootdir, "var/lib/apt/lists")
diff --git a/tests/test_aptsources.py b/tests/test_aptsources.py
index 3ef20f64..331df935 100644
--- a/tests/test_aptsources.py
+++ b/tests/test_aptsources.py
@@ -18,7 +18,9 @@ class TestAptSources(unittest.TestCase):
             apt_pkg.config.set("APT::Architecture", "i386")
         apt_pkg.config.set("Dir::Etc", os.getcwd())
         apt_pkg.config.set("Dir::Etc::sourceparts", "/xxx")
-        if os.path.exists("../build/data/templates"):
+        if os.path.exists("./build/data/templates"):
+            self.templates = os.path.abspath("./build/data/templates")
+        elif os.path.exists("../build/data/templates"):
             self.templates = os.path.abspath("../build/data/templates")
         else:
             self.templates = "/usr/share/python-apt/templates/"
diff --git a/tests/test_debfile.py b/tests/test_debfile.py
index 571c2ec9..759639c4 100644
--- a/tests/test_debfile.py
+++ b/tests/test_debfile.py
@@ -85,6 +85,11 @@ class TestDebfilee(unittest.TestCase):
                          "Samuel Lidén Borell <samuel@slbdata.se>")
 
     def testContent(self):
+        # no python-debian for python3 yet, so fail gracefully
+        try:
+            import debian
+        except ImportError:
+            return
         # normal
         deb = apt.debfile.DebPackage(cache=self.cache)
         deb.open(os.path.join("data", "test_debs", "gdebi-test11.deb"))