merged from debian/sid

4 files changed, 36 insertions, 5 deletions

diff --git a/apt/package.py b/apt/package.py
index dbc5b23e..4104f93e 100644
--- a/apt/package.py
+++ b/apt/package.py
@@ -973,8 +973,8 @@ class Package(object):
         another package, and if no packages depend on it anymore, the package
         is no longer required.
         """
-        return self.is_installed and \
-               self._pcache._depcache.is_garbage(self._pkg)
+        return ((self.is_installed or self.marked_install) and
+                self._pcache._depcache.is_garbage(self._pkg))
 
     @property
     def is_auto_installed(self):
diff --git a/debian/changelog b/debian/changelog
index 7c76edb1..c6a29ed1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-apt (0.8.0ubuntu10) UNRELEASEDoneiric-updates; urgency=low
+python-apt (0.8.1ubuntu1) UNRELEASEDprecise; urgency=low
 
   * aptsources/sourceslist.py:
     - import distinfo from the same dir (LP: #871007)
@@ -7,6 +7,37 @@ python-apt (0.8.0ubuntu10) UNRELEASEDoneiric-updates; urgency=low
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 10 Oct 2011 11:13:20 +0200
 
+python-apt (0.8.1) unstable; 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
+  * tests/test_apt_cache.py:
+    - fix test by providing proper fixture data
+    - fix test if sources.list is not readable (as is the case on some
+      PPA buildds)
+  * apt/package.py:
+    - fix py3 compatiblity with print
+  * tests/test_all.py:
+    - skip all tests if sources.list is not readable (as is the case on
+      some builds)
+    - packages in marked_install state can also be auto-removable
+  * add concept of "ParentComponent" for e.g. ubuntu/multiverse
+    that needs universe enabled as well (plus add test)
+  * apt/progress/gtk2.py:
+    - update to the latest vte API for child-exited (LP: #865388)
+
+ -- Michael Vogt <mvo@debian.org>  Wed, 19 Oct 2011 16:39:13 +0200
+
 python-apt (0.8.0ubuntu9) oneiric; urgency=low
 
   * apt/progress/gtk2.py:
diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py
index 2f812059..db68ec63 100644
--- a/tests/test_apt_cache.py
+++ b/tests/test_apt_cache.py
@@ -133,7 +133,7 @@ class TestAptCache(unittest.TestCase):
         old_source_list = apt_pkg.config.find("dir::etc::sourcelist")
         old_source_parts = apt_pkg.config.find("dir::etc::sourceparts")
         apt_pkg.config.set("dir::etc::sourcelist", base_sources)
-        apt_pkg.config.set("dir::etc::sourceparts", "xxx")
+        apt_pkg.config.set("dir::etc::sourceparts", "/tmp")
         # main sources.list
         sources_list = base_sources
         with open(sources_list, "w") as f:
diff --git a/tests/test_progress.py b/tests/test_progress.py
index 73853dfa..3b6285d6 100644
--- a/tests/test_progress.py
+++ b/tests/test_progress.py
@@ -27,7 +27,7 @@ class TestProgress(unittest.TestCase):
         apt_pkg.init()
         apt_pkg.config.set("APT::Architecture", "amd64")
         apt_pkg.config.set("Dir::Etc", basedir)
-        apt_pkg.config.set("Dir::Etc::sourceparts", "/xxx")
+        apt_pkg.config.set("Dir::Etc::sourceparts", "/tmp")
         # setup lists dir
         if not os.path.exists("./tmp/partial"):
             os.makedirs("./tmp/partial")