[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

new dpkg release, 1.6.5.1, contains 1-line patch for thinko in 1.6.5



===
diff -ruN dpkg-1.6.5/debian/changelog dpkg-1.6.5.1/debian/changelog
--- dpkg-1.6.5/debian/changelog	Fri Dec 24 21:47:11 1999
+++ dpkg-1.6.5.1/debian/changelog	Tue Dec 28 16:37:36 1999
@@ -1,3 +1,11 @@
+dpkg (1.6.5.1) unstable; urgency=low
+
+  * Fix dpkg-safefilelist so that files are doubled in .debs.  Closes:
+    #53633.
+  * Lintian clean(ignoring what I believe to be an errneous W:).
+
+ -- Adam Heath <doogie@debian.org>  Tue, 28 Dec 1999 16:37:28 -0600
+
 dpkg (1.6.5) unstable; urgency=low
 
   * Update Spanish translation
diff -ruN dpkg-1.6.5/debian/control dpkg-1.6.5.1/debian/control
--- dpkg-1.6.5/debian/control	Fri Dec 24 19:52:56 1999
+++ dpkg-1.6.5.1/debian/control	Tue Dec 28 16:42:05 1999
@@ -25,7 +25,7 @@
 Section: devel
 Priority: important
 Architecture: all
-Depends: perl5, cpio (>= 2.4.2-2), patch (>= 2.2-1), make
+Depends: perl5, cpio (>= 2.4.2-2), patch (>= 2.2-1), make, dpkg
 Recommends: c-compiler
 Suggests: gnupg, debian-keyring
 Conflicts: dpkgname
@@ -44,6 +44,7 @@
 Section: doc
 Priority: extra
 Architecture: all
+Depends: dpkg
 Replaces: dpkg-dev (<<1.4.1.19)
 Description: Dpkg Internals Documentation
  This document describes the internal operations of the dpkg program. It
diff -ruN dpkg-1.6.5/debian/rules dpkg-1.6.5.1/debian/rules
--- dpkg-1.6.5/debian/rules	Fri Dec 24 21:47:00 1999
+++ dpkg-1.6.5.1/debian/rules	Tue Dec 28 16:20:18 1999
@@ -115,7 +115,7 @@
 
 	dpkg-shlibdeps -dPre-Depends -Tdebian/dpkg.substvars \
 		$(TMP_DPKG)/usr/bin/dpkg $(TMP_DPKG)/usr/bin/dselect
-	dpkg-gencontrol -Tdebian/dpkg.substvars -pdpkg -P$(TMP_DPKG)
+	dpkg-gencontrol -isp -Tdebian/dpkg.substvars -pdpkg -P$(TMP_DPKG)
 	dpkg --build $(TMP_DPKG) ..
 
 binary-dpkg-dev: stamp-binary
@@ -172,7 +172,7 @@
 	install -p -m 755 -o root -g root debian/dpkg-dev.prerm $(TMP_DPKG_DEV)/DEBIAN/prerm
 	install -p -m 755 -o root -g root debian/dpkg-dev.postinst $(TMP_DPKG_DEV)/DEBIAN/postinst
 
-	dpkg-gencontrol -Tdebian/dpkg-dev.substvars -pdpkg-dev -P$(TMP_DPKG_DEV)
+	dpkg-gencontrol -isp -Tdebian/dpkg-dev.substvars -pdpkg-dev -P$(TMP_DPKG_DEV)
 	dpkg --build $(TMP_DPKG_DEV) ..
 
 binary-dpkg-doc: stamp-binary
@@ -197,7 +197,7 @@
 	install -p -m 755 -o root -g root debian/dpkg-doc.prerm $(TMP_DPKG_DOC)/DEBIAN/prerm
 	install -p -m 755 -o root -g root debian/dpkg-doc.postinst $(TMP_DPKG_DOC)/DEBIAN/postinst
 
-	dpkg-gencontrol -Tdebian/dpkg-dev.substvars -pdpkg-doc -P$(TMP_DPKG_DOC)
+	dpkg-gencontrol -isp -Tdebian/dpkg-dev.substvars -pdpkg-doc -P$(TMP_DPKG_DOC)
 	dpkg --build $(TMP_DPKG_DOC) ..
 
 binary-arch: binary-dpkg
diff -ruN dpkg-1.6.5/scripts/dpkg-safefilelist.pl dpkg-1.6.5.1/scripts/dpkg-safefilelist.pl
--- dpkg-1.6.5/scripts/dpkg-safefilelist.pl	Fri Dec 24 19:52:21 1999
+++ dpkg-1.6.5.1/scripts/dpkg-safefilelist.pl	Tue Dec 28 14:04:06 1999
@@ -1,13 +1,11 @@
 #!/usr/bin/perl
 open(FILES, "find -mindepth 1|");
-sub myprint {
-	print "@_\n";
-}
 while (<FILES>) {
 	chomp;
 	$file = $_;
 	if( ! -l $file ) {
 		print "$file\n" if(!$targets{$file});
+		next;
 	}
 	$newfile = $file;
 	$oldfile = $newfile;
===

----BEGIN GEEK CODE BLOCK----
Version: 3.12
GCS d- s: a-- c+++ UL++++ P+ L++++ !E W+ M o+ K- W--- !O M- !V PS--
PE++ Y+ PGP++ t* 5++ X+ tv b+ D++ G e h*! !r z?
-----END GEEK CODE BLOCK-----
----BEGIN PGP INFO----
Adam Heath <doogie@debian.org>        Finger Print | KeyID
67 01 42 93 CA 37 FB 1E    63 C9 80 1D 08 CF 84 0A | DE656B05 PGP
AD46 C888 F587 F8A3 A6DA  3261 8A2C 7DC2 8BD4 A489 | 8BD4A489 GPG
-----END PGP INFO-----


Reply to: