Merge remote-tracking branch 'ansgar/pu/backports-merge' into merge

* ansgar/pu/backports-merge:
  daklib/checks.py: add note to send warning for DMUA later
  daklib/checks.py: restore comment about hijack check
  daklib/checks.py: include all not allowed binary architectures in error.
  Add suite ACLs and per-suite NEW.
  daklib/upload.py (Changes): add source_name property
  daklib/archive.py: set final_suites earlier.
  daklib/checks.py: use final_suites for DM check
  daklib/archive.py: look for target suites earlier
  add per-suite close_bugs option
  Add per-suite database permissions.
  setup/dak-minimal.conf.template: add missing Dir::Base

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index 80c912f854873ce59b3b413e9f814881f2726008..fa565c4e7e45adc3b8c93508d27472dc220b0f56 100755 (executable)
--- a/config/debian/cron.hourly
+++ b/config/debian/cron.hourly
@@ -29,7 +29,7 @@ fi
 dak queue-report -n > $webdir/new.html
 dak queue-report -8 -d new,byhand,stable-new,oldstable-new -r $webdir/stat
 dak show-deferred -r $webdir/stat > ${webdir}/deferred.html
-dak graph -n new,byhand,p-u-new,o-p-u-new,deferred -r $webdir/stat -i $webdir/stat -x $scriptsdir/rrd-release-freeze-dates
+dak graph -n new,byhand,stable-new,oldstable-new,deferred -r $webdir/stat -i $webdir/stat -x $scriptsdir/rrd-release-freeze-dates
 
 cd $webdir
 cat removals-20*.txt > removals-full.txt

diff --git a/config/debian/lintian.tags b/config/debian/lintian.tags
index c2c53419817630a830dfb51022281d5726958317..76713e63ddc9601c1928e831f4e45ca71ae78d9d 100644 (file)
--- a/config/debian/lintian.tags
+++ b/config/debian/lintian.tags
@@ -42,7 +42,6 @@ lintian:
     - binary-file-compressed-with-upx
     - file-in-usr-marked-as-conffile
     - build-info-in-binary-control-file-section
-    - debian-control-with-duplicate-fields
     - not-allowed-control-file
     - control-file-has-bad-permissions
     - control-file-has-bad-owner
@@ -52,7 +51,6 @@ lintian:
     - copyright-file-compressed
     - copyright-file-is-symlink
     - usr-share-doc-symlink-to-foreign-package
-    - old-style-copyright-file
     - copyright-refers-to-incorrect-directory
     - package-has-no-description
     - description-synopsis-is-empty
@@ -73,7 +71,6 @@ lintian:
     - uploader-name-missing
     - uploader-address-malformed
     - uploader-address-is-on-localhost
-    - no-source-field
     - source-field-does-not-match-pkg-name
     - symlink-has-too-many-up-segments
     - debian-rules-not-a-makefile

diff --git a/docs/README.quotes b/docs/README.quotes
index 12b1e3748a63afbe919dd57eceff8fdb78e47641..ff6810f7e3475d32ced1003aaaad0549bffe0697 100644 (file)
--- a/docs/README.quotes
+++ b/docs/README.quotes
@@ -363,3 +363,19 @@ Canadians: This is a lighthouse. Your call.
 <DktrKranz> may I call you Roy then?
 <Ganneff> may i kick you?
 <Ganneff> im not a geek. im married and have a son. nono geek no.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+<taffit> Hi, http://ftp-master.debian.org/deferred.html is a bit outated
+<Ganneff> yes, DktrKranz broke the code.
+<DktrKranz> nope
+<DktrKranz> it's dak's fault!
+<Ganneff> never ever.
+<Ganneff> must be you
+<jcristau> bad dak
+<Ganneff> rule 1: dak is never at fault.
+<Ganneff> rule 2: ftpmasters are always right. may cancel rule 1.
+<Ganneff> rule 3: see above.
+<ansgar> The bot is innocent!
+<DktrKranz> rule 0: there are no rules!
+* DktrKranz hides

diff --git a/tools/obsolete_lintian_tags.pl b/tools/obsolete_lintian_tags.pl
new file mode 100755 (executable)
index 0000000..0de77d3
--- /dev/null
+++ b/tools/obsolete_lintian_tags.pl
@@ -0,0 +1,49 @@
+#!/usr/bin/perl
+#
+# Generates a list of obsolete lintian autoreject tags
+# (C) 2012 Niels Thykier <nthykier@debian.org>
+# (C) 2012 Luca Falavigna <dktrkranz@debian.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# version 2 as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA
+
+
+use strict;
+use warnings;
+
+BEGIN {
+    $ENV{'LINTIAN_ROOT'} = '/usr/share/lintian'
+        unless defined $ENV{'LINTIAN_ROOT'};
+};
+
+use Getopt::Long;
+use lib "$ENV{'LINTIAN_ROOT'}/lib";
+use Lintian::Profile;
+
+my $profile = Lintian::Profile->new ('debian', $ENV{'LINTIAN_ROOT'},
+                                     ["$ENV{'LINTIAN_ROOT'}/profiles"]);
+my @lintian_tags = (sort $profile->tags(1));
+my $autoreject_tags = '../config/debian/lintian.tags';
+
+open (LINTIAN, $autoreject_tags) or die ('Could not open lintian tags file.');
+foreach my $tag (<LINTIAN>) {
+    if ($tag =~ m/\s+- \S+/) {
+        $tag =~ s/\s+- //;
+        chomp $tag;
+        print "$tag\n" if not grep (/^$tag$/i, @lintian_tags);
+    }
+}
+close (LINTIAN);
+
+exit 0;