Merge changelogs from my dpkg-source branch

ChangeLog

@@ -1,3 +1,17 @@
+2007-10-09  Frank Lichtenheld  <djpig@debian.org>
+
+	* scripts/dpkg-buildpackage.pl: Add -z/-Z to
+	passthrough opts (will be passed to dpkg-source).
+
+	* scripts/dpkg-source.pl: Support a subset of
+	wig&pen (aka Format: 2.0) on build:
+	Use .orig.tar.(bz2|lzma) if they are available
+	and no .gz can be found. Also let the user specify
+	via -Z(gz|bz2|lzma) how files that need to be
+	generated should be compressed. -z([1-9]|best|fast)
+	can be used to specify the compression level
+	to use.
+
 2007-10-08  Raphael Hertzog  <hertzog@debian.org>,
 	    Frank Lichtenheld <djpig@debian.org>
 
@@ -54,11 +68,6 @@
 	* scripts/dpkg-buildpackage.pl (usage): Remove details about running
 	fakeroot only if it's available.
 
-2007-10-07  Frank Lichtenheld  <djpig@debian.org>
-
-	* scripts/dpkg-buildpackage.pl: Add -z/-Z to
-	passthrough opts (will be passed to dpkg-source).
-
 2007-10-07  Frank Lichtenheld  <djpig@debian.org>
 	    Marcel Toele  <mtoele@kern.nl>
 
@@ -67,17 +76,6 @@
 	the filename contains spaces. Apparantly this is
 	standard but undocumented diff behaviour.
 
-2007-10-06  Frank Lichtenheld  <djpig@debian.org>
-
-	* scripts/dpkg-source.pl: Support a subset of
-	wig&pen (aka Format: 2.0) on build:
-	Use .orig.tar.(bz2|lzma) if they are available
-	and no .gz can be found. Also let the user specify
-	via -Z(gz|bz2|lzma) how files that need to be
-	generated should be compressed. -z([1-9]|best|fast)
-	can be used to specify the compression level
-	to use.
-
 2007-09-29  Frank Lichtenheld  <djpig@debian.org>
 
 	* scripts/dpkg-buildpackage.pl: Call checkversion()

debian/changelog

@@ -32,6 +32,9 @@ dpkg (1.14.8) UNRELEASED; urgency=low
 
   [ Frank Lichtenheld ]
   * Add $(MAKE) check to build target
+  * Allow to use other compressions than gzip on dpkg-source -b
+    (NOTE: this will result in a Format: 2.0 source package!).
+    Closes: #382673
 
   [ Updated dpkg translations ]
   * Polish (Robert Luberda).
@@ -102,9 +105,6 @@ dpkg (1.14.7) unstable; urgency=low
   * Fix dpkg-source to create correct diffs for files with spaces in
     their name (apparantly we don't have many of those ;).
     Based on a patch by Marcel Toele. Closes: #445380
-  * Allow to use other compressions than gzip on dpkg-source -b
-    (NOTE: this will result in a Format: 2.0 source package!).
-    Closes: #382673
 
   [ Updated dpkg translations ]
   * Basque (Piarres Beobide). Closes: #440859