Merge remote branch 'mhy/master' into merge

Signed-off-by: Mark Hymers <mhy@debian.org>

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index afbfce167be939db564201cdccd94fdffa0b571f..abece80332926af50cd3052c8286b35329f8a47e 100644 (file)
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -141,8 +141,6 @@ function filelist() {
 }
 
 function fingerprints() {
-    log "Not updating fingerprints - scripts needs checking"
-
     log "Updating fingerprints"
     dak import-keyring -L /srv/keyring.debian.org/keyrings/debian-keyring.gpg
 

diff --git a/docs/README.quotes b/docs/README.quotes
index adad8cdcbf479271b4af0db64fbf90dec4d90e79..6b89fc0f6dd61c30642c5ce0ee5d0189d08dedf4 100644 (file)
--- a/docs/README.quotes
+++ b/docs/README.quotes
@@ -346,3 +346,11 @@ Canadians: This is a lighthouse. Your call.
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 <mhy> I wish they wouldnt leave biscuits out, thats just tempting. Damnit.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+< mvo> that screams for consolidation in libapt at least (that then in turn can use libdpkg … ) - I guess the "d" means delayed ;)
+
+(whilst discussing adding xz support to dak, and therefore python-apt, and
+therefore libapt-pkg)
+