From: Raphael Hertzog Date: Tue, 1 Jan 2008 19:36:48 +0000 (+0100) Subject: Merge branch 'parsechangelog' into controllib-removal X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3b720f8f1b0d1957cebd3b55a601220106e9e4b;p=dpkg Merge branch 'parsechangelog' into controllib-removal Conflicts: ChangeLog debian/changelog debian/dpkg-dev.install scripts/Dpkg/ErrorHandling.pm scripts/Makefile.am --- e3b720f8f1b0d1957cebd3b55a601220106e9e4b diff --cc ChangeLog index bc8d06f3,f030920b..6205b84c --- a/ChangeLog +++ b/ChangeLog @@@ -1,251 -1,11 +1,259 @@@ -2007-12-06 Frank Lichtenheld ++2008-01-01 Frank Lichtenheld + + * scripts/dpkg-parsechangelog.pl: Make the + -L option actually work (it's only been eleven + years...) + + * scripts/Dpkg/ErrorHandling.pm (report): export. + +2008-01-01 Samuel Thibault + + * utils/start-stop-daemon.c (do_stop): Do not print 'failed to kill' + warning when doing pid polling. + +2008-01-01 Guillem Jover + + * src/archives.c (archivefiles): Remove pointless strdup for execvp + arguments. + +2008-01-01 Ian Zimmerman + + * scripts/install-info.pl: Ignore wrapped lines when matching + section titles. + +2008-01-01 John Zaitseff + + * dselect/baselist.cc (baselist::wordwrapinfo): Stop processing when + exceeding infopad line limit, and add a warning message. + +2008-01-01 Sven Rudolph + + * dselect/baselist.cc (baselist::startdisplay): Set helpscreen_attr + on monochrome terminals. + +2007-12-28 Raphael Hertzog + + * scripts/Dpkg/Cdata.pm, scripts/Dpkg/Control.pm: Add two new + module to parse and manipulate files like debian/control. + * scripts/t/600_Dpkg_Control.t, + scripts/t/600_Dpkg_Control/control-1: Add non-regression tests for + Dpkg::Control and Dpkg::Cdata. + * scripts/dpkg-checkbuilddeps.pl, scripts/dpkg-genchanges.pl, + scripts/dpkg-gencontrol.pl, scripts/dpkg-gensymbols.pl, + scripts/dpkg-shlibdeps.pl, scripts/dpkg-source.pl: Update scripts + to use the new modules Dpkg::Cdata, Dpkg::Control, + Dpkg::Fields::Object and Dpkg::Substvars. + + * scripts/Dpkg/Version.pm (check_version): New function replacing + checkversion of controllib.pl. + * scripts/dpkg-source.pl, scripts/dpkg-buildpackage.pl: Use the + new check_version. + + * scripts/Dpkg/Vars.pm (set_source_package): New function to set + and check the global variable $sourcepackage (replacing + controllib's setsourcepackage). + * scripts/dpkg-genchanges.pl, scripts/dpkg-gencontrol.pl, + scripts/dpkg-source.pl: Use the new set_source_package. + + * scripts/dpkg-distaddfile.pl, scripts/dpkg-gencontrol.pl: Delete + the chown(getfowner(), ...) on new files. It doesn't seem to do + anything useful anymore as it got dropped from several other + scripts over the years without problems. + + * scripts/dpkg-source.pl: Integrate readmd5sum from controllib here + as it's the only user of that function. + + * scripts/controllib.pl: Get rid of everything except + parsechangelog and its dependencies (parsecdata, syntax) that are + still needed. + + * scripts/Makefile.am: Include all the new files in the + distributed tarball. + +2007-12-28 Raphael Hertzog + + * scripts/Dpkg/ErrorHandling.pm (syntaxerr): New function to + replace the syntax() function in controllib.pl. + +2007-12-28 Raphael Hertzog + + * scripts/Dpkg.pm: Add a warning to avoid adding unnecessary stuff + in that module. + +2007-12-27 Guillem Jover + + * scripts/Dpkg.pm (%EXPORT_TAGS, @EXPORT_OK): Remove. + (@comp_supported, %comp_supported, %comp_ext, $comp_regex): Move + variables ... + * scripts/Dpkg/Compression.pm: ... here. New file. + * scripts/dpkg-genchanges.pl: Use new module Dpkg::Compression + instead of tag from Dpkg. + * scripts/dpkg-source.pl: Likewise + * scripts/Makefile.am (nobase_dist_perllib_DATA): Add + 'Dpkg/Compression.pm'. + +2007-12-27 Raphael Hertzog + + * scripts/Dpkg/Shlibs/SymbolFile.pm: Blacklist some armel specific + symbols (__exidx_end, __exidx_start). + +2007-12-27 Raphael Hertzog + + * Makefile.am: Add some missing files in EXTRA_DIST. And add a + dist-hook rule to check that all files contained in the git + repository (except .gitignore) are included in the dist tarball. + +2007-12-27 Raphael Hertzog + + * configure.ac: Bump version to 1.14.15~. + +2007-12-27 Raphael Hertzog + + * configure.ac: Release 1.14.14. + +2007-12-27 Raphael Hertzog + + * debian/control: Bump dpkg dependency to >= 1.14.13 in dpkg-dev + as dpkg-source needs the latest Dpkg.pm. + * debian/control: Add libio-string-perl to Build-Depends as it's + needed for a non-regression test (200_Dpkg_Shlibs.t). + * debian/control: Fix priority of dselect to match the priority + set by ftpmasters. + +2007-12-27 Guillem Jover + + * configure.ac: Bump version to 1.14.14~. + +2007-12-27 Guillem Jover + + * configure.ac: Release 1.14.13. + +2007-12-27 Flavio Stanchina + + * scripts/dpkg-divert.pl (checkrename): Do not ignore ENOENT for + destination. + +2007-12-27 Daniel Leidert + Guillem Jover + + * scripts/update-alternatives.pl: Refactor duplicate code into ... + (checked_alternative): ... here. New function. + (set_links): Call it. + +2007-12-27 Guillem Jover + + * scripts/update-alternatives.pl (gl): Use defined instead of length. + +2007-12-27 Guillem Jover + + * scripts/update-alternatives.pl (set_links): New function. + (config_alternatives): Use set_links instead of duped code. + (set_alternatives): Likewise. + +2007-12-27 Guillem Jover + + * scripts/update-alternatives.pl: Refactor all code to use + checked_mv instead of duped code. + +2007-12-27 Guillem Jover + + * scripts/update-alternatives.pl: Refactor all code to use + checked_symlink instead of duped code. + +2007-12-27 Guillem Jover + + * scripts/update-alternatives.pl (checked_rm): New function. Refactor + all code to use it instead of duped code. + +2007-12-26 Raphael Hertzog + + * scripts/dpkg-source.pl: Provide a sane default $origtargz in all + cases when such a file exists. + +2007-12-20 Raphael Hertzog + + * scripts/dpkg-shlibdeps.pl: Always consider the shlibs of the + current package before the shlibs of other binary packages when + looking for a dependency. + +2007-12-13 Raphael Hertzog + + * scripts/t/500_Dpkg_Path.t, scripts/Makefile.am: Add new + non-regression tests for functions provided by the Dpkg::Path + module. + +2007-12-12 Guillem Jover + + * scripts/dpkg-genchanges.pl: Fix typo (syserror() -> syserr()). + +2007-12-12 Guillem Jover + + * scripts/dpkg-gencontrol.pl (spfileslistvalue): Use || to fallback to + a default value instead of using a temporary variable and checking if + it's not defined. + +2007-12-12 Guillem Jover + + * scripts/dpkg-genchanges.pl: Use ||= instead of checking if the + variables are not defined. + * scripts/dpkg-gencontrol.pl: Likewise. + * scripts/update-alternatives.pl (fill_missing_slavepaths): Likewise. + +2007-12-11 Raphael Hertzog + + * scripts/Dpkg/Deps.pm: Add a compare function that compares + dependencies more intelligently than a comparison on their + string representation. In particular we want >= and >> to sort + lower than << and <= so that intervals are nicely displayed + as "a (>= 1), a (<< 2)" instead of the ugly "a (<< 2), a (>= 1)". + +2007-12-10 Raphael Hertzog + + * README.translators: Explain how to format Git commit messages. + +2007-12-10 Raphael Hertzog + + * scripts/Dpkg/Shlibs/SymbolFile.pm (merge_symbols): Do not update + the deprecated version of a symbol if it is already marked + deprecated. + +2007-12-09 Raphael Hertzog + + * scripts/Dpkg/Shlibs/SymbolFile.pm: Parse and dump properly + new meta-information fields (on lines starting with an asterisk). + Bugfix with alternate dependency handling that were not properly + dumped. New functions get_dependencies() and get_field(). + * scripts/t/200_Dpkg_Shlibs.t, + scripts/t/200_Dpkg_Shlibs/symbols.fake-2: Add a test case to + verify that meta-information fields and alternate dependencies are + properly parsed and dumped. + * scripts/dpkg-shlibdeps.pl: Take into account the new + Build-Depends-Package field in symbols files. + +2007-12-09 Raphael Hertzog + + * scripts/Dpkg/Shlibs/SymbolFile.pm (load): Pass the current + object as last parameter so that included files do not need to + repeat the header line. + * scripts/t/200_Dpkg_Shlibs/symbols.fake-1, + scripts/t/200_Dpkg_Shlibs/symbols.include-1: Adjust some tests + to also test inclusions with included files lacking a header line. + +2007-12-08 Raphael Hertzog + + * scripts/dpkg-shlibdeps.pl: Doesn't warn any more about libm.so.6 + being unused if the binary is also linked against libstdc++ since + g++ always add an implicit -lm. + +2007-12-08 Raphael Hertzog + + * scripts/Dpkg/Shlibs.pm (find_library): When it finds a library + in a directory which is just a symlink to another directory that + is also considered, remember the other directory name as the + canonical one. + * scripts/Dpkg/Path.pm: Add new function canonpath() and + resolve_symlink(). + 2007-12-05 Frank Lichtenheld * scripts/dpkg-buildpackage.pl: Add new diff --cc debian/changelog index d08e2896,5b3bed06..df07f3e9 --- a/debian/changelog +++ b/debian/changelog @@@ -1,50 -1,4 +1,61 @@@ -dpkg (1.14.13) UNRELEASED; urgency=low +dpkg (1.14.15) UNRELEASED; urgency=low + + [ Raphael Hertzog ] + * Make sure {dpkg-dev,dselect}.preinst are included in the source tarball. + Closes: #452730 + * Blacklist armel-specific symbols in dpkg-gensymbols. Reported by Riku + Voipio. Closes: #457964 + * Fix typos in various manpages. Patch from A. Costa. Closes: #458276 + + [ Guillem Jover ] + * Move compression related variables to a new Dpkg::Compression module. + * Remove disabled, obsolete and quite incomplete Hebrew translations. + * Revert dpkg-dev versioned dependency bump on dpkg >= 1.14.13 back to + >= 1.14.6, as the compression variables are now in a module in dpkg-dev. + * Do not disaplay garbage in dselect on monochrome terminals, by setting + a missing ncurses character attribute. Closes: #155741, #157093 + Thanks to Sven Rudolph. + * Do not loop endlessly in dselect with very long package descriptions. + Closes: #179320, #342495 + Thanks to John Zaitseff. + * Ignore wrapped lines in install-info when matching section titles. + Closes: #214684 + Thanks to Andreas Metzler and Ian Zimmerman. + * Do not use strdup for execvp arguments. Closes: #379027 + * Do not print 'failed to kill' warning in start-stop-daemon when polling + the pid. Closes: #157305, #352554 + Thanks to Samuel Thibault. + ++ [ Frank Lichtenheld ] ++ * Make the -L option of dpkg-parsechangelog actually work (it's ++ only been eleven years...) ++ * Import the code from my external Parse::DebianChangelog as ++ Dpkg::Changelog and Dpkg::Changelog::Debian. Using this ++ from parsechangelog/debian adds the following requested ++ features: ++ - Option to use a non-lossy format. Closes: #95579 ++ - Various options to better control how many entries ++ should be displayed. Closes: #226932 ++ + [ Updated dpkg translations ] + * Norwegian Bokmål (Hans Fredrik Nordhaug). Closes: #457918 + + [ Updated man pages translations ] + * Swedish (Peter Karlsson). + + -- Raphael Hertzog Thu, 27 Dec 2007 12:21:57 +0100 + +dpkg (1.14.14) unstable; urgency=low + + * Fix override disparity: set priority of dselect to important. + * Add libio-string-perl to Build-Depends as it's needed by a non-regression + test (fix FTBFS, thus a quick upload). + * Make dpkg-dev depend on dpkg (>= 1.14.13) as the latest Dpkg.pm is needed + for dpkg-source. + + -- Raphael Hertzog Thu, 27 Dec 2007 11:20:38 +0100 + +dpkg (1.14.13) unstable; urgency=low [ Frank Lichtenheld ] * Add an own manpage for Dpkg's version format. Mostly stolen diff --cc debian/dpkg-dev.install index 70e74cdd,b8a51901..5ff2d737 --- a/debian/dpkg-dev.install +++ b/debian/dpkg-dev.install @@@ -64,7 -64,8 +64,9 @@@ usr/share/man/*/*/dpkg-source. usr/share/man/*/dpkg-source.1 usr/share/perl5/Dpkg/Arch.pm usr/share/perl5/Dpkg/BuildOptions.pm +usr/share/perl5/Dpkg/Compression.pm + usr/share/perl5/Dpkg/Changelog.pm + usr/share/perl5/Dpkg/Changelog/Debian.pm usr/share/perl5/Dpkg/ErrorHandling.pm usr/share/perl5/Dpkg/Deps.pm usr/share/perl5/Dpkg/Fields.pm diff --cc scripts/Dpkg/ErrorHandling.pm index 9d79f283,ba2f687b..37f72b5d --- a/scripts/Dpkg/ErrorHandling.pm +++ b/scripts/Dpkg/ErrorHandling.pm @@@ -5,7 -5,7 +5,8 @@@ use Dpkg::Gettext use base qw(Exporter); our @EXPORT_OK = qw(warning warnerror error failure unknown syserr internerr - subprocerr usageerr syntaxerr $warnable_error $quiet_warnings); - subprocerr usageerr report $warnable_error $quiet_warnings); ++ subprocerr usageerr syntaxerr report ++ $warnable_error $quiet_warnings); our $warnable_error = 1; our $quiet_warnings = 0; diff --cc scripts/Makefile.am index b2377018,0a711a56..19863b48 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@@ -69,9 -69,10 +69,13 @@@ EXTRA_DIST = t/200_Dpkg_Shlibs/objdump.ls \ t/300_Dpkg_BuildOptions.t \ t/400_Dpkg_Deps.t \ + t/500_Dpkg_Path.t \ + t/600_Dpkg_Changelog.t \ + t/600_Dpkg_Changelog/countme \ + t/600_Dpkg_Changelog/misplaced-tz \ - t/600_Dpkg_Changelog/shadow ++ t/600_Dpkg_Changelog/shadow \ + t/700_Dpkg_Control.t \ + t/700_Dpkg_Control/control-1 CLEANFILES = \ $(bin_SCRIPTS) $(sbin_SCRIPTS) $(changelog_SCRIPTS) \ @@@ -81,11 -82,10 +85,13 @@@ perllibdir = $(PERL_LIBDIR nobase_dist_perllib_DATA = \ Dpkg/Arch.pm \ Dpkg/BuildOptions.pm \ - Dpkg/Compression.pm \ + Dpkg/Cdata.pm \ + Dpkg/Changelog.pm \ + Dpkg/Changelog/Debian.pm \ - Dpkg/ErrorHandling.pm \ ++ Dpkg/Compression.pm \ + Dpkg/Control.pm \ - Dpkg/ErrorHandling.pm \ Dpkg/Deps.pm \ ++ Dpkg/ErrorHandling.pm \ Dpkg/Fields.pm \ Dpkg/Gettext.pm \ Dpkg/Path.pm \