From 65871e1fea624ad7c78001cf0e0c3e8bc7352283 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 4 Jul 2008 11:11:20 +0200
Subject: update-po

---
 po/python-apt.pot | 100 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 55 insertions(+), 45 deletions(-)

diff --git a/po/python-apt.pot b/po/python-apt.pot
index cac3604f..4e53bbd4 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: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2008-07-04 11:09+0200\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"
@@ -23,222 +23,232 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../data/templates/Ubuntu.info.in:11
+msgid "Ubuntu 8.10 'Intrepid Ibex'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:28
+msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:66
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:25
+#: ../data/templates/Ubuntu.info.in:83
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:120
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:137
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:172
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:189
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:223
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:228
 msgid "Community-maintained"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
+#: ../data/templates/Ubuntu.info.in:232
 msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:234
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:240
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:274
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:277
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:279
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:280
 msgid "Community-maintained Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:282
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
+#: ../data/templates/Ubuntu.info.in:283
 msgid "Proprietary drivers for devices "
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:285
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:286
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:291
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:303
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:308
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:313
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:318
 msgid "Unsupported updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:325
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:338
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:350
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:355
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:360
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:367
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:380
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:383 ../data/templates/Debian.info.in:94
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:392
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:397
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:402
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:408
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:416
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:424
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:426
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:433
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:438
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:443
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
-- 
cgit v1.2.3


From ccf689a426760a69b77394abbcddf7897cbd6488 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 4 Jul 2008 19:53:47 +0200
Subject: * python/apt_pkgmodule.cc:   - fix bug in hashsum calculation when
 the original string     contains \0 charackters (thanks to Celso Providelo
 and     Ryan Hass for the test-case) LP: #243630

---
 debian/changelog        |  9 +++++++++
 po/python-apt.pot       |  2 +-
 python/apt_pkgmodule.cc | 14 +++++++++++---
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6fa68d7e..8d54596a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+python-apt (0.7.7) unstable; urgency=low
+
+  * python/apt_pkgmodule.cc:
+    - fix bug in hashsum calculation when the original string
+      contains \0 charackters (thanks to Celso Providelo and 
+      Ryan Hass for the test-case) LP: #243630
+
+ -- Michael Vogt <mvo@debian.org>  Fri, 04 Jul 2008 19:53:28 +0200
+
 python-apt (0.7.6) unstable; urgency=low
 
   * apt/cache.py:
diff --git a/po/python-apt.pot b/po/python-apt.pot
index 4e53bbd4..71c9b4a7 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: 2008-07-04 11:09+0200\n"
+"POT-Creation-Date: 2008-07-04 19:45+0200\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"
diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc
index ae1cf7be..dea34958 100644
--- a/python/apt_pkgmodule.cc
+++ b/python/apt_pkgmodule.cc
@@ -175,8 +175,11 @@ static PyObject *md5sum(PyObject *Self,PyObject *Args)
    // Digest of a string.
    if (PyString_Check(Obj) != 0)
    {
+      char *s;
+      Py_ssize_t len;
       MD5Summation Sum;
-      Sum.Add(PyString_AsString(Obj));
+      PyString_AsStringAndSize(Obj, &s, &len);
+      Sum.Add((const unsigned char*)s, len);
       return CppPyString(Sum.Result().Value());
    }   
    
@@ -212,8 +215,10 @@ static PyObject *sha1sum(PyObject *Self,PyObject *Args)
    // Digest of a string.
    if (PyString_Check(Obj) != 0)
    {
+      char *s;
+      Py_ssize_t len;
       SHA1Summation Sum;
-      Sum.Add(PyString_AsString(Obj));
+      Sum.Add((const unsigned char*)s, len);
       return CppPyString(Sum.Result().Value());
    }   
    
@@ -249,8 +254,11 @@ static PyObject *sha256sum(PyObject *Self,PyObject *Args)
    // Digest of a string.
    if (PyString_Check(Obj) != 0)
    {
+      char *s;
+      Py_ssize_t len;
       SHA256Summation Sum;
-      Sum.Add(PyString_AsString(Obj));
+      PyString_AsStringAndSize(Obj, &s, &len);
+      Sum.Add((const unsigned char*)s, len);
       return CppPyString(Sum.Result().Value());
    }   
    
