[JJ, r=JT] merge Joerg's outstanding changes.

diff --cc ChangeLog
index ff2ccb12f8809cc4e47de8d47c9b1cdf6297b9d4,ae0abe8af4b3889005d25a0ce32525b1f6168c05..069f674325ae0847090791d7dd102c2dea017dbc
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,23 -1,22 +1,42 @@@
 +2007-12-28  Anthony Towns  <ajt@debian.org>
 +
 +      * daklib/utils.py (check_signature): add NOTATION_DATA and
 +      NOTATION_NAME to known keywords.
 +
 +      * daklib/queue.py (Upload.check_source_against_db): 
 +
 +      * dak/make_suite_file_list.py: add -f/--force option.
 +
 +      * dak/generate_releases.py: add -a/--apt-conf=FILE and
 +      -f/--force-touch options.  Pull version info from the database.
 +      Make suite description optional.
 +
 +      * config/debian/dak.conf: update
 +      Reject-Proposed-Updates::MoreInfoURL.  Comment out
 +      Suite::Stable::Version and ::Description.
 +
 +      * 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 --cc daklib/utils.py
index a3c46a7b284a543bbb637fb851792e18f0847d84,a7a1085787c7f48c91ee66cae42858bf4cf0ffb9..2b40219c12bf0ff8823a4cb8d4ff13e1f3d9adc6
mode 100644,100755..100755
--- 1/daklib/utils.py
--- 2/daklib/utils.py
+++ b/daklib/utils.py
@@@ -1060,7 -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="",KEYEXPIRED="")
++                          NODATA="",NOTATION_DATA="",NOTATION_NAME="",KEYEXPIRED="")
  
      for keyword in keywords.keys():
          if not known_keywords.has_key(keyword):