From: Wichert Akkerman <wakkerma@debian.org>
Date: Sun, 24 Dec 2000 16:10:39 +0000 (+0000)
Subject: show description for udebs as well
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e0d420c1ddf16b25bd990892edf64a2433f46be;p=dpkg

show description for udebs as well
---

diff --git a/ChangeLog b/ChangeLog
index 7d06c39b..0e691387 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Dec 24 17:05:45 CET 2000 Wichert Akkerman <wakkerma@debian.org>
+
+  * scripts/dpkg-genchanges.pl: output descriptions for udebs as well
+
 Sun Dec 24 06:31:55 CST 2000 Adam Heath <doogie@debian.org>
 
   * scripts/dpkg-name.sh: Add -k|--symlink option.
diff --git a/debian/changelog b/debian/changelog
index 03acb693..c3b6dace 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,7 +39,7 @@ dpkg (1.8.0) unstable; urgency=low
   * Update Galish translation
   * Add new --import option to dpkg-statoverride to make it easy to
     import suidmanager settings.
-  * Speedups patches by Adam Heath
+  * Speedup patches by Adam Heath
   * statoverride fixes by Robert Luberda, Closes: Bug#78436
   * Add Linux S/390 support. Closes: Bug#79063
   * Using libz to decompress data instead of calling gzip.
@@ -51,6 +51,7 @@ dpkg (1.8.0) unstable; urgency=low
   * Apply statoverrides to more then just files
   * Update update-alternatives manpage to use FHS instead of FSSTND.
     Closes: Bug#80237
+  * List descriptions for udebs in .changes
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index f8816caf..2ebd73ce 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -125,7 +125,7 @@ if (not $sourceonly) {
     $fileslistfile="./$fileslistfile" if $fileslistfile =~ m/^\s/;
     open(FL,"< $fileslistfile") || &syserr("cannot read files list file");
     while(<FL>) {
-	if (m/^(([-+.0-9a-z]+)_([^_]+)_([-\w]+)\.deb) (\S+) (\S+)$/) {
+	if (m/^(([-+.0-9a-z]+)_([^_]+)_([-\w]+)\.u?deb) (\S+) (\S+)$/) {
 	    defined($p2f{"$2 $4"}) &&
 		&warn("duplicate files list entry for package $2 (line $.)");
 	    $f2p{$1}= $2;
@@ -178,7 +178,11 @@ for $_ (keys %fi) {
 	    $f=$p2f{$p};
 	    if (m/^Description$/) {
 		$v=$` if $v =~ m/\n/;
-		push(@descriptions,sprintf("%-10s - %-.65s",$p,$v));
+		if ($f =~ m/\.udeb$/) {
+			push(@descriptions,sprintf("%-10s - %-.65s (udeb)",$p,$v));
+		} else {
+			push(@descriptions,sprintf("%-10s - %-.65s",$p,$v));
+		}
 	    } elsif (m/^Section$/) {
 		$f2seccf{$f}= $v;
 	    } elsif (m/^Priority$/) {