-- 
cgit v1.2.3


From 7625577a6974aa580877cf5d5ed22a6e663843fb Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 4 Jul 2008 20:12:53 +0200
Subject: * tests/test_hashsums.py:   - add tests for the hashsum code

---
 debian/changelog        |  2 ++
 po/python-apt.pot       |  2 +-
 python/apt_pkgmodule.cc |  1 +
 tests/test_hashsums.py  | 64 +++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 tests/test_hashsums.py

diff --git a/debian/changelog b/debian/changelog
index 8d54596a..e15a9a96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ python-apt (0.7.7) unstable; urgency=low
     - fix bug in hashsum calculation when the original string
       contains \0 charackters (thanks to Celso Providelo and 
       Ryan Hass for the test-case) LP: #243630
+  * tests/test_hashsums.py:
+    - add tests for the hashsum code
 
  -- Michael Vogt <mvo@debian.org>  Fri, 04 Jul 2008 19:53:28 +0200
 
diff --git a/po/python-apt.pot b/po/python-apt.pot
index 71c9b4a7..c8c93668 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: 2008-07-04 19:45+0200\n"
+"POT-Creation-Date: 2008-07-04 20:08+0200\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"
diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc
index dea34958..fd7a83cd 100644
--- a/python/apt_pkgmodule.cc
+++ b/python/apt_pkgmodule.cc
@@ -218,6 +218,7 @@ static PyObject *sha1sum(PyObject *Self,PyObject *Args)
       char *s;
       Py_ssize_t len;
       SHA1Summation Sum;
+      PyString_AsStringAndSize(Obj, &s, &len);
       Sum.Add((const unsigned char*)s, len);
       return CppPyString(Sum.Result().Value());
    }   
diff --git a/tests/test_hashsums.py b/tests/test_hashsums.py
new file mode 100644
index 00000000..7fa6eb60
--- /dev/null
+++ b/tests/test_hashsums.py
@@ -0,0 +1,64 @@
+#!/usr/bin/python
+
+import unittest
+import apt_pkg
+
+class testHashes(unittest.TestCase):
+    " test the hashsum functions against strings and files "
+
+    def testMD5(self):
+        # simple
+        s = "foo"
+        s_md5 = "acbd18db4cc2f85cedef654fccc4a4d8"
+        res = apt_pkg.md5sum(s)
+        self.assert_(res == s_md5)
+        # file
+        res = apt_pkg.md5sum(open("hashsum_test.data"))
+        self.assert_(res == s_md5)
+        # with zero (\0) in the string
+        s = "foo\0bar"
+        s_md5 = "f6f5f8cd0cb63668898ba29025ae824e"
+        res = apt_pkg.md5sum(s)
+        self.assert_(res == s_md5)
+        # file
+        res = apt_pkg.md5sum(open("hashsum_test_with_zero.data"))
+        self.assert_(res == s_md5)
+
+    def testSHA1(self):
+        # simple
+        s = "foo"
+        s_hash = "0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33"
+        res = apt_pkg.sha1sum(s)
+        self.assert_(res == s_hash)
+        # file
+        res = apt_pkg.sha1sum(open("hashsum_test.data"))
+        self.assert_(res == s_hash)
+        # with zero (\0) in the string
+        s = "foo\0bar"
+        s_hash = "e2c300a39311a2dfcaff799528415cb74c19317f"
+        res = apt_pkg.sha1sum(s)
+        self.assert_(res == s_hash)
+        # file
+        res = apt_pkg.sha1sum(open("hashsum_test_with_zero.data"))
+        self.assert_(res == s_hash)
+
+    def testSHA256(self):
+        # simple
+        s = "foo"
+        s_hash = "2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae"
+        res = apt_pkg.sha256sum(s)
+        self.assert_(res == s_hash)
+        # file
+        res = apt_pkg.sha256sum(open("hashsum_test.data"))
+        self.assert_(res == s_hash)
+        # with zero (\0) in the string
+        s = "foo\0bar"
+        s_hash = "d6b681bfce7155d44721afb79c296ef4f0fa80a9dd6b43c5cf74dd0f64c85512"
+        res = apt_pkg.sha256sum(s)
+        self.assert_(res == s_hash)
+        # file
+        res = apt_pkg.sha256sum(open("hashsum_test_with_zero.data"))
+        self.assert_(res == s_hash)
+
+if __name__ == "__main__":
+    unittest.main()
-- 
cgit v1.2.3


