From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Fri, 20 Jun 2008 23:29:23 +0000 (+0200)
Subject: Merge commit 'alioth/ubuntu-master' into ubuntu-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=b9f1ee37ac17e618a6f4ec774823bc551a952839;hp=3e2e3d70867be455d5562c017863420f5bc593ef;p=deb%2Fpackages.git

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

diff --git a/bin/parse-contents b/bin/parse-contents
index 82df0b8..1f4f58d 100755
--- 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 97edffc..15eae16 100755
--- 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 2eb47b7..48dd533 100644
--- 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 2c074c8..da74ff6 100644
--- 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>