Pending merge

diff --git a/config/debian/apt.conf b/config/debian/apt.conf
index aee3ab8561cef8f0dff49cad8e885b57e93d1a98..b85e4f036a01ea75856c7c7acadd4a3f6537d7e5 100644 (file)
--- a/config/debian/apt.conf
+++ b/config/debian/apt.conf
@@ -73,7 +73,7 @@ tree "dists/unstable"
    FileList "/srv/ftp.debian.org/database/dists/unstable_$(SECTION)_binary-$(ARCH).list";
    SourceFileList "/srv/ftp.debian.org/database/dists/unstable_$(SECTION)_source.list";
    Sections "main contrib non-free";
-   Architectures "alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sparc source";
+   Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sparc source";
    BinOverride "override.sid.$(SECTION)";
    ExtraOverride "override.sid.extra.$(SECTION)";
    SrcOverride "override.sid.$(SECTION).src";
@@ -145,7 +145,7 @@ tree "dists/unstable/main"
 {
    FileList "/srv/ftp.debian.org/database/dists/unstable_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
-   Architectures "alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sparc";
+   Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sparc";
    BinOverride "override.sid.main.$(SECTION)";
    SrcOverride "override.sid.main.src";
    BinCacheDB "packages-debian-installer-$(ARCH).db";
@@ -157,7 +157,7 @@ tree "dists/unstable/non-free"
 {
    FileList "/srv/ftp.debian.org/database/dists/unstable_non-free_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
-   Architectures "alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sparc";
+   Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sparc";
    BinOverride "override.sid.main.$(SECTION)";
    SrcOverride "override.sid.main.src";
    BinCacheDB "packages-debian-installer-$(ARCH).db";
@@ -169,7 +169,7 @@ tree "dists/experimental/main"
 {
    FileList "/srv/ftp.debian.org/database/dists/experimental_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
-   Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel m68k powerpc s390 sparc";
+   Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel m68k powerpc s390 sparc";
    BinOverride "override.sid.main.$(SECTION)";
    SrcOverride "override.sid.main.src";
    BinCacheDB "packages-debian-installer-$(ARCH).db";
@@ -181,7 +181,7 @@ tree "dists/experimental/non-free"
 {
    FileList "/srv/ftp.debian.org/database/dists/experimental_non-free_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
-   Architectures "alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sparc";
+   Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sparc";
    BinOverride "override.sid.main.$(SECTION)";
    SrcOverride "override.sid.main.src";
    BinCacheDB "packages-debian-installer-$(ARCH).db";
@@ -196,7 +196,7 @@ tree "dists/experimental"
    FileList "/srv/ftp.debian.org/database/dists/experimental_$(SECTION)_binary-$(ARCH).list";
    SourceFileList "/srv/ftp.debian.org/database/dists/experimental_$(SECTION)_source.list";
    Sections "main contrib non-free";
-   Architectures "alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sparc source";
+   Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sparc source";
    BinOverride "override.sid.$(SECTION)";
    SrcOverride "override.sid.$(SECTION).src";
    Contents " ";

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index daf7a50e0ddba9c06250ebce2d59b6c0614604a8..6a989215edf8721a2a8dabb819ec604c1fde850e 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -529,6 +529,7 @@ Suite
          alpha;
          amd64;
          arm;
+         armel;
          hppa;
          hurd-i386;
          i386;
@@ -578,6 +579,7 @@ Suite
          alpha;
          amd64;
          arm;
+         armel;
          hppa;
          hurd-i386;
          i386;

diff --git a/config/debian/vars b/config/debian/vars
index f92ac93c65bb6a4ac0a724031ed462e3db9e8b6a..b88a83d2f10b598a8d3a9f52ba88081bed6a0574 100644 (file)
--- a/config/debian/vars
+++ b/config/debian/vars
@@ -4,7 +4,7 @@ base=/srv/ftp.debian.org
 ftpdir=$base/ftp
 webdir=$base/web
 indices=$ftpdir/indices
-archs="alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc"
+archs="alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc"
 
 scriptdir=$base/scripts
 masterdir=$base/dak/

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index e4f055dee9238405be1bb4dfabd4130a920c248f..4a4cfd6b341d35f1f4e07e4425d2d30349eb9aeb 100755 (executable)
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -405,7 +405,7 @@ def check_files():
             files[file]["type"] = "unreadable"
             continue
         # If it's byhand skip remaining checks
-        if files[file]["section"] == "byhand" or files[file]["section"][4:] == "raw-":
+        if files[file]["section"] == "byhand" or files[file]["section"][:4] == "raw-":
             files[file]["byhand"] = 1
             files[file]["type"] = "byhand"
         # Checks for a binary package...

diff --git a/scripts/debian/dm-monitor b/scripts/debian/dm-monitor
index d461643304af2cf1eb4c12db0afb0b132f9ff886..87846b7009325efdbdf260f8fa9258f498953c6d 100755 (executable)
--- a/scripts/debian/dm-monitor
+++ b/scripts/debian/dm-monitor
@@ -9,6 +9,25 @@ psql --html projectb <<EOF
 ORDER BY uid.uid;
 EOF
 
+echo "Debian maintainers not able to update any packages:"
+
+psql --html projectb <<EOF
+  SELECT uid.uid, uid.name
+    FROM uid 
+   WHERE uid.uid LIKE 'dm:%'
+     AND uid.uid NOT IN (
+              SELECT u.uid
+                FROM src_uploaders su JOIN source s ON (su.source = s.id)
+                     JOIN src_associations sa ON (s.id = sa.source)
+                     JOIN maintainer m ON (su.maintainer = m.id)
+                     JOIN uid u ON 
+                      (m.name LIKE u.name || ' <%>' OR
+                       m.name LIKE '% <' || substring(u.uid FROM 4) || '>')
+               WHERE u.uid LIKE 'dm:%' AND sa.suite = 5
+         )
+ORDER BY uid.uid;
+EOF
+
 echo "Packages debian maintainers may update:"
 
 psql --html projectb <<EOF
@@ -16,7 +35,8 @@ psql --html projectb <<EOF
     FROM src_uploaders su JOIN source s ON (su.source = s.id) 
          JOIN src_associations sa ON (s.id = sa.source)
          JOIN maintainer m ON (su.maintainer = m.id)
-         JOIN uid u ON (m.name LIKE u.name || ' <%>')
+         JOIN uid u ON (m.name LIKE u.name || ' <%>' OR
+                       m.name LIKE '% <' || substring(u.uid FROM 4) || '>')
    WHERE u.uid LIKE 'dm:%' AND sa.suite = 5
 ORDER BY u.uid, s.source, s.version;
 EOF

diff --git a/scripts/debian/update-ftpstats b/scripts/debian/update-ftpstats
index 17a47cb16f9eb3a4a9f289ff6537687a8c642299..d0d519d5cfdf9f369fbac3d14cf944723c75cff9 100755 (executable)
--- a/scripts/debian/update-ftpstats
+++ b/scripts/debian/update-ftpstats
@@ -2,7 +2,7 @@
 
 my %data;
 my %data2;
-my @archs = ("source", "all", "amd64", "i386", "alpha", "arm", "hppa",
+my @archs = ("source", "all", "amd64", "i386", "alpha", "arm", "armel", "hppa",
        "hurd-i386", "ia64", "m68k", "mips", "mipsel", "powerpc", "s390",
        "sparc");