From: Frank Lichtenheld Date: Mon, 21 Jan 2008 12:40:31 +0000 (+0100) Subject: Merge branch 'stable' X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=088b8e9a2930a2af0011d7e60d816f75158b3d14;p=dpkg Merge branch 'stable' Conflicts: ChangeLog configure.ac debian/changelog --- 088b8e9a2930a2af0011d7e60d816f75158b3d14 diff --cc ChangeLog index bc921b2b,1cb5c8a1..b9f03a15 --- a/ChangeLog +++ b/ChangeLog @@@ -1,47 -1,17 +1,62 @@@ +2008-01-21 Colin Watson + + * 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 + + * 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 + + * lib/mlib.c (m_strdup): New function. + * lib/dpkg.h (m_strdup): New declaration. + * lib/tarfn.c: Include . + (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 + + * configure.ac: Bump version to 1.14.17~. + + 2008-01-21 Frank Lichtenheld + + * 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 * configure.ac: Release 1.14.16. diff --cc debian/changelog index c5d895fc,f4145a7e..5b2408b2 --- a/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 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 Mon, 21 Jan 2008 12:48:51 +0100 + dpkg (1.14.16) unstable; urgency=low [ Guillem Jover ]