Use python-debian's new debian package instead of debian_bundle

diff --git a/apt_p2p/AptPackages.py b/apt_p2p/AptPackages.py
index 1238c65c46338066867e97e422bc985c8f8c6b37..ac966a9075356bfee0eed92393aed82cd1c2f4b3 100644 (file)
--- a/apt_p2p/AptPackages.py
+++ b/apt_p2p/AptPackages.py
@@ -38,7 +38,7 @@ from twisted.trial import unittest
 
 import apt_pkg, apt_inst
 from apt import OpProgress
 
 import apt_pkg, apt_inst
 from apt import OpProgress

-from debian_bundle import deb822
+from debian import deb822

 
 from apt_p2p_conf import config
 from Hash import HashObject
 
 from apt_p2p_conf import config
 from Hash import HashObject


@@ -228,7 +228,7 @@ class AptPackages:
         rel = deb822.Release(f, fields = ['MD5Sum', 'SHA1', 'SHA256'])
         for hash_type in rel:
             for file in rel[hash_type]:
         rel = deb822.Release(f, fields = ['MD5Sum', 'SHA1', 'SHA256'])
         for hash_type in rel:
             for file in rel[hash_type]:

-                self.indexrecords[cache_path].setdefault(file['name'], {})[hash_type.upper()] = (file[hash_type], file['size'])
+                self.indexrecords[cache_path].setdefault(str(file['name']), {})[hash_type.upper()] = (str(file[hash_type]), file['size'])

             
         f.close()
 
             
         f.close()
 

diff --git a/debian/changelog b/debian/changelog
index 9ab8f99404fff332062f3f354f3301470e09f210..2c3f150c3f8978cf8c8b8c0d3babcd7d0b3bb1ca 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ apt-p2p (0.1.6) unstable; urgency=low
   * Fix various documentation issues
     (Closes: #518590, #518549, #518548, 518550)
   * Add an enable variable to the /etc/default file (Closes: #518594)
   * Fix various documentation issues
     (Closes: #518590, #518549, #518548, 518550)
   * Add an enable variable to the /etc/default file (Closes: #518594)

+  * Use python-debian's new debian package instead of debian_bundle

 
 

- -- Cameron Dale <camrdale@gmail.com>  Sun, 21 Mar 2010 00:25:08 -0700
+ -- Cameron Dale <camrdale@gmail.com>  Sun, 21 Mar 2010 00:30:52 -0700

 
 apt-p2p (0.1.5) unstable; urgency=low
 
 
 apt-p2p (0.1.5) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index b047a9c80b2a5bc83d28e8a338ff0b14f4f2d8bf..6f54fb66505aab89c00084ca73302bc24132b371 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ XS-Dm-Upload-Allowed: yes
 
 Package: apt-p2p
 Architecture: all
 
 Package: apt-p2p
 Architecture: all

-Depends: ${misc:Depends}, ${python:Depends}, python-twisted-web2 (>= 8.0), adduser, python-debian (>= 0.1.4), python-apt (>= 0.7.93), python-pysqlite2 (>= 2.1)
+Depends: ${misc:Depends}, ${python:Depends}, python-twisted-web2 (>= 8.0), adduser, python-debian (>= 0.1.15), python-apt (>= 0.7.93), python-pysqlite2 (>= 2.1)

 Provides: python-apt-p2p, python-apt-p2p-khashmir
 Description: apt helper for peer-to-peer downloads of Debian packages
  Apt-P2P is a helper for downloading Debian packages files with APT.
 Provides: python-apt-p2p, python-apt-p2p-khashmir
 Description: apt helper for peer-to-peer downloads of Debian packages
  Apt-P2P is a helper for downloading Debian packages files with APT.