From: Raphael Hertzog Date: Sat, 26 Jan 2008 19:55:13 +0000 (+0100) Subject: Merge branch 'stable' X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fda8d18a8ffc9d2b1bd0a42aa3cb9cbde86beb39;p=dpkg Merge branch 'stable' Conflicts: configure.ac debian/changelog --- fda8d18a8ffc9d2b1bd0a42aa3cb9cbde86beb39 diff --cc ChangeLog index c8742bbf,57cb4194..96516d22 --- a/ChangeLog +++ b/ChangeLog @@@ -1,87 -1,15 +1,99 @@@ +2008-01-25 Andreas PÃ¥hlsson + + * utils/start-stop-daemon.c (tsub): Remove function. + (tmul): Fix normalization. + (run_stop_schedule): Use timersub instead of tsub. + 2008-01-24 Raphael Hertzog + * scripts/dpkg-genchanges.pl: Warn if the current version is + smaller than the previous one. + + * scripts/dpkg-checkbuilddeps.pl: Add support of options -d and -c to use + build dependencies/conflicts given on the command line instead of those + retrieved from debian/control. + * man/dpkg-checkbuilddeps.1: Document the new options. + +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-26 Raphael Hertzog ++ + * configure.ac: Release 1.14.16.6. + + 2008-01-26 Raphael Hertzog + + * scripts/dpkg-gensymbols: Don't scan directories which are + symlinks. They might point outside of the package build dir which + results in addition of libraries which are not in the package. + The libc6 package on amd64 is affected with a symlink "lib64" -> + "/lib". + 2008-01-24 Raphael Hertzog * configure.ac: Release 1.14.16.5. diff --cc debian/changelog index 1eb62469,cd03e7e7..66ce59c3 --- a/debian/changelog +++ b/debian/changelog @@@ -1,29 -1,12 +1,38 @@@ +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. + * Use system timersub and fix timeval normalization in multiplication in + start-stop-daemon. Thanks to Andreas PÃ¥hlsson. Closes: #462225 + + [ Raphael Hertzog ] + * Add a warning displayed by dpkg-genchanges if the current version is + smaller than the previous one. Closes: #4655 + * Add -d and -c options in dpkg-checkbuilddeps to override + build-depends/conflicts. Closes: #114774 + + [ 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.6) unstable; urgency=medium + + * Let dpkg-gensymbols skip directories which are just symlinks when scanning + the package build dir. + * Bump urgency to medium to compensate lost days in testing migration due to + the two last uploads. + + -- Raphael Hertzog Sat, 26 Jan 2008 19:20:40 +0100 + dpkg (1.14.16.5) unstable; urgency=low * Fix dpkg-gensymbols handling of #include so that one can include multiple