Synchronize with potato-branch again:

+ scripts/dpkg-divert.pl: fixed typo
+ debian/dpkg-dev.{postinst,prerm}: remove emacsen-common stuff
+ po/{es,sv}.po: updated
+ debian/changelog: include changes for 1.6.12
+ dpkg-genchanges: recognize non-deb packages (tarballs, such as
  dpkg-non-deb and boot-floppies disk tarballs). This makes sure that we
  include them when figuring up the Arch field in the .changes
+ scripts/dpkg-buildpackage.sh: Don't default to no signing until
  after we parsed the options, otherwise we will miss overrides.

ChangeLog

@@ -1,29 +1,47 @@
+Thu Apr 13 09:57:52 EDT 2000 Wichert Akkerman <wakkerma@debian.org>
+
+  * Synchronize with potato-branch again:
+    + scripts/dpkg-divert.pl: fixed typo
+    + debian/dpkg-dev.{postinst,prerm}: remove emacsen-common stuff
+    + po/{es,sv}.po: updated
+    + debian/changelog: include changes for 1.6.12
+    + dpkg-genchanges: recognize non-deb packages (tarballs, such as
+      dpkg-non-deb and boot-floppies disk tarballs). This makes sure that we
+      include them when figuring up the Arch field in the .changes
+    + scripts/dpkg-buildpackage.sh: Don't default to no signing until
+      after we parsed the options, otherwise we will miss overrides.
+
+Wed Apr 12 19:06:27 EDT 2000 Wichert Akkerman <wakkerma@debian.org>
+
+  * scripts/dpkg-genchanges.pl: add dpkg:Version and dpkg:UpstreamVersion
+    to list of substvars
+
 Sat Mar 18 19:08:20 CET 2000 Wichert Akkerman <wakkerma@debian.org>
 
   * Synchronize with potato-branch again:
