[JT] sync

diff --git a/ChangeLog b/ChangeLog
index ff2ccb12f8809cc4e47de8d47c9b1cdf6297b9d4..069f674325ae0847090791d7dd102c2dea017dbc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,25 @@
        * config/debian/apt.conf: Add hurd-i386 to unstable
        debian-installer stanza.
 
+2007-12-28  Joerg Jaspert  <joerg@debian.org>
+
+       * KEYEXPIRED is actually a known keyword. We do check it earlier
+       on and reject in case the sig is bad (or unknown)
+
+2007-12-24  Joerg Jaspert  <joerg@debian.org>
+
+       * Also run lintian on the .dsc file to check the source itself.
+
+       * Fix the direct usage of ar | tar etc to get the copyright file
+       and use dpkg-deb, which is made for this and makes us able to
+       process data.tar.bz2 (or whatever format it will be in the
+       future).
+
+2007-12-21  Joerg Jaspert  <joerg@debian.org>
+
+       * Remove the (now useless) check for a pre-depends on dpkg for
+         binaries that contain bzip2 compressed data tarballs.
+
 2007-08-28  Anthony Towns  <ajt@debian.org>
 
        * process_unchecked.py: Add support for automatic BYHAND

diff --git a/dak/examine_package.py b/dak/examine_package.py
index c1de75763af6e4d9147d384cc68ed2817205eb7d..48163156614f54e740c46ba39d9f390a98460e22 100755 (executable)
--- a/dak/examine_package.py
+++ b/dak/examine_package.py
@@ -291,7 +291,7 @@ def do_command (command, filename):
 
 def print_copyright (deb_filename):
     package = re_package.sub(r'\1', deb_filename)
-    o = os.popen("ar p %s data.tar.gz | tar tzvf - | egrep 'usr(/share)?/doc/[^/]*/copyright' | awk '{ print $6 }' | head -n 1" % (deb_filename))
+    o = os.popen("dpkg-deb -c %s | egrep 'usr(/share)?/doc/[^/]*/copyright' | awk '{print $6}' | head -n 1" % (deb_filename))
     copyright = o.read()[:-1]
 
     if copyright == "":
@@ -303,7 +303,7 @@ def print_copyright (deb_filename):
         print "WARNING: wrong doc directory (expected %s, got %s)." % (package, doc_directory)
         return
 
-    o = os.popen("ar p %s data.tar.gz | tar xzOf - %s" % (deb_filename, copyright))
+    o = os.popen("dpkg-deb --fsys-tarfile %s | tar xvOf - %s" % (deb_filename, copyright))
     copyright = o.read()
     copyrightmd5 = md5.md5(copyright).hexdigest()
 
@@ -319,6 +319,8 @@ def check_dsc (dsc_filename):
     print "---- .dsc file for %s ----" % (dsc_filename)
     (dsc) = read_dsc(dsc_filename)
     print dsc
+    print "---- lintian check for %s ----" % (dsc_filename)
+        do_command ("lintian --show-overrides --color always", dsc_filename)
 
 def check_deb (deb_filename):
     filename = os.path.basename(deb_filename)

diff --git a/daklib/utils.py b/daklib/utils.py
old mode 100644 (file)
new mode 100755 (executable)
index a3c46a7..2b40219
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -1060,7 +1060,7 @@ used."""
     # Finally ensure there's not something we don't recognise
     known_keywords = Dict(VALIDSIG="",SIG_ID="",GOODSIG="",BADSIG="",ERRSIG="",
                           SIGEXPIRED="",KEYREVOKED="",NO_PUBKEY="",BADARMOR="",
-                          NODATA="",NOTATION_DATA="",NOTATION_NAME="")
+                          NODATA="",NOTATION_DATA="",NOTATION_NAME="",KEYEXPIRED="")
 
     for keyword in keywords.keys():
         if not known_keywords.has_key(keyword):