Merge commit 'alioth/ubuntu-master' into ubuntu-master

diff --git a/bin/parse-contents b/bin/parse-contents
index 82df0b87b74341795df60a232670cd17ded0b9fc..1f4f58d9aea8f414201bd6f894fd694d3ddf25d3 100755 (executable)
--- a/bin/parse-contents
+++ b/bin/parse-contents
@@ -85,9 +85,11 @@ for my $suite (@suites) {
 
                open CONT, "zcat $filename|$what"
                    or die $!;
-               while (<CONT>) { last if /^FILE/mo; }
-               if (eof(CONT)) { # no header found
+               my $header_found = 0;
+               while (<CONT>) { /^FILE/mo && do { $header_found = 1; last };}
+               if (eof(CONT)) { # no header found or only header found
                    close CONT; # explicit close to reset $.
+                   next if $header_found;
                    open CONT, "zcat $filename|$what";
                }
                while (<CONT>) {

diff --git a/bin/parse-packages b/bin/parse-packages
index 97edffcd19666bc4a438c7b1bfe1108a4ecfd132..15eae16c5fac1fe92eae311a28ff610f6fc673c0 100755 (executable)
--- a/bin/parse-packages
+++ b/bin/parse-packages
@@ -68,11 +68,12 @@ for my $suite (@SUITES) {
 
     for my $archive (@ARCHIVES) {
        print "Reading $archive/$suite...\n";
-       if (!-d "$TOPDIR/archive/$archive/$suite/") {
+       my $suite_dir = "$TOPDIR/archive/$archive/$suite";
+       if (!-d $suite_dir) {
                 print "\tseems not to exist, skipping...\n";
                 next;
         }
-       open PKG, "zcat $TOPDIR/archive/$archive/$suite/$what/{,debian-installer/}binary-*/Packages.gz|";
+       open PKG, "zcat $suite_dir/$what/binary-*/Packages.gz $suite_dir/$what/debian-installer/binary-*/Packages.gz|";
        while (<PKG>) {
                next if /^\s*$/;
                my $data = "";

diff --git a/config.sh.sed.in b/config.sh.sed.in
index 2eb47b7472c30281858e9b8afd37160e1d17f3c6..48dd533d1a08b05844e9ef96a4ab167e763c9c75 100644 (file)
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -42,17 +42,14 @@ ddtplangs="ca cs da de eo es fi fr hu it ja ko nl pl pt pt-br ru sk sv uk zh-cn
 archives="us security"
 sections="main multiverse restricted universe"
 parts="$sections"
-suites="dapper dapper-updates dapper-backports edgy edgy-updates edgy-backports feisty feisty-updates feisty-backports gutsy gutsy-updates gutsy-backports hardy hardy-updates hardy-backports intrepid"
+suites="dapper dapper-updates dapper-backports feisty feisty-updates feisty-backports gutsy gutsy-updates gutsy-backports hardy hardy-updates hardy-backports intrepid"
 dists="$suites"
 priorities="required important standard optional extra"
 architectures="i386 amd64 powerpc"
 arch_dapper="i386 amd64 powerpc"
 arch_dapper_updates="${arch_dapper}"
 arch_dapper_backports="${arch_dapper}"
-arch_edgy="${arch_dapper}"
-arch_edgy_updates="${arch_edgy}"
-arch_edgy_backports="${arch_edgy}"
-arch_feisty="${arch_edgy}"
+arch_feisty="${arch_dapper}"
 arch_feisty_updates="${arch_feisty}"
 arch_feisty_backports="${arch_feisty}"
 arch_gutsy="${arch_feisty}"

diff --git a/static/index.tmpl b/static/index.tmpl
index 2c074c81a02996db50c5a13f872d4a315f32947d..da74ff63b66bf8c6c1c65d34fa3647bbfae86d9c 100644 (file)
--- a/static/index.tmpl
+++ b/static/index.tmpl
@@ -6,13 +6,11 @@
 -%]
 [%-
     all_suites = [ 'dapper', 'dapper-updates', 'dapper-backports',
-                  'edgy', 'edgy-updates', 'edgy-backports',
                   'feisty', 'feisty-updates', 'feisty-backports',
                   'gutsy', 'gutsy-updates', 'gutsy-backports',
                   'hardy', 'hardy-updates', 'hardy-backports',
                   'intrepid' ]
     version_numbers = { dapper => '6.06LTS',
-                       edgy   => '6.10',
                        feisty => '7.04',
                        gutsy  => '7.10',
                        hardy  => '8.04LTS'}
@@ -132,6 +130,10 @@ Display:
 <hr>
 <h2>News</h2>
 <dl>
+<dt>2008-06-10</dt>
+<dd>
+<p>Removed edgy</p>
+</dd>
 <dt>2008-04-28</dt>
 <dd>
 <p>Added intrepid</p>