-  * scripts/dpkg-buildpackage: improve test for default signcommand
-  * po/ja.po: updated
-  * dselect/*.cc: remove includes for signal.h and curses.h
-  * dselect/dselect.h: include both signal.h and curses.h and #undef
-    the ERR from sys/ucontext.h which breaks curses
-  * scripts/dpkg-divert.pl: fix syntax error
+    + scripts/dpkg-buildpackage: improve test for default signcommand
+    + po/ja.po: updated
+    + dselect/*.cc: remove includes for signal.h and curses.h
+    + dselect/dselect.h: include both signal.h and curses.h and #undef
+      the ERR from sys/ucontext.h which breaks curses
+    + scripts/dpkg-divert.pl: fix syntax error
  
 Sat Mar  4 16:52:38 CET 2000 Wichert Akkerman <wakkerma@debian.org>
 
   * Synchronize with potato-branch again:
-  * debian/changelog: update to 1.6.10
-  * scripts/dpkg-divert.pl: reinstate last writeability-patch. Modified
-    to not abort on ENOENT: this indicates a directory does not (yet)
-    exist. If this happens don't try to rename.
-  * scripts/update-alternatives.pl:
-    + update usage-warning to reflect the new --config option
-    + Document some global variables
-    + Switch back to auto-mode when removing a manually selected alternative
-  * dselect/{dselect.h,main.cc,pkglist.cc}: remove CAN_RESIZE stuff
-  * dselect/methlist.cc: don't abort if getch fails due to interrupted syscall
-  * dselect/pkglist.cc: don't abort if getch fails due to interrupted syscall
-  * dselect/baselist.cc: put debug-statement in sigwinchhandler and
-    actually resize the current terminal before redisplaying the screen
+    + debian/changelog: update to 1.6.10
+    + scripts/dpkg-divert.pl: reinstate last writeability-patch. Modified
+      to not abort on ENOENT: this indicates a directory does not (yet)
+      exist. If this happens don't try to rename.
+    + scripts/update-alternatives.pl:
+      + update usage-warning to reflect the new --config option
+      + Document some global variables
+      + Switch back to auto-mode when removing a manually selected alternative
+    + dselect/{dselect.h,main.cc,pkglist.cc}: remove CAN_RESIZE stuff
+    + dselect/methlist.cc: don't abort if getch fails due to interrupted syscall
+    + dselect/pkglist.cc: don't abort if getch fails due to interrupted syscall
+    + dselect/baselist.cc: put debug-statement in sigwinchhandler and
+      actually resize the current terminal before redisplaying the screen
 
 Thu Mar  2 17:03:04 CET 2000 Wichert Akkerman <wakkerma@debian.org>
 

debian/changelog

@@ -2,10 +2,21 @@ dpkg (1.7.0) unstable; urgency=low
 
   * Use objdump instead of ldd in dpkg-shlibdeps
   * HURD updates, Closes: Bug#57753,#57754,#57755
-  * dpkg-architecture: -q should not imply -f, Closes: Bug# 57761
+  * dpkg-architecture: -q should not imply -f, Closes: Bug#57761
+  * add dpkg:UpstreamVersion and dpkg:Version substvars in dpkg-genchanges.
+    Closes: Bug#62069
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 
+dpkg (1.6.12) frozen unstable; urgency=high
+
+  * Fix test for gpg/pgp in dpkg-buildpackage. You can now build
+    unsigned packages again. Closes: Bug#60395
+  * Updated Spanish and Swedish translations. Closes: Bug#41735
+  * Merge patch from Joel Klecker to remove emacsen-common stuff from dpkg-dev
+
+ -- Wichert Akkerman <wakkerma@debian.org>  Mon,  3 Apr 2000 16:50:02 +0200
+
 dpkg (1.6.11) frozen unstable; urgency=high
 
   * Oops, missed one case where the libc/ncurses conflict reared its

debian/dpkg-dev.postinst

@@ -4,8 +4,4 @@ if [ "$1" = configure ]; then
     if [ -d /usr/doc -a ! -e /usr/doc/dpkg-dev -a -d /usr/share/doc/dpkg-dev ] ; then
         ln -s ../share/doc/dpkg-dev /usr/doc/dpkg-dev
     fi
-
-    if [ -x  /usr/lib/emacsen-common/emacs-package-install ]; then
-        /usr/lib/emacsen-common/emacs-package-install dpkg-dev
-    fi
 fi

debian/dpkg-dev.prerm

@@ -2,12 +2,6 @@
 
 set -e
 
-if [ "$1" = remove ]; then
-    if [ -x /usr/lib/emacsen-common/emacs-package-remove ]; then
-        /usr/lib/emacsen-common/emacs-package-remove dpkg-dev
-    fi
-fi
-
 if [ "$1" = remove -o "$1" = "upgrade" ]; then
     if [ -L /usr/doc/dpkg-dev ]; then
         rm -f /usr/doc/dpkg-dev

scripts/dpkg-buildpackage.sh

@@ -48,13 +48,8 @@ elif command -v pgp > /dev/null 2>&1 ; then
 	signcommand=pgp
 fi
 
-if [ -n "$signcommand"  ] ; then
 	signsource='withecho signfile'
 	signchanges='withecho signfile'
-else
-	signsource=:
-	signchanges=:
-fi
 cleansource=false
 binarytarget=binary
 sourcestyle=''
@@ -99,6 +94,11 @@ do
 	shift
 done
 
+if [ -z "$signcommand"  ] ; then
+	signsource=:
+	signchanges=:
+fi
+
 if test -n "$forcesigninterface" ; then
   signinterface=$forcesigninterface
 else

scripts/dpkg-divert.pl

@@ -199,7 +199,7 @@ sub checkrename {
     # (hopefully) wont overwrite anything. If it succeeds, we
     # assume a writable filesystem.
     foreach $file ($rsrc,$rdest) {
-	open (TMP, ">> ${file}.dpkg-devert.tmp") || $! == NOENT ||
+	open (TMP, ">> ${file}.dpkg-devert.tmp") || $! == ENOENT ||
 		&quit("error checking \`$file': $!");
 	close TMP;
 	if ($1 == ENOENT) {

scripts/dpkg-genchanges.pl

@@ -130,6 +130,12 @@ while(<FL>) {
         $f2sec{$1}= $5;
         $f2pri{$1}= $6;
         push(@fileslistfiles,$1);
+    } elsif (m/^([-+.0-9a-z]+_[^_]+_([-\w]+)\.[a-z0-9.]+) (\S+) (\S+)$/) {
+	# A non-deb package
+	$f2sec{$1}= $3;
+	$f2pri{$1}= $4;
+	push(@archvalues,$2) unless !$2 || $archadded{$2}++;
+	push(@fileslistfiles,$1);
     } elsif (m/^([-+.,_0-9a-zA-Z]+) (\S+) (\S+)$/) {
 	defined($f2sec{$1}) &&
             &warn("duplicate files list entry for file $1 (line $.)");
@@ -230,9 +236,15 @@ for $p (keys %p2f) {
                                  " file but $f2pri{$f} in files list");
 }
 
+# Extract version and origversion so we can add them to our fixed list
+# of substvars
+
+$version= $f{'Version'};
+$origversion= $version; $origversion =~ s/-[^-]+$//;
+$substvar{"dpkg:UpstreamVersion"}=$origversion;
+$substvar{"dpkg:Version"}=$version;
+
 if (!$binaryonly) {
-    $version= $f{'Version'};
-    $origversion= $version; $origversion =~ s/-[^-]+$//;
     $sec= $sourcedefault{'Section'};
     if (!length($sec)) { $sec='-'; &warn("missing Section for source files"); }
     $pri= $sourcedefault{'Priority'};

scripts/update-alternatives.pl

@@ -531,3 +531,5 @@ sub rename_mv {
 	return (rename($_[0], $_[1]) || (system(("mv", $_[0], $_[1])) == 0));
 }
 exit(0);
+
+# vim: nowrap ts=8 sw=4