Merge branch 'stable'

Drop changelog entry for the unreleased version 1.14.18.1.

Conflicts:

	ChangeLog
	debian/changelog

diff --cc ChangeLog
index 6a0432fe78d70e5627b5ef125d27fe6219717631,6ea7bff71f543bc9cd0d02f538b59d0f727d4c36..6f04675ab0e9fa86114d217dfe23d5f0b9a027cb
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,20 -1,19 +1,36 @@@
+ 2008-04-12  Raphael Hertzog  <hertzog@debian.org>
+ 
+       * scripts/Dpkg/Path.pm (check_files_are_the_same): Add a new
+       parameter so that we can use stat() instead of lstat() and
+       compare if pointed files are the same.
+       * scripts/Dpkg/Source/Package.pm: Resolve symlinks before deciding
+       if both original tarballs are the same or not. Use the new
+       parameter of check_files_are_the_same() for this.
+       * scripts/Dpkg/Source/Package/V1_0.pm: Remove useless import of
+       check_files_are_the_same.
+ 
+ 2008-04-12  Sven Joachim  <svenjoac@gmx.de>
+ 
+       * scripts/Dpkg/Source/Package.pm: Add missing import of
+       subprocerr.
+ 
 +2008-04-12  Russell Coker <russell@coker.com.au>,
 +            Guillem Jover  <guillem@debian.org>
 +
 +      * src/archives.c (tarobject): Set scontext to NULL after freecon.
 +
 +2008-04-10  Sven Joachim  <svenjoac@gmx.de>
 +
 +      * src/trigcmd.c: Fix typo.
 +
 +2008-04-09  Sven Joachim  <svenjoac@gmx.de>
 +
 +      * THANKS: Update my e-mail address.
 +
 +2008-04-08  Guillem Jover  <guillem@debian.org>
 +
 +      * configure.ac: Bump version to 1.14.19~.
 +
  2008-04-08  Guillem Jover  <guillem@debian.org>
  
        * configure.ac: Release 1.14.18.

diff --cc debian/changelog
index 175b3605c2eb594ac65db4e2d701409c650be434,b1b1b3872948ee3dbae8b981049a8243e6741ac3..8819e92338c1f2574bc63f14b81f55eeca424460
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,11 +1,26 @@@
 -dpkg (1.14.18.1) UNRELEASED; urgency=low
 +dpkg (1.14.19) UNRELEASED; urgency=low
  
 - -- Raphael Hertzog <hertzog@debian.org>  Sat, 12 Apr 2008 13:56:44 +0200
 +  [ Guillem Jover ]
 +  * Fix a double-free by setting scontext to NULL after calling freecon.
 +    Based on a patch by Russell Coker. Closes: #474339
 +
++  [ Raphael Hertzog ]
+   * Add missing import of subprocerr in Dpkg::Source::Package. Thanks to Sven
+     Joachim for the patch.
+   * Handle symlinks better when deciding if dpkg-source has to copy the
+     original tarball in the current extraction directory. Closes: #475668
+ 
 +  [ Updated dpkg translations ]
 +  * Galician (Jacobo Tarrio).
 +  * German (Sven Joachim).
 +
 +  [ Updated manpages translations ]
 +  * German (Helge Kreutzmann).
 +
 +  [ Updated scripts translations ]
 +  * Swedish (Peter Karlsson).
 +
 + -- Jacobo Tarrio <jtarrio@debian.org>  Fri, 11 Apr 2008 22:46:48 +0100
  
  dpkg (1.14.18) unstable; urgency=low