configure.in: add -D_GNU_SOURCE to CFLAGS so we can get strsignal

scripts/dpkg-genchanges.pl: output Changed-By just after Maintainer
scripts/cl-debian.pl: really allow a single whitespace to between # and a bugnumber that will be closed.

diff --git a/ChangeLog b/ChangeLog
index 0bd39263b7a860346f2fad40c79011df6e303246..1f01da39a13fe7b981493bf21be918bc521b0d3b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 Thu Apr 13 09:57:52 EDT 2000 Wichert Akkerman <wakkerma@debian.org>
 
+  * configure.in: add -D_GNU_SOURCE to CFLAGS so we can get strsignal
+  * scripts/dpkg-genchanges.pl: output Changed-By just after Maintainer
+  * scripts/cl-debian.pl: really allow a single whitespace to between # and
+    a bugnumber that will be closed.
   * Synchronize with potato-branch again:
     + scripts/dpkg-divert.pl: fixed typo
     + debian/dpkg-dev.{postinst,prerm}: remove emacsen-common stuff

diff --git a/TODO b/TODO
index 0fec2fb360861bcc23532990d46b846cd9430eaf..e62f1958f0945f2021eeb7902d1ebf79d217562c 100644 (file)
--- a/TODO
+++ b/TODO
@@ -6,7 +6,6 @@ start-stop-daemon
 dpkg
 * configuration-file with default options
 * signatures & checksums
-* seperate maintainer and last-changed-by entries in .changes (should be done)
 * integrate debconf (add new status)
 * allow external program to specify how to handle conffiles
 * integrate suidmanager

diff --git a/configure.in b/configure.in
index 5b133ccc85b10d89e1172e5a9040f330d55b4ce4..7864e05717ebe116b70388493d9268800c2a2f47 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,6 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.13])
 
 AC_INIT(include/dpkg.h.in)
+CFLAGS="-D_GNU_SOURCE $CFLAGS"
 AC_CONFIG_HEADER(config.h)
 
 DSELECTDIR="dselect"

diff --git a/debian/changelog b/debian/changelog
index 03a1146837009bb78a125d041a4935308e87d548..878be7a61ab941e329e99f628242da853e3d44ca 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ dpkg (1.7.0) unstable; urgency=low
   * dpkg-architecture: -q should not imply -f, Closes: Bug#57761
   * add dpkg:UpstreamVersion and dpkg:Version substvars in dpkg-genchanges.
     Closes: Bug#62069
+  * dpkg-genchanges: add new Changed-By field to .changes with the last
+    person who made a change, and modify the Maintainer-field to be the
+    actual maintainer. Update the format-version to 1.7 to reflect this.
+  * dpkg-genchanges: allow a space between # and a to-be-closed bugnumber
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

diff --git a/debian/rules b/debian/rules
index 866bebbe5e7c9526ebf1da7f94fb26b88e494b2b..413b963001609fdc3d4c226f3a13e4d45963acc8 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -73,7 +73,7 @@ binary-dpkg: stamp-binary
        install -d -m 755 -o root -g root $(TMP_DPKG)/usr/lib/dpkg
        install -d -m 755 -o root -g root $(TMP_DPKG)/usr/bin
        install -d -m 755 -o root -g root $(TMP_DPKG)/sbin
-       mv $(TMP)/etc $(TMP_DPKG)/
+       -test -d $(TMP)/etc && mv $(TMP)/etc $(TMP_DPKG)/
        mv $(TMP)/var $(TMP_DPKG)/
        mv $(TMP)/usr/sbin/start-stop-daemon $(TMP_DPKG)/sbin/
        mv $(TMP)/usr/sbin $(TMP_DPKG)/usr/

diff --git a/scripts/cl-debian.pl b/scripts/cl-debian.pl
index 5ec9f54e8f50f7d2d5fe7a894af1a5118f5f2199..ae31e0eb1d3555ee01e476a48143bbd6a902dec0 100755 (executable)
--- a/scripts/cl-debian.pl
+++ b/scripts/cl-debian.pl
@@ -138,8 +138,8 @@ $expect eq 'next heading or eof' || die "found eof where expected $expect";
 $f{'Changes'} =~ s/\n$//;
 $f{'Changes'} =~ s/^/\n/;
 
-while ($f{'Changes'} =~ /closes:\s*(?:bug)?\#\s*\d+(?:,\s*(?:bug)?\#\s*\d+)*/ig) {
-  push(@closes, $& =~ /\#(\d+)/g);
+while ($f{'Changes'} =~ /closes:\s*(?:bug)?\#\s?\d+(?:,\s*(?:bug)?\#\s?\d+)*/ig) {
+  push(@closes, $& =~ /\#\s?(\d+)/g);
 }
 $f{'Closes'} = join(' ',sort { $a <=> $b} @closes);
 

diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 55e6a3ba415181a2e478abdf7c5589319d8b00f1..23735e4f785079e6a45691a63e1af7ab5a0c88dc 100755 (executable)
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-$dpkglibdir= ".";
+$dpkglibdir= "."; # This line modified by Makefile
 $version= '1.3.0'; # This line modified by Makefile
 
 $controlfile= 'debian/control';
@@ -63,8 +63,8 @@ Options:  -b                     binary-only build - no source files
 
 $i=100;grep($fieldimps{$_}=$i--,
           qw(Format Date Source Binary Architecture Version
-             Distribution Urgency Maintainer Description Closes Changes
-            Files));
+             Distribution Urgency Maintainer Changed-By Description 
+            Closes Changes Files));
 
 while (@ARGV) {
     $_=shift(@ARGV);