From 844d8f7494027c9dc205d528cafcc4fb2a64f61b Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 4 Jul 2008 20:15:35 +0200
Subject: add missing test-data

---
 tests/hashsum_test.data           |   1 +
 tests/hashsum_test_with_zero.data | Bin 0 -> 7 bytes
 2 files changed, 1 insertion(+)
 create mode 100644 tests/hashsum_test.data
 create mode 100644 tests/hashsum_test_with_zero.data

diff --git a/tests/hashsum_test.data b/tests/hashsum_test.data
new file mode 100644
index 00000000..19102815
--- /dev/null
+++ b/tests/hashsum_test.data
@@ -0,0 +1 @@
+foo
\ No newline at end of file
diff --git a/tests/hashsum_test_with_zero.data b/tests/hashsum_test_with_zero.data
new file mode 100644
index 00000000..2ec9a6df
Binary files /dev/null and b/tests/hashsum_test_with_zero.data differ
-- 
cgit v1.2.3


From 5de8e3d1ecd159d5c27e62264b794cc1124b14fa Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 14 Jul 2008 13:15:32 +0200
Subject: * apt/package.py:   - add "isAutoRemovable()" method

---
 apt/package.py   | 8 ++++++++
 debian/changelog | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/apt/package.py b/apt/package.py
index ac045969..096b1bd1 100644
--- a/apt/package.py
+++ b/apt/package.py
@@ -319,6 +319,14 @@ class Package(object):
         return self.isInstalled and self._depcache.IsUpgradable(self._pkg)
     isUpgradable = property(isUpgradable)
 
+    def isAutoRemovable(self):
+        """ 
+        Package is installed as a automatic dependency and is
+        no longer required
+        """
+        return self.isInstalled and self._depcache.IsGarbage(self._pkg)
+    isAutoRemovable = property(isAutoRemovable)
+
     # size
     def packageSize(self):
         """ The size of the candidate deb package """
diff --git a/debian/changelog b/debian/changelog
index e15a9a96..27004cfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ python-apt (0.7.7) unstable; urgency=low
       Ryan Hass for the test-case) LP: #243630
   * tests/test_hashsums.py:
     - add tests for the hashsum code
+  * apt/package.py:
+    - add "isAutoRemovable()" method
 
  -- Michael Vogt <mvo@debian.org>  Fri, 04 Jul 2008 19:53:28 +0200
 
-- 
cgit v1.2.3


From 4551baaf54faa1555b4fc40b9bf34beca8af60eb Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 18 Jul 2008 15:26:48 +0100
Subject: * python/pkgsrcrecords.cc:   - add "Record" attribute to the
 PkgSrcRecord to access the     full source record

---
 debian/changelog        | 3 +++
 po/python-apt.pot       | 2 +-
 python/pkgsrcrecords.cc | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 27004cfa..78af5f6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ python-apt (0.7.7) unstable; urgency=low
     - add tests for the hashsum code
   * apt/package.py:
     - add "isAutoRemovable()" method
+  * python/pkgsrcrecords.cc:
+    - add "Record" attribute to the PkgSrcRecord to access the
+      full source record
 
  -- Michael Vogt <mvo@debian.org>  Fri, 04 Jul 2008 19:53:28 +0200
 
diff --git a/po/python-apt.pot b/po/python-apt.pot
index c8c93668..7125757c 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: 2008-07-04 20:08+0200\n"
+"POT-Creation-Date: 2008-07-18 15:22+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"
diff --git a/python/pkgsrcrecords.cc b/python/pkgsrcrecords.cc
index 5e04f5fc..c698a925 100644
--- a/python/pkgsrcrecords.cc
+++ b/python/pkgsrcrecords.cc
@@ -89,6 +89,8 @@ static PyObject *PkgSrcRecordsAttr(PyObject *Self,char *Name)
 	 return CppPyString(Struct.Last->Maintainer());
       else if (strcmp("Section",Name) == 0)
 	 return CppPyString(Struct.Last->Section());
