From: Raphael Hertzog Date: Wed, 18 Jun 2008 08:43:41 +0000 (+0200) Subject: Merge lenny branch (through the tag '1.14.20') X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a71e19cf610bf2a614d0efc261f975332596fc4;p=dpkg Merge lenny branch (through the tag '1.14.20') Conflicts: ChangeLog configure.ac debian/changelog man/ChangeLog man/dpkg.1 man/po/de.po --- 2a71e19cf610bf2a614d0efc261f975332596fc4 diff --cc ChangeLog index 6b5bb28d,8f29f6a8..cf90cee4 --- a/ChangeLog +++ b/ChangeLog @@@ -1,246 -1,137 +1,380 @@@ +2008-06-10 Guillem Jover + + * lib/varbuf.c (varbufvprintf): Call va_end when done with the va_list + variable from va_copy. + +2008-06-10 Guillem Jover + + * lib/varbuf.c (varbufprintf): Use varbufvprintf instead of + reimplementing it. + +2008-06-09 Raphael Hertzog + + * scripts/Dpkg/BuildOptions.pm (parse, set): Use space as the + official separator in DEB_BUILD_OPTIONS. Check for validity of + flags and print a warning if a bad option is detected. Rewrote + the logic of set() to avoid adding options twice in non-overwrite + mode. + * scripts/t/300_Dpkg_BuildOptions.t: Adjust the test suite + accordingly. + +2008-06-09 Guillem Jover + + * scripts/Dpkg/Source/Package.pm ($diff_ignore_default_regexp): Add + '.hgignore'. + (@tar_ignore_default_pattern): Likewise. + +2008-06-09 Guillem Jover + + * src/query.c (searchfiles): Use VARBUF_INIT to initialize path + instead of vb. + +2008-06-04 Guillem Jover + + * src/main.c (setpipe): Set file descriptors to close on exec. + +2008-06-04 Guillem Jover + + * dpkg-deb/build.c (getfi): Use m_realloc instead of realloc. + * dpkg-deb/info.c (info_spew): Likewise. + * lib/fields.c (f_dependency): Likewise. + * lib/parse.c (parsedb): Likewise. + * lib/varbuf.c (varbufextend): Likewise. + * src/main.c (commandfd): Likewise. + +2008-06-04 Guillem Jover + + * lib/dpkg-db.h (varbufinit): Add a size argument, fix all callers. + (varbuf::init): Add an optional size argument. + (varbuf::varbuf): Likewise. + * lib/varbuf.c (varbufinit): Allocate a buffer if size is not zero. + * lib/dbmodify.c (modstatdb_init): Use varbufinit instead of its + own initialization. + +2008-06-04 Guillem Jover + + * lib/dpkg-db.h (VARBUF_INIT): New macro. + * lib/compression.c (decompress_cat, compress_cat): Use VARBUF_INIT + instead of varbufinit to initialize the variables. + * lib/dump.c (writerecord, writedb): Likewise. + * lib/mlib.c (buffer_copy_setup_dual): Likewise. + * lib/showpkg.c (show1package): Likewise. + * src/archives.c (check_breaks, check_conflict): Likewise. + * src/configure.c (deferred_configure): Likewise. + * src/depcon.c (describedepcon): Likewise. + * src/main.c (commandfd): Likewise. + * src/packages.c (breaks_check_one, dependencies_ok): Likewise. + * src/query.c (searchfiles): Likewise. + * src/remove.c (deferred_remove): Likewise. + * src/select.c (setselections): Likewise. + +2008-06-04 Guillem Jover + + * src/archives.c (archivefiles): Use varbufreset instead of varbufinit + to avoid possible leaks if this function is called more than once. + +2008-06-04 Guillem Jover + + * lib/log.c (log_message): Switch log from a pointer to struct varbuf + to just struct varbuf. + +2008-06-04 Guillem Jover + + * src/main.c (setpipe): Fix the setting of more than one pipef. + +2008-06-04 Guillem Jover + + * src/select.c (setselections): Free varbuf variables. + +2008-06-04 Guillem Jover + + * lib/subproc.c (catch_signals): Remove array sentinel. + +2008-06-01 Guillem Jover + + * lib/varbuf.c (varbufdupc): Use memset instead of ad-hoc operation. + +2008-06-01 Guillem Jover + + * lib/subproc.c (setup_subproc_signals): Use size_t intead of int + for the index, to fix a warning. + (cu_subproc_signals): Likewise. + +2008-06-01 Guillem Jover + + * src/query.c (searchfiles): Use strpbrk instead of strcspn and + strlen. + +2008-06-01 Guillem Jover + + * src/query.c: Include . + (searchfiles): Trim trailing '/' and '/.' from file searches only + on path names, but not patterns. + +2008-06-01 Guillem Jover + + * lib/dpkg-priv.h (rtrim_slash_slashdot): Return the string size. + +2008-06-01 Raphael Hertzog + + * scripts/Dpkg/Control.pm (parse, parse_fh, new): Add a new function + parse_fh() to be able to parse the control file from an arbitrary + file handle. Change parse() to use it and modify new() to parse + STDIN instead of a real file if the parameter is "-". + +2008-06-01 Daniel Hahler + + * src/archives.c (tarobject): Improve error message stating that + dpkg is unable to create a file so that it also refers to the real + filename instead of the non-diverted name only. + +2008-05-24 Guillem Jover + + * dpkg-deb/build.c (do_build): Move argument name into a parameter to + coalesce similar strings for translation. + * dpkg-split/info.c (do_info): Likewise. + * dpkg-split/join.c (do_join): Likewise. + * dpkg-split/queue.c (do_queue): Likewise. + * src/enquiry.c (audit, unpackchk, assertversion, predeppackage) + (printarch): Likewise. + * src/select.c (setselections, clearselections): Likewise. + +2008-05-24 Guillem Jover + + * dpkg-deb/main.c: Include . + (setaction): Use sizeof_array instead of ad-hoc calculation. + * dpkg-split/main.c: Include . + (setaction): Use sizeof_array instead of ad-hoc calculation. + +2008-05-24 Guillem Jover + + * src/trigcmd.c (main): Remove duplicate program name from badusage. + +2008-05-19 Martin Koeppe , + Guillem Jover + + * dpkg-deb/Makefile.am (dpkg_deb_LDADD): Move 'libcompat.a' and + '$(LIBINTL)' after 'libdpkg.a'. + * dpkg-split/Makefile.am (dpkg_split_LDADD): Likewise. + * dselect/Makefile.am (dselect_LDADD): Likewise. + * /src/Makefile.am (dpkg_LDADD): Likewise. + (dpkg_query_LDADD): Likewise. + (dpkg_trigger_LDADD): Likewise. + +2008-05-19 Guillem Jover + + * scripts/Dpkg/Source/Package.pm ($diff_ignore_default_regexp): Add + '.be'. + (@tar_ignore_default_pattern): Likewise. + +2008-05-12 Guillem Jover + + * scripts/dpkg-gencontrol.pl ($package_type): Rename to ... + ($pkg_type): ... this, for uniformity. + +2008-05-12 Guillem Jover + + * src/help.c (do_script): Expand 'maint' to 'maintainer' in string. + (vmaintainer_script_installed): Mark string for translation. Change + strings so that they get merged by gettext with similar ones. + (maintainer_script_new): Likewise. + +2008-05-12 Guillem Jover + + * lib/dpkg-priv.h (sizeof_array): New macro. + * lib/parse.c: Include . + (NFIELDS): Remove macro. + (nfields): Use sizeof_array instead of NFIELDS. + (parsedb): Likewise. + * lib/subproc.c (NCATCHSIGNALS): Remove macro. + (uncatch_signals): Use sizeof_array instead of NCATCHSIGNALS. + (setup_subproc_signals): Likewise. + (cu_subproc_signals): Likewise. + +2008-05-12 Guillem Jover + + * dselect/method.cc: Include . Use setup_subproc_signals + and cu_subproc_signals instead of cu_restoresignals and duped code + in falliblesubprocess. + * lib/Makefile.am (libdpkg_a_SOURCES): Add 'subproc.c'. + * ib/dpkg-priv.h (setup_subproc_signals): New prototype. + (cu_subproc_signals): Likewise. + * src/help.c: Include and stop including . + (cu_restorescriptsignals, script_catchsignals): Move to ... + * lib/subproc.c (cu_subproc_signals, setup_subproc_signals): ... here. + New file. + +2008-05-12 Guillem Jover + + * lib/Makefile.am (libdpkg_a_SOURCES): Add 'dpkg-priv.h' and 'path.c'. + * lib/dpkg-priv.h: New file. + * lib/path.c: Likewise. + +2008-05-11 Pierre Habouzit + + * lib/showpkg.c (show1package): Use %zd instead of %d in sprintf() + call with a size_t parameter. + +2008-05-11 Pierre Habouzit + + * scripts/update-alternatives.pl: add a --query option that works like + --display but outputs a machine parseable rfc822-like output. + * man/update-alternatives.8: document that new option, and the + associated format. + +2008-05-05 Raphael Hertzog + + * scripts/dpkg-gensymbols.pl: Do not accept empty parameters for + -v, -P and -e. + +2008-05-05 Raphael Hertzog + + * scripts/dpkg-shlibdeps.pl: Include the format of the desired + library in the "library not found" error message. + +2008-05-02 Guillem Jover + + * scripts/update-alternatives.pl: Do not suggest manually changing + the alternative symlinks on verbose mode. + +2008-04-29 Guillem Jover + + * configure.ac: Bump version to 1.15.0~. + + 2008-06-16 Guillem Jover + + * lib/triglib.c (trig_file_interests_ensure): Pass the proper mask + to push_cleanup to make sure pop_cleanup closes the file. + + 2008-06-15 Guillem Jover + + * scripts/dpkg-divert.pl (checkrename): Do not check the target file + if the source does not exist and dorename was thus disabled. + + 2008-06-09 Raphael Hertzog + + * scripts/dpkg-divert.pl, scripts/update-alternatives.pl, + scripts/install-info.pl, scripts/dpkg-statoverride.pl: Set + PERL_DL_NONLAZY to 1 so that the usage of Locale::Gettext doesn't + cause run-time failures when this perl binary module is not + compiled for the corresponding perl version (and this happens in + configuration scripts, in particular preinst, during upgrades). + + 2008-06-08 Raphael Hertzog + + * scripts/Dpkg/Source/Patch.pm (analyze): Be less strict in + filenames accepted on ---/+++ lines. Don't blow up on absolute + filenames if the other one is fine. Make sure to use the one that + is relative and that corresponds to a real file when possible. + + 2008-06-08 Raphael Hertzog + + * scripts/Dpkg/Source/Package/V3/quilt.pm: Use absolute path names + when giving directories and filenames to quilt to avoid any + problems due to quilt's feature of trying relative paths in parent + directories too. + + 2008-06-07 Raphael Hertzog + + * scripts/Dpkg/Source/Patch.pm (analyze): Accept unexpected + end-of-file in patches if we're missing no more than 2 lines + of context. Output a warning instead. + + 2008-06-07 Raphael Hertzog + + * scripts/Dpkg/Source/Package/V3/quilt.pm (register_autopatch): + Register the newly created patch with quilt only if quilt has + already been used to apply the existing patches (or if we don't + have any patch yet), otherwise register it manually at the end of + the series. + + 2008-06-05 Raphael Hertzog + + * scripts/Dpkg/Source/Patch.pm (add_diff_directory): If option + use_dev_null is set, then the label of the "old" file will be + '/dev/null' if we're creating a new file (instead of using the + name of the created file, like it's currently done in .diff + of version "1.0" source packages). + * scripts/Dpkg/Source/Package/V2.pm (prepare_build): Use the new + option "use_dev_null" when creating the automatic patch. + + 2008-06-05 Raphael Hertzog + + * scripts/Dpkg/Source/Package/V3/quilt.pm (get_patches): Really + skip all comments in the series files. + + 2008-06-04 Raphael Hertzog + + * scripts/Dpkg/Source/Patch.pm (analyze): Enhance function to + parse correctly many more patches that are accepted by the patch + utility itself: + - ignore/strip carriage return of patches with Windows end of lines + - accept empty lines as contextual lines (instead of the expected " ") + - accept spaces as separator between filename and timestamp if + there's no tab + - accept a name that differs on the +++ line if the name in --- is + correct, and use the name in +++ if this one exists while the one + on --- doesn't. + + 2008-05-28 Raphael Hertzog + + * scripts/Dpkg/Source/Package.pm (extract): If we extract a + source package that uses a non-standard (!= 1.0) source package + then we create debian/source/format to remember it. + * scripts/dpkg-source.pl: Use debian/source/format as a new source + of format to try when building the package. Prioritize it lower than + command line and debian/control but higher than the default build + formats. + * man/dpkg-source.1: Document the above changes. + + 2008-05-28 Raphael Hertzog + + * scripts/Dpkg/Source/Package/V3/quilt.pm: Factorize calls to + quilt in a new run_quilt() function. And check only once + if quilt is available while setting the default value of + without_quilt option. Last but not least, register properly the + automatically generated patch with quilt import. + + 2008-05-28 Raphael Hertzog + + * scripts/Dpkg/Source/Patch.pm (check_apply): New function to + verify if a patch will successfully apply on top of a given + directory. + * scripts/Dpkg/Source/Package/V3/quilt.pm (check_patches_applied): + Don't trust debian/patches/.dpkg-source-applied blindly. Get a + list of (supposedly unapplied) patches and verify if the first + patch applies or not. If yes, then apply the patch series, + otherwise do not (and assume that the patch series is already + applied). + + 2008-05-23 Raphael Hertzog + + * scripts/Dpkg/Source/Package/V2.pm (do_build): Display a + message when local modifications are stored in a new + automatic patch. This messages includes a list of + modified files. + + 2008-05-23 Raphael Hertzog + + * scripts/Dpkg/Source/Package/V3/quilt.pm: Remove the .diff + from the name of the automatically generated patch. It will + facilitate the switch to this format: packages using + patch system that apply debian/patches/*.{patch,diff} + will not be bothered by the presence of the quilt serie + created by dpkg-source itself. + * man/dpkg-source.1: Update the documentation accordingly. + * man/po/*.po: Fix all the filenames to avoid fuzzying + translations. + + 2008-05-22 Raphael Hertzog + + * scripts/Dpkg/Source/Package/V3/quilt.pm: Add missing "use + File::Path" for mkpath(). + + 2008-05-13 Guillem Jover + + * src/main.c (setforce): Add help output for '--force-breaks'. + 2008-05-12 Guillem Jover * configure.ac: Bump version to 1.14.20~. diff --cc debian/changelog index aeb3a531,ea264236..41d47503 --- a/debian/changelog +++ b/debian/changelog @@@ -1,55 -1,70 +1,117 @@@ +dpkg (1.15.0) UNRELEASED; urgency=low + + [ Guillem Jover ] + * Do not suggest manually changing the alternative symlinks on + update-alternative's verbose mode. Closes: #412487 + * Refactor subprocess signal setup. + * Mark and coalesce similar strings for translation. + * Add '.be' to the default dpkg-source -i regex. Closes: #481716 + Based on a patch by Ben Finney. + * Fix link order when using libcompat.a and libintl.a by placing them after + libdpkg.a. Based on a patch by Martin Koeppe. Closes: #481805 + * Remove duplicate program name from dpkg-trigger badusage output. + * Trim trailing slash and slash dot from 'dpkg -S' arguments when those + are path names, but not on patterns. Closes: #129577 + * Fix the support for passing more than one --status-fd option to dpkg. + Until now only the last one was being used. + * Replace realloc plus error checking usage with m_realloc. + * Close --status-fd file descriptors on exec, so that they are not + inherited by the childs. Closes: #471488 + * Add '.hgignore' to the default dpkg-source -i regex and -I pattern. + Closes: #485365 + + [ Raphael Hertzog ] + * Enhance dpkg-shlibdeps's error message when a library can't be found to + include the ELF format of the desired library. Closes: #474671 + * dpkg-gensymbols now refuses empty values for the the -v -P and -e + parameters. + * Update dpkg(1) to refer to conffile whenever we speak of configuration + file handled by dpkg. Thus harmonize vocabulary with the policy. Thanks + to Helge Kreutzmann . Closes: #381219 + * Improve error message stating that dpkg is unable to create a file so that + it also refers to the real filename instead of the non-diverted name only. + Thanks to Daniel Hahler for the patch. Closes: #457135 + * dpkg-gencontrol can now again read the control file from its standard + input with "-c-". Closes: #465340 + * Modified Dpkg::BuildOptions to recognize and use spaces as separator + in DEB_BUILD_OPTIONS (in order to conform with the Debian policy + ruling estasblished in #430649). + + [ Pierre Habouzit ] + * Add a --query option to update-alternatives. Closes: #336091, #441904 + + [ Updated dpkg translations ] + * Portuguese (Miguel Figueiredo). + + -- Guillem Jover Tue, 29 Apr 2008 06:01:40 +0300 + - dpkg (1.14.20) UNRELEASED; urgency=low + dpkg (1.14.20) unstable; urgency=low - * + [ Guillem Jover ] + * Change UTF-8 '©' to '(C)' in deb-version.5 (unfuzzy translations). + * Document --force-breaks in 'dpkg --force-help' output. + * Document triggers --debug values in dpkg.1. Thanks to Sven Joachim. + * Improve package descriptions for dpkg, dpkg-dev and dselect. + Thanks to Justin B Rye for the review and corrections. Closes: #484002 + * When dpkg-divert does renames do no check the target file if the source + does not exist and the rename is thus being disabled. This also allows + to remove bogus diversions. Closes: #476973, #469033 + * Properly close triggers 'File' file, so it does not get leaked to childs. + + [ Raphael Hertzog ] + * Add missing 'use File::Path' in Dpkg::Source::Package::V3::quilt. + * Use debian/patches/debian-changes- (without the trailing ".diff") + as default name for the automatic patch created by the format "3.0 + (quilt)". This ensures a saner cohabitation with patch systems that + apply all of debian/patches/*.{diff,patch}. + * Improve patch parser to accept more patches that are accepted by patch + itself. + * Correctly skip comments in quilt series files (concerns "3.0 (quilt)" source + packages). Closes: #486323 + * The automatically created patches (in source package formats "2.0" and + "3.0 (quilt)") will now contain "/dev/null" as previous filename when the + patch creates a new file (instead of putting the same name). + * Set PERL_DL_NONLZY to 1 in perl scripts that are likely to be called in + package's configuration scripts to work around the perl bug #479711. + + [ Helge Kreutzmann ] + * Fix a typo in dselect.1. + + [ Updated dpkg translations ] + * Basque (Piarres Beobide). Closes: #481043 + * Brazilian Portuguese (Felipe Augusto van de Wiel). + * Catalan (Jordi Mallach). Closes: #383448 + * Czech (Miroslav Kure). + * Galician (Jacobo Tarrio). Closes: #483441 + * German (Sven Joachim). + * Norwegian Bokmal (Hans Fredrik Nordhaug). Closes: #480626 + * Polish (Wiktor Wandachowicz). + * Simplified Chinese (Deng Xiyue). Closes: #483143 + * Swedish (Peter Karlsson). + * Vietnamese (Clytie Siddall). Closes: #481199 + + [ Updated manpages translations ] + * German (Helge Kreutzmann). + * Polish (Wiktor Wandachowicz). + * Swedish (Peter Karlsson). + + [ Updated scripts translations ] + * French (Christian Perrier). + * German (Helge Kreutzmann). + * Polish (Wiktor Wandachowicz). + * Russian (Yuri Kozlov). + * Swedish (Peter Karlsson). + + [ Updated programs translations ] + * Basque (Piarres Beobide). Closes: #481043 + * French (Christian Perrier). + * Polish (Wiktor Wandachowicz). + + [ Updated dselect translations ] + * Brazilian Portuguese (Felipe Augusto van de Wiel). + * Polish (Wiktor Wandachowicz). - -- Guillem Jover Mon, 12 May 2008 09:04:34 +0300 + -- Raphael Hertzog Wed, 18 Jun 2008 09:33:54 +0200 dpkg (1.14.19) unstable; urgency=low diff --cc man/ChangeLog index 7297d755,58c4fbc3..fca35edc --- a/man/ChangeLog +++ b/man/ChangeLog @@@ -1,18 -1,72 +1,87 @@@ +2008-05-31 Raphael Hertzog + + * dpkg.1: Use the term conffile for a configuration file handled + by dpkg. Drop reference to hamm. Updated description of values + supported by -D to include those which are trigger related. + +2008-05-11 Raphael Hertzog + + * dpkg-source.1: Properly escape hyphen in -i option. + +2008-05-05 Raphael Hertzog + + * dpkg-source.1: Improve explanation of -i when used with + VCS-based source packages. + + 2008-06-10 Wiktor Wandachowicz + + * po/pl.add: Update. + + 2008-06-07 Wiktor Wandachowicz + + * po/pl.po: Ack typo fix. + * po/pl.add: Add conents. + + 2008-06-06 Wiktor Wandachowicz + + * po/pl.po: Updated to 1601t. + + 2008-06-04 Peter Karlsson + + * po/sv.po: Updated to 1601t. + + 2008-06-03 Helge Kreutzmann + + * Regenerated all po(t) files, including updating the German one. + * Add Sven in de.add, he translated some paragraphs as well. + * Take translation fix from Frank Lichtenheld + from the trunk. + + 2008-05-27 Peter Karlsson + + * po/sv.po: Updated to 1600t. + + 2008-05-26 Helge Kreutzmann + + * dselect.1: Fixed a typo and regenerated all po(t) files, including + updating the German one. + + 2008-05-25 Helge Kreutzmann + + * po/de.po: Updated to 1591t0f9u and further fixes found/FIXMEs + removed. + + 2008-05-22 Helge Kreutzmann + + * po/de.po: Updated to 1590t0f10u and one improvement (thanks Sven). + + 2008-05-19 Helge Kreutzmann + + * po/de.po: Updated to 1589t0f11u and more fixes (thanks Sven). + + 2008-05-18 Helge Kreutzmann + + * po/de.po: Updated to 1588t0f12u and thorough proof reading. + + 2008-05-13 Peter Karlsson + + * po/sv.po: Updated to 1600t. + + 2008-05-13 Guillem Jover + + * po/dpkg-man.pot: Regenerated. + * po/*.po: Merged with dpkg-man.pot. + + 2008-05-13 Sven Joachim + + * dpkg.1: Document triggers --debug values. + + 2008-05-13 Guillem Jover + + * deb-version.5: Change '©' to '(C)'. + * po/dpkg-man.pot: Regenerated. + * po/*.po: Merged with dpkg-man.pot and unfuzzy translations. + 2008-05-12 Guillem Jover * po/dpkg-man.pot: Regenerated.