Merge branch 'stable'

Conflicts:

	ChangeLog
	configure.ac
	debian/changelog

diff --cc ChangeLog
index bc921b2b8533df62fac1da64883a8fa63f24e6a3,1cb5c8a170523394582cab33518832424fd26249..b9f03a151f447e253beceac33a1b3767a2155f92
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,47 -1,17 +1,62 @@@
 +2008-01-21  Colin Watson  <cjwatson@debian.org>
 +
 +      * dselect/pkgkeys.cc (packagelist_korgbindings): Add 'C'.
 +      (packagelist_kinterps): Add 'revertinstalled'.
 +      * dselect/bindings.cc (keybindings::descriptions): Likewise.
 +      * dselect/pkglist.h (class packagelist): Add kd_revertinstalled.
 +      * dselect/pkgcmds.cc (packagelist::kd_revertinstalled): New method.
 +      * man/dselect.1: Document new 'C' keybinding.
 +
 +2008-01-21  Guillem Jover  <guillem@debian.org>
 +
 +      * dpkg-deb/build.c (getfi): Use m_malloc instead of malloc.
 +      (do_build): Likewise.
 +      * dpkg-deb/extract.c (extracthalf): Likewise.
 +      * lib/mlib.c (buffer_write): Likewise.
 +      (buffer_copy): Likewise.
 +      * lib/myopt.c (loadcfgfile): Likewise.
 +      * lib/parse.c (parsedb): Likewise.
 +      * lib/showpkg.c (alloclstitem): Likewise.
 +      (parsefield): Likewise.
 +      (parsestring): Likewise.
 +      * lib/tarfn.c (StoC): Likewise.
 +      (TarExtractor): Likewise.
 +      * src/archives.c (try_deconfigure_can): Likewise.
 +      * src/main.c (execbackend): Likewise.
 +
 +2008-01-21  Guillem Jover  <guillem@debian.org>
 +
 +      * lib/mlib.c (m_strdup): New function.
 +      * lib/dpkg.h (m_strdup): New declaration.
 +      * lib/tarfn.c: Include <dpkg.h>.
 +      (TarExtractor): Use m_strdup instead of strdup.
 +      * lib/database.c (findpackage): Likewise.
 +      * lib/myopt.c (myfileopt): Likewise.
 +      * dpkg-deb/build.c (getfi): Likewise.
 +      * src/configure.c (md5hash): Likewise.
 +      * src/help.c (vbuildarglist): Likewis.
 +      * src/main.c (execbackend): Likewise.
 +      (commandfd): Likewise.
 +
 +2008-01-21  Guillem Jover  <guillem@debian.org>
 +
 +      * configure.ac: Bump version to 1.14.17~.
 +
+ 2008-01-21  Frank Lichtenheld  <djpig@debian.org>
+ 
+       * configure.ac: Release 1.14.16.1
+ 
+       * scripts/dpkg-source.pl: Fix "uninitialized value"
+       warning.
+ 
+       * debian/control: Add libtimedate-perl to
+       dpkg-dev's Depends and to Build-Depends (for
+       build-time tests). This introduces our first
+       run-time dependency on a perl module not shipped
+       with Perl itself. But to me it seems not worth
+       trying to replace that code.
+ 
++
  2008-01-21  Guillem Jover  <guillem@debian.org>
  
        * configure.ac: Release 1.14.16.

diff --cc debian/changelog
index c5d895fcc8165cd8bf0acbc0bb2fb5414bedf503,f4145a7e9273075e59eb93d1f9a555a03af40707..5b2408b228a55b74169ffb162de0b7ad59a9e2bc
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,10 +1,21 @@@
 +dpkg (1.14.17) UNRELEASED; urgency=low
 +
 +  [ Guillem Jover ]
 +  * Replace strdup plus error checking usage with a new m_strdup function.
 +    Closes: #379028
 +  * Add new keybinding in dselect to restore all selections back to
 +    whatever's currently installed. Closes: #151540
 +    Thanks to Colin Watson.
 +
 + -- Guillem Jover <guillem@debian.org>  Mon, 21 Jan 2008 10:11:55 +0200
 +
+ dpkg (1.14.16.1) unstable; urgency=low
+ 
+   * Add libtimedate-perl to dpkg-dev's Depends and to Build-Depends.
+     Reported by Aurelien Jarno. Closes: #461875
+ 
+  -- Frank Lichtenheld <djpig@debian.org>  Mon, 21 Jan 2008 12:48:51 +0100
+ 
  dpkg (1.14.16) unstable; urgency=low
  
    [ Guillem Jover ]