+      else if (strcmp("Record",Name) == 0)
+	 return CppPyString(Struct.Last->AsStr());
       else if (strcmp("Binaries",Name) == 0) {
          PyObject *List = PyList_New(0);
 
-- 
cgit v1.2.3


From ddaca119cb785bf66b1d2657eb378f45217a6888 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 18 Jul 2008 16:49:16 +0200
Subject: Add bzr builddeb magic to indicate python-apt is a native package.

---
 .bzr-builddeb/default.conf | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .bzr-builddeb/default.conf

diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
new file mode 100644
index 00000000..3a08d607
--- /dev/null
+++ b/.bzr-builddeb/default.conf
@@ -0,0 +1,2 @@
+[BUILDDEB]
+native = True
-- 
cgit v1.2.3


From e365aa1c9166eb6228cc84818ae3dfa075908420 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 18 Jul 2008 16:21:59 +0100
Subject: * debian/rules:   - remove the arch-build target, we have
 bzr-builddeb now

---
 debian/changelog | 2 ++
 debian/rules     | 7 -------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 78af5f6d..c48bdafe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ python-apt (0.7.7) unstable; urgency=low
   * python/pkgsrcrecords.cc:
     - add "Record" attribute to the PkgSrcRecord to access the
       full source record
+  * debian/rules:
+    - remove the arch-build target, we have bzr-builddeb now
 
  -- Michael Vogt <mvo@debian.org>  Fri, 04 Jul 2008 19:53:28 +0200
 
diff --git a/debian/rules b/debian/rules
index 33d04a21..c8aff2f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,13 +15,6 @@ PKG=python-apt
 DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p')
 DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS)
 
-arch-build::
-	rm -rf debian/arch-build
-	mkdir -p debian/arch-build/$(PKG)-$(DEBVER)
-	tar -c --exclude=arch-build --no-recursion -f - `bzr inventory` \
-	  | (cd debian/arch-build/$(PKG)-$(DEBVER);tar xf -)
-	(cd debian/arch-build/$(PKG)-$(DEBVER) && $(DEB_BUILD_PROG))
-
 build/python-apt-dbg::
 	set -e; \
 	for i in $(cdbs_python_build_versions); do \
-- 
cgit v1.2.3


