This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
Format: 1.7
Date: Wed, 13 Feb 2008 00:58:33 +0100
Source: dpkg
Binary: dpkg dselect dpkg-dev
Architecture: source
Version: 1.14.16.6ubuntu3
Distribution: hardy
Urgency: low
Maintainer: Ubuntu Core Developers <[EMAIL PROTECTED]>
Changed-By: Soren Hansen <[EMAIL PROTECTED]>
Description: 
 dpkg       - package maintenance system for Debian
 dpkg-dev   - package building tools for Debian
 dselect    - user tool to manage Debian packages
Changes: 
 dpkg (1.14.16.6ubuntu3) hardy; urgency=low
 .
   [ Stephan Hermann ]
   * Re-Introduced the "Description" field in *_source.changes files, according
     to Debian Policy.
     This was removed during 1.14.16.6 upload and will be reintroduced in
     1.14.17
     Changes were taken from debians dpkg git Thx to Raphael Herzog for
     pointing this out
 .
   [ Soren Hansen ]
   * Remove NO_PKG_MANGLE to re-enable building of dpkg ddeb's.
Files: 
 5e656000725bdafa187d1d3baed923b2 1157 admin required dpkg_1.14.16.6ubuntu3.dsc
 57eba4b238880a888643ebd3b418c27b 6376629 admin required 
dpkg_1.14.16.6ubuntu3.tar.gz
Original-Maintainer: Dpkg Developers <[email protected]>
diff -pruN 1.14.16.6ubuntu2/debian/changelog 1.14.16.6ubuntu3/debian/changelog
--- 1.14.16.6ubuntu2/debian/changelog   2008-02-11 22:41:15.000000000 +0000
+++ 1.14.16.6ubuntu3/debian/changelog   2008-02-12 23:58:33.000000000 +0000
@@ -1,3 +1,18 @@
+dpkg (1.14.16.6ubuntu3) hardy; urgency=low
+
+  [ Stephan Hermann ]
+  * Re-Introduced the "Description" field in *_source.changes files, according
+    to Debian Policy.
+    This was removed during 1.14.16.6 upload and will be reintroduced in
+    1.14.17
+    Changes were taken from debians dpkg git Thx to Raphael Herzog for
+    pointing this out
+
+  [ Soren Hansen ]
+  * Remove NO_PKG_MANGLE to re-enable building of dpkg ddeb's.
+
+ -- Soren Hansen <[EMAIL PROTECTED]>  Wed, 13 Feb 2008 00:58:33 +0100
+
 dpkg (1.14.16.6ubuntu2) hardy; urgency=low
 
   * Fix wrong call to open in Dpkg/Control.pm that makes using a different
diff -pruN 1.14.16.6ubuntu2/debian/rules 1.14.16.6ubuntu3/debian/rules
--- 1.14.16.6ubuntu2/debian/rules       2008-02-11 22:37:29.000000000 +0000
+++ 1.14.16.6ubuntu3/debian/rules       2008-02-12 23:58:01.000000000 +0000
@@ -93,7 +93,7 @@ binary-arch: install
        install -m 644 debian/dselect.lintian-overrides \
                       debian/dselect/usr/share/lintian/overrides/dselect
 
-       NO_PKG_MANGLE=1 dh_strip -a
+       dh_strip -a
        dh_compress -a
        dh_fixperms -a
        dh_installdeb -a
diff -pruN 1.14.16.6ubuntu2/scripts/dpkg-genchanges.pl 
1.14.16.6ubuntu3/scripts/dpkg-genchanges.pl
--- 1.14.16.6ubuntu2/scripts/dpkg-genchanges.pl 2008-02-09 08:25:07.000000000 
+0000
+++ 1.14.16.6ubuntu3/scripts/dpkg-genchanges.pl 2008-02-12 23:57:53.000000000 
+0000
@@ -260,13 +260,18 @@ foreach $_ (keys %{$src_fields}) {
     }
 }
 
-# Scan control info of all binary packages unless
-# we have a source only upload
-my @pkg;
-push @pkg, $control->get_packages() unless is_sourceonly;
-foreach my $pkg (@pkg) {
+# Scan control info of all binary packages
+foreach my $pkg ($control->get_packages()) {
     my $p = $pkg->{"Package"};
     my $a = $pkg->{"Architecture"};
+    my $d = $pkg->{"Description"} || "no description available";
+    $d = $1 if $d =~ /^(.*)\n/;
+    my @f; # List of files for this binary package
+    push @f, @{$p2f{$p}} if defined $p2f{$p};
+    # Add description of all binary packages
+    my $desc = sprintf("%-10s - %-.65s", $p, $d);
+    $desc .= " (udeb)" if (grep(/\.udeb$/, @f)); # XXX: Check Package-Type 
field instead
+    push @descriptions, $desc;
 
     if (not defined($p2f{$p})) {
        # No files for this package... warn if it's unexpected
@@ -279,18 +284,12 @@ foreach my $pkg (@pkg) {
        next; # and skip it
     }
 
-    my @f = @{$p2f{$p}}; # List of files for this binary package
     $p2arch{$p} = $a;
 
     foreach $_ (keys %{$pkg}) {
        my $v = $pkg->{$_};
 
-       if (m/^Description$/) {
-           $v = $1 if $v =~ m/^(.*)\n/;
-           my $desc = sprintf("%-10s - %-.65s", $p, $v);
-           $desc .= " (udeb)" if (grep(/\.udeb$/, @f));
-           push @descriptions, $desc;
-       } elsif (m/^Section$/) {
+       if (m/^Section$/) {
            $f2seccf{$_} = $v foreach (@f);
        } elsif (m/^Priority$/) {
            $f2pricf{$_} = $v foreach (@f);

Reply via email to