X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fbinary.py;h=d1f78f3ae0cd4b908fb389b2e2683d0dc4c0625b;hb=7c3b93828849a3be154f13761c544eb08fdd94f6;hp=a70aadb943fb2e713a5771f113782384e612d251;hpb=1cc079eee7fce279ec6e9701d82f69a1567955cd;p=dak.git

diff --git a/daklib/binary.py b/daklib/binary.py
old mode 100755
new mode 100644
index a70aadb9..d1f78f3a
--- a/daklib/binary.py
+++ b/daklib/binary.py
@@ -47,7 +47,12 @@ import commands
 import traceback
 import atexit
 
-from debian_bundle import deb822
+try:
+    # starting with squeeze
+    from debian import deb822
+except:
+    # up to lenny
+    from debian_bundle import deb822
 
 from dbconn import *
 from config import Config
@@ -324,13 +329,13 @@ def copy_temporary_contents(binary, bin_association, reject, session=None):
         table = "deb_contents"
     else:
         return False
-    
+
 
     if component.name == "main":
         component_str = ""
     else:
         component_str = component.name + "/"
-        
+
     vals = { 'package':binary.package,
              'version':binary.version,
              'arch':binary.architecture,