From f05130ee834d60bbcf4245185886342584a3a4f9 Mon Sep 17 00:00:00 2001
From: Emanuele Rocca <ema@debian.org>
Date: Mon, 21 Jul 2008 17:30:43 +0200
Subject: * data/templates/Debian.info.in:   - s/MatchUri/MatchURI/. Thanks,
 Gustavo Noronha Silva (closes: #487673) * python/cache.cc:   - Throw an
 exception rather than segfaulting when GetCache() is called     before
 InitSystem() (closes: #369147)

---
 data/templates/Debian.info.in | 10 +++++-----
 debian/changelog              | 10 ++++++++++
 python/cache.cc               |  5 +++++
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/data/templates/Debian.info.in b/data/templates/Debian.info.in
index 244e1c6b..b635de19 100644
--- a/data/templates/Debian.info.in
+++ b/data/templates/Debian.info.in
@@ -3,7 +3,7 @@ _ChangelogURI: http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changel
 Suite: etch
 RepositoryType: deb
 BaseURI: http://http.us.debian.org/debian/
-MatchUri: ftp[0-9]*\.[a-z]\.debian\.org
+MatchURI: ftp[0-9]*\.[a-z]\.debian\.org
 MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors
 _Description: Debian 4.0 'Etch' 
 Component: main
@@ -26,7 +26,7 @@ _Description: Security updates
 Suite: sarge
 RepositoryType: deb
 BaseURI: http://http.us.debian.org/debian/
-MatchUri: ftp[0-9]*\.[a-z]\.debian\.org
+MatchURI: ftp[0-9]*\.[a-z]\.debian\.org
 MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors
 _Description: Debian 3.1 'Sarge'
 Component: main
@@ -49,7 +49,7 @@ _Description: Security updates
 Suite: stable
 RepositoryType: deb
 BaseURI: http://http.us.debian.org/debian/
-MatchUri: ftp[0-9]*\.[a-z]\.debian\.org
+MatchURI: ftp[0-9]*\.[a-z]\.debian\.org
 MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors
 _Description: Debian current stable release
 Component: main
@@ -62,7 +62,7 @@ _CompDescription: Non-DFSG-compatible Software
 Suite: testing
 RepositoryType: deb
 BaseURI: http://http.us.debian.org/debian/
-MatchUri: ftp[0-9]*\.[a-z]\.debian\.org
+MatchURI: ftp[0-9]*\.[a-z]\.debian\.org
 MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors
 _Description: Debian testing
 Component: main
@@ -75,7 +75,7 @@ _CompDescription: Non-DFSG-compatible Software
 Suite: sid
 RepositoryType: deb
 BaseURI: http://http.us.debian.org/debian/
-MatchUri: ftp[0-9]*\.[a-z]\.debian\.org
+MatchURI: ftp[0-9]*\.[a-z]\.debian\.org
 MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors
 _Description: Debian 'Sid' (unstable)
 Component: main
diff --git a/debian/changelog b/debian/changelog
index c48bdafe..dd13d341 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+python-apt (0.7.8) unstable; urgency=low
+
+  * data/templates/Debian.info.in:
+    - s/MatchUri/MatchURI/. Thanks, Gustavo Noronha Silva (closes: #487673)
+  * python/cache.cc:
+    - Throw an exception rather than segfaulting when GetCache() is called
+      before InitSystem() (closes: #369147)
+
+ -- Emanuele Rocca <ema@debian.org>  Mon, 21 Jul 2008 17:20:59 +0200
+
 python-apt (0.7.7) unstable; urgency=low
 
   * python/apt_pkgmodule.cc:
diff --git a/python/cache.cc b/python/cache.cc
index 36e49710..66a2c5d9 100644
--- a/python/cache.cc
+++ b/python/cache.cc
@@ -928,6 +928,11 @@ PyObject *TmpGetCache(PyObject *Self,PyObject *Args)
    if (PyArg_ParseTuple(Args, "|O", &pyCallbackInst) == 0)
       return 0;
 
+    if (_system == 0) {
+        PyErr_SetString(PyExc_ValueError,"_system not initialized");
+        return 0;
+    }
+
    pkgCacheFile *Cache = new pkgCacheFile();
 
    if(pyCallbackInst != 0) {
-- 
cgit v1.2.3


From 8e959eb0c05ebabcb806016e0360c128a23b9ec1 Mon Sep 17 00:00:00 2001
From: Emanuele Rocca <ema@debian.org>
Date: Mon, 21 Jul 2008 17:47:36 +0200
Subject: * doc/examples/config.py:   - Fix config.py --help (closes: #257007)

---
 debian/changelog       | 2 ++
 doc/examples/config.py | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dd13d341..52ef9f5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ python-apt (0.7.8) unstable; urgency=low
   * python/cache.cc:
     - Throw an exception rather than segfaulting when GetCache() is called
       before InitSystem() (closes: #369147)
+  * doc/examples/config.py:
+    - Fix config.py --help (closes: #257007)
 
  -- Emanuele Rocca <ema@debian.org>  Mon, 21 Jul 2008 17:20:59 +0200
 
diff --git a/doc/examples/config.py b/doc/examples/config.py
index 222c1331..24d90a0d 100755
--- a/doc/examples/config.py
+++ b/doc/examples/config.py
@@ -42,8 +42,7 @@ if Cnf.FindB("version",0) == 1:
    print "Version selected - 1.1";
 
 if Cnf.FindB("help",0) == 1:
-   print apt_pkg.Package,apt_pkg.Version,"for",apt_pkg.Architecture, \
-         "compiled on",apt_pkg.Date,apt_pkg.Time;
+   print "python-apt",apt_pkg.Version,"compiled on",apt_pkg.Date,apt_pkg.Time;
    print "Hi, I am the help text for this program";
    sys.exit(0);
 
-- 
cgit v1.2.3