merged latest updates from debian-sid

4 files changed, 40 insertions, 26 deletions

diff --git a/debian/changelog b/debian/changelog
index a163f03a..c1b12cc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-python-apt (0.8.4) UNRELEASED; urgency=low
+python-apt (0.8.4) unstable; urgency=low
 
+  [ Michael Vogt ]
   * doc/examples/build-deps.py:
     - update the build-deps.py example to use the apt API more
   * add support for apt_pkg.Policy.get_priority(PkgFileIterator)
@@ -17,8 +18,22 @@ python-apt (0.8.4) UNRELEASED; urgency=low
     - if there is no Version.uri return None
   * apt/cache.py:
     - fix _have_multi_arch flag (thanks to Sebastian Heinlein)
+  * build against apt 0.9.0
+
+  [Julian Andres Klode ]
+  * python/apt_pkgmodule.cc:
+    - Fix apt_pkg.Dependency.TYPE_RECOMMENDS, had Suggests value previously
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 04 Jan 2012 12:07:48 +0100
+ -- Michael Vogt <mvo@debian.org>  Mon, 16 Apr 2012 19:06:48 +0200
+
+python-apt (0.8.4~exp1) experimental; urgency=low
+
+  * tests/test_apt_cache.py:
+    - fix tests on kfreebsd/ia64
+  * apt/debfile.py: 
+    - fix crash in dep multiarch handling
+
+ -- Michael Vogt <mvo@debian.org>  Tue, 24 Jan 2012 14:02:46 +0100
 
 python-apt (0.8.3) unstable; urgency=low
 
@@ -30,8 +45,6 @@ python-apt (0.8.3) unstable; urgency=low
     - add multiarch support to the debfile.py code
   * tests/test_apt_cache.py:
     - add additional check if provides test can actually be run
-  * apt/debfile.py: 
-    - fix crash in dep multiarch handling
 
  -- Michael Vogt <mvo@debian.org>  Thu, 08 Dec 2011 20:31:52 +0100
 
diff --git a/po/python-apt.pot b/po/python-apt.pot
index 02c65f13..bde5f9c1 100644
--- a/po/python-apt.pot
+++ b/po/python-apt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-30 15:44+0100\n"
+"POT-Creation-Date: 2012-02-06 14:56+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -474,23 +474,28 @@ msgid ""
 "Please check your Internet connection."
 msgstr ""
 
-#: ../apt/debfile.py:85
+#: ../apt/debfile.py:82
 #, python-format
 msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:202
+#: ../apt/debfile.py:93
+#, python-format
+msgid "List of control files for '%s' could not be read"
+msgstr ""
+
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:223
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
 #. 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:364
+#: ../apt/debfile.py:373
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' dependency %(depname)s "
@@ -498,63 +503,59 @@ msgid ""
 msgstr ""
 
 #. 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:380
+#: ../apt/debfile.py:389
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
 "%(targetver)s)"
 msgstr ""
 
-#: ../apt/debfile.py:390
+#: ../apt/debfile.py:399
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But "
 "the '%(debfile)s' provides it via: '%(provides)s'"
 msgstr ""
 
-#: ../apt/debfile.py:438
+#: ../apt/debfile.py:447
 msgid "No Architecture field in the package"
 msgstr ""
 
-#: ../apt/debfile.py:448
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:455
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:480
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:510
+#: ../apt/debfile.py:519
 #, python-format
 msgid "Cannot install '%s'"
 msgstr ""
 
-#: ../apt/debfile.py:554
-msgid "Python-debian module not available"
-msgstr ""
-
-#: ../apt/debfile.py:597
+#: ../apt/debfile.py:593
 msgid ""
 "Automatically decompressed:\n"
 "\n"
 msgstr ""
 
-#: ../apt/debfile.py:603
+#: ../apt/debfile.py:599
 msgid "Automatically converted to printable ascii:\n"
 msgstr ""
 
-#: ../apt/debfile.py:693
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:704
+#: ../apt/debfile.py:700
 msgid "An essential package would be removed"
 msgstr ""
 
diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc
index acfdf019..7704aa01 100644
--- a/python/apt_pkgmodule.cc
+++ b/python/apt_pkgmodule.cc
@@ -920,7 +920,7 @@ extern "C" void initapt_pkg()
    PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_SUGGESTS",
                         MkPyNumber(pkgCache::Dep::Suggests));
    PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_RECOMMENDS",
-                        MkPyNumber(pkgCache::Dep::Suggests));
+                        MkPyNumber(pkgCache::Dep::Recommends));
    PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_CONFLICTS",
                         MkPyNumber(pkgCache::Dep::Conflicts));
    PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_REPLACES",
diff --git a/tests/test_policy.py b/tests/test_policy.py
index d77fb27e..f7d41152 100644
--- a/tests/test_policy.py
+++ b/tests/test_policy.py
@@ -24,7 +24,7 @@ class TestAptPolicy(unittest.TestCase):
             lowlevel_ver = ver._cand
             for pkgfile, i in lowlevel_ver.file_list:
                 #print pkgfile, i, policy.get_priority(pkgfile)
-                self.assertTrue(policy.get_priority(pkgfile) > 1)
+                self.assertTrue(policy.get_priority(pkgfile) >= 1)
                 self.assertTrue(policy.get_priority(pkgfile) < 1001)
 
     def test_apt_policy_highlevel(self):