From: Raphael Hertzog Date: Thu, 24 Jan 2008 14:18:46 +0000 (+0100) Subject: Merge branch 'stable' X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e14209afdef74f983590bd1b68a79b78bcb70fd;p=dpkg Merge branch 'stable' Conflicts: ChangeLog configure.ac debian/changelog --- 7e14209afdef74f983590bd1b68a79b78bcb70fd diff --cc ChangeLog index b86d0159,9be877a2..73e4f2e2 --- a/ChangeLog +++ b/ChangeLog @@@ -1,71 -1,17 +1,85 @@@ +2008-01-22 Guillem Jover + + * dpkg-deb/extract.c (extracthalf): Refactor fflush and its buggy + fpos handling to ... + (safe_fflush): ... here. New function. + +2008-01-22 Guillem Jover + + * lib/vercmp.c [0] (verrevcmp): Remove dead code. + +2008-01-22 Guillem Jover + + * lib/dpkg.h [!offsetof] (offsetof): New compatibilty macro. + * lib/parsedump.h (PKGIFPOFF): Use offsetof instead of ad-hoc + calculation. + (FILEFOFF): Likewise. + (struct fieldinfo): Change integer member type to size_t. + * lib/tarfn.c (TarChecksumOffset): Use offsetof instead of ad-hoc + calculation. + +2008-01-22 Guillem Jover + + * configure.ac (AC_CHECK_HEADERS): Check for 'stddef.h'. + +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-24 Raphael Hertzog + + * configure.ac: Release 1.14.16.5. + + 2008-01-24 Raphael Hertzog + + * scripts/Dpkg/Shlibs/SymbolFile.pm (load): Remove the loaded file + from the %$seen hash at the end so that it's possible to include + multiple times the same file (at the same level and not from any + nested file obviously). + + * scripts/Dpkg/Shlibs/SymbolFile.pm: Blacklist many armel specific + symbols. + 2008-01-23 Guillem Jover * configure.ac: Release 1.14.16.4. diff --cc debian/changelog index 1e459805,749f9fab..1f7e0d0f --- a/debian/changelog +++ b/debian/changelog @@@ -1,21 -1,12 +1,30 @@@ +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. + + [ Updated manpages translations ] + * German (Helge Kreutzmann). + + [ Updated scripts translations ] + * German (Helge Kreutzmann). + * Swedish (Peter Karlsson). + + -- Guillem Jover Mon, 21 Jan 2008 10:11:55 +0200 + + dpkg (1.14.16.5) unstable; urgency=low + + * Fix dpkg-gensymbols handling of #include so that one can include multiple + times the same file and have it properly taken into account. + * Add many armel-specific symbols to dpkg-gensymbols' blacklist. + Closes: #462318 + + -- Raphael Hertzog Thu, 24 Jan 2008 14:20:10 +0100 + dpkg (1.14.16.4) unstable; urgency=low * Import capit in Dpkg::Cdata from Dpkg::Fields. Closes: #462172