X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=bin%2Fparse-packages;h=97edffcd19666bc4a438c7b1bfe1108a4ecfd132;hb=05972114f36a4a9cb076dec5320337a35462f3b9;hp=3c783234ed9bef24fc59fa5c4a35426e72a5d06a;hpb=485fe50d53e3d25a624ab058678891e6c830ee3c;p=deb%2Fpackages.git

diff --git a/bin/parse-packages b/bin/parse-packages
index 3c78323..97edffc 100755
--- a/bin/parse-packages
+++ b/bin/parse-packages
@@ -87,9 +87,9 @@ for my $suite (@SUITES) {
 		}
 		# Skip double package
 		next if exists($packages_all_db{"$data{'package'} $data{'architecture'} $data{'version'}"});
-		# Skip arch:all for amd64 & gnuab, any non-redundancy is
+		# Skip arch:all for amd64 & debports, any non-redundancy is
 		# usually a bug anyway
-		next if ($archive eq 'amd64' or $archive eq 'gnuab')
+		next if ($archive eq 'amd64' or $archive eq 'debports')
 		    and $data{architecture} eq 'all';
 
 		if ($data{'provides'}) {
@@ -157,7 +157,7 @@ for my $suite (@SUITES) {
 		$subsections{$suite}{$subsection}++;
 		$priorities{$suite}{$data{priority}}++;
 		my $pkgitem = "$archive $suite $data{'architecture'} ".
-			"$section $subsection $data{'priority'} $data{'version'} $sdescr\0";
+			"$section $subsection $data{'priority'} $data{'version'} $data{'description-md5'} $sdescr\0";
 		my $previtem = ($packages_small{$data{'package'}}{$suite}{$data{'architecture'}}
 		    ||= $pkgitem);
 		$packages_small{$data{'package'}}{$suite}{$data{'architecture'}} = $pkgitem
@@ -336,11 +336,10 @@ tie %package_postfixes_db, "DB_File", "$DBDIR/package_postfixes.db.new",
 	or die "Error creating DB: $!";
 while (my ($k, $v) = each(%package_postfixes)) {
 	$v =~ s/.$//s;
-	my $nr = $v;
-	$nr =~ s/[^\000]//g;
-	$nr = length($nr) + 1; # < number of hits
+	my $nr = ($v =~ tr/\000/\000/) + 1;
 	if ($nr > $MAX_PACKAGE_POSTFIXES) {
-		$v = "\001" . $nr;
+	    $v = ($v =~ /\^/) ? "^\001" . $nr
+		: "\001" . $nr;
 	}
 	$package_postfixes_db{$k} = $v;
 }