The following commit has been merged in the iwj branch:
commit 4b2bc864ce70972800e9995deb97b8ff936a61fe
Merge: c372e7e8b203c2bc052f488960f078a5baac03b7
f1f5a979d17d531a57c8a6e232eeb2642a4862d5
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Sat Mar 8 17:57:55 2008 +0000
Merge branch 'bug432893' of /u/ian/an-things/Dpkg/dpkg.bugfixes into
triggers
* postinst in cleanup iff status was good beforehand. Closes: #432893.
This is the proper fix. If the package was halfconfigured, we
don't run the postinst and that way there are no surprises.
When we do run the postinst we know that we can without fear set
the package to installed (or trig*, as the case may be).
We achieve this by not registering the cu_prerm* handlers unless the
package was >stat_halfconfigured beforehand. We have no more need
to pass the previous state into the cu_prerm* postinst invocations.
* Do not pointlessly clear reinstreq flag on postinst abort-remove.
cu_prermremove is only be called via a push_cleanup in remove.c which
is only executed if the package is at least halfconfigured so
reinstreq must be clear to start with.
* Mark reinstreq during unpack as late as possible, not before prerm.
Previously the package would be reinstreq while we deal with
conflictors' prerms and deconfiguration, but that's unnecessary.
Conflicts:
debian/changelog
src/remove.c
diff --combined debian/changelog
index 445a216,f0d99cb..ee9f223
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,530 -1,40 +1,546 @@@
-dpkg (1.14.8) UNRELEASED; urgency=low
+dpkg (1.15.0~~iwj) UNRELEASED; urgency=low
+
+ [ Ian Jackson ]
+ * Triggers.
++
+ * Fix formatting of a few files. Closes: #375711.
+ * Treat successful calls to the postinst as always making the package
- installed. Reverts Brian Carlson's patch from #432893.
++ installed. Reverts Brian Carlson's patch from #432893.
+ * Fix missing angle bracket in Swedish po file.
++ * postinst in cleanup iff status was good beforehand. Closes: #432893.
++ This is the proper fix. If the package was halfconfigured, we
++ don't run the postinst and that way there are no surprises.
++ When we do run the postinst we know that we can without fear set
++ the package to installed (or trig*, as the case may be).
++ We achieve this by not registering the cu_prerm* handlers unless the
++ package was >stat_halfconfigured beforehand. We have no more need
++ to pass the previous state into the cu_prerm* postinst invocations.
++ * Do not pointlessly clear reinstreq flag on postinst abort-remove.
++ cu_prermremove is only be called via a push_cleanup in remove.c which
++ is only executed if the package is at least halfconfigured so
++ reinstreq must be clear to start with.
++ * Mark reinstreq during unpack as late as possible, not before prerm.
++ Previously the package would be reinstreq while we deal with
++ conflictors' prerms and deconfiguration, but that's unnecessary.
+
+ [ Egmont Koblinger ]
+ * lstat correct conffile path even with --root. Closes: #281057.
+ Previously we would incorrectly ignore --root here. The change is
+ dpkg-1.13.22-oom-part2.patch from Egmont's June 2006 message to the
+ bug report, adjusted to fit without the part1 patch.
+
+ [ 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
+ * Cosmetic fixes to start-stop-daemon output and man page. Document that
+ --chuid will change the group even if it has not been specified. Add
+ EXIT STATUS and EXAMPLE sections to man page. Thanks to Justin Pryzby.
+ * Add Raphael Hertzog to Uploaders, and remove Brendan O'Dea and
+ Christian Perrier with their permission.
+ * Use functions from libcompat when those are not provided by the system.
+ * Change dpkg-gencontrol to not output the Homapage field on udeb.
+ * Reintroduce 'no-debsig' back in dpkg.cfg to avoid failing to install any
+ package when debsig-verify is installed. Closes: #311843
+ * Fix some small memory leaks. Closes: #469520
+ Thanks to Sean Finney.
[ Raphael Hertzog ]
- * Merge dpkg-shlibdeps-buxy branch, dpkg-shlibdeps has been heavily
- reworked:
- * it supports "symbols" files to generate finer-grained
- dependencies. Closes: #430367
- Those files can be created by the new dpkg-gensymbols
- command.
- * it uses now all paths in RPATH (instead of only the first).
+ * 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
+ * Include list of libraries in dpkg-gensymbols' warning about new/lost
+ libraries.
+ * Add -R option to dpkg-buildpackage so that one can replace the usual
+ "debian/rules" by something else. Closes: #355654
+ * Always list all binary packages in the Description: field of .changes
+ files. It's nice for reviewers and mentors.debian.net was using this field
+ on source only uploads to display short description of what the package is
+ about.
+ * Handle the case when the library has a different SONAME than the one used
+ to find it. Closes: #462413
+ * Fix Dpkg::Version and Dpkg::Fields::Object to import _g() from
+ Dpkg::Gettext. Thanks to Adam Heath and Olivier Berger for spotting
+ this. Closes: #465651
+ * Change PATH during make check to look into build directories containing
+ dpkg and the related scripts. Thanks to Mike Frysinger. Closes: #466957
+ * Some lintian cleanup:
+ - add overrides for some useless I: tags
+ - drop unused overrides
+ - updated several manual pages to fix hyphen-used-as-minus-sign
+ - fixed manpage-has-errors-from-man in several manual pages
+ * Removed old upgrade code from dpkg's preinst and postinst which only
+ concerns upgrading from dpkg version older than the one in oldstable
+ already. And thus we get rid of old the last usage of read in those
+ scripts (fixes lintian's warning read-in-maintainer-script).
+ * Removed sorting of dependencies in dpkg-gencontrol and dpkg-source. But
+ kept it for all other fields (Enhances, Conflicts, Replaces, Breaks,
+ Build-Conflicts and Build-Conflicts-Indep).
+ * Instead changed dpkg-shlibdeps to sort the dependencies generated in
+ ${shlibs:*} variables.
+ * Changed the logic of simplification of dependencies: if any dependency
+ must be discarded due to another dependency appearing further
+ in the field, the superseding dependency will take the place of the
+ discarded one. Added a test case for this.
+
+ [ Frank Lichtenheld ]
+ * Add a warning in dpkg-buildpackage if the build-dependencies are not
+ satisfied during -S. Closes: #445552
+ * Add a missing space in the German scripts translation. Closes: #463398
+ * Add improved deb-shlibs.5 manual page by Zack Weinberg. Closes: #466135
+ * dpkg-buildpackage exports some build related environment variables
+ now. Based on a patch by Matthias Klose. Closes: #465282
+ (See dpkg-buildpackage(1) and https://wiki.ubuntu.com/DistCompilerFlags
+ for details)
+ * Add support for use of SHA1 and SHA256 checksums in .dsc and
+ .changes files. Information will be available in Checksums-Sha{1,256}
+ fields. .changes format version increased to 1.8.
+ * Link dselect against libncursesw. Closes: #466321
+ * Forward port a patch from the old changelog parser to the new
+ one that got lost during the transition. '+' and '.' can now
+ be used in distribution names yet again. Reported by dann frazier.
+ Closes: #467470
+
+ [ Updated dpkg translations ]
+ * Korean (Changwoo Ryu).
+ * Polish (Robert Luberda).
+ * Romanian (Eddy Petrișor).
+ * Swedish (Peter Karlsson).
+ * Thai (Theppitak Karoonboonyanan). Closes: 468916
+
+ [ Updated manpages translations ]
+ * German (Helge Kreutzmann).
+ * Polish (Robert Luberda).
+ * Swedish (Peter Karlsson).
+
+ [ Updated dselect translations ]
+ * Basque. (Piarres beobide). Closes: #462403
+
+ [ Updated scripts translations ]
+ * German (Helge Kreutzmann).
+ * Polish (Robert Luberda).
+ * Swedish (Peter Karlsson).
+
+ [ Updated dselect translations ]
+ * Polish (Robert Luberda).
+ * Romanian (Eddy Petrișor).
+
+ -- Ian Jackson <[EMAIL PROTECTED]> Sat, 08 Mar 2008 17:24:51 +0000
+
+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 <[EMAIL PROTECTED]> 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
+ times the same file and have it properly taken into account.
+ * Add many armel-specific symbols to dpkg-gensymbols' blacklist.
+ Closes: #462318
+
+ -- Raphael Hertzog <[EMAIL PROTECTED]> 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
+
+ -- Guillem Jover <[EMAIL PROTECTED]> Wed, 23 Jan 2008 08:44:32 +0200
+
+dpkg (1.14.16.3) unstable; urgency=low
+
+ [ Raphael Hertzog ]
+ * Remove the ":utf8" layer that utf8-encodes already valid utf8.
+ Closes: #462098
+ * Disable variable substitution in dpkg-genchanges. Closes: #462079, #462089
+
+ [ Guillem Jover ]
+ * Make start-stop-daemon set the supplementary groups if the real user or
+ group are different than the ones we should switch to. Closes: #462075
+ * Fix segfault in start-stop-daemon when using --group w/o --chuid (as
+ a side effect, using --group alone works for the first time in years).
+ Closes: #462072
+ * Fix timeout computations for start-stop-daemon --retry option. This has
+ not worked properly for a long time (maybe never), but came to light
+ due to #460903's fix. Closes: #462104
+
+ -- Guillem Jover <[EMAIL PROTECTED]> Tue, 22 Jan 2008 23:39:59 +0200
+
+dpkg (1.14.16.2) unstable; urgency=low
+
+ * Change uid after changing gid and initializing supplementary groups in
+ start-stop-daemon. Closes: #462018
+ * Change temporary dpkg Breaks on dpkg-dev (= 1.14.13) and (= 1.14.14)
+ to Conflicts, so that users from etch can upgrade to sid (or lenny
+ once dpkg has migrated).
+
+ -- Guillem Jover <[EMAIL PROTECTED]> Tue, 22 Jan 2008 13:05:22 +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 <[EMAIL PROTECTED]> Mon, 21 Jan 2008 12:48:51 +0100
+
+dpkg (1.14.16) unstable; urgency=low
+
+ [ Guillem Jover ]
+ * Add build-essential as an implicit Build-Depends in dpkg-checkbuilddeps.
+ Closes: #402901
+ * Add build-essential to dpkg-dev Recommends.
+ * Do not warn about unrecognized Homepage field in binary package stanzas
+ in dpkg-genchanges and dpkg-source. Closes: #460309
+ * Do not use the enoent helper binary, and use perl POSIX module instead.
+ * Keep checking for the process when start-stop-daemon is called with
+ --retry even if the daemon removed the pidfile. Closes: #460903
+ Thanks to Justin Pryzby for the analysis.
+ * Make --quiet silence --test in start-stop-daemon. Closes: #367998
+ * Check current uid and gid in start-stop-daemon before calling setuid,
+ setgid and initgroups. Closes: #222524
+ Based on a patch by Samuel Thibault.
+ * Remove unimplemented --test option from update-alternatives.
+ Closes: #392432, #461247
+ * Additionally check if errno is EEXIST after rmdir(2), as SUSv3 specifies
+ that on non-empty directories it can either return that or ENOTEMPTY.
+ This fixes run time problems on Solaris.
+ * Fix start-stop-daemon --help output to state that --name is one of the
+ possible required options to use. Closes: #354999
+ * Demote dselect from priority important to optional. Closes: #461327
+ * Fix portability issues on HP-UX, by not using backticks inside double
+ quotes in m4 files. Closes: #24514
+ * Switch Maintainer address to <[EMAIL PROTECTED]> from
+ <[EMAIL PROTECTED]>.
+ * Add README.feature-removal-schedule describing the features to be removed
+ and README.api describing the provided APIs.
+
+ [ 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
+
+ [ Raphael Hertzog ]
+ * Replaced all the remaining code in controllib.pl by new modules. All
+ scripts have been adjusted to use the new modules and controllib.pl has
+ been removed.
+ * The code to parse debian/control is available in a perl module
+ Dpkg::Control. Closes: #26554
+ * Temporarily add a Breaks: dpkg-dev (= 1.14.13), dpkg-dev (= 1.14.14) on
+ dpkg for the convenience of sid users. Closes: #459815
+ * Update dpkg-source(1) to explain better what the directory after -b is.
+ Closes: #323606
+ * Also force version in ${binary:Version} if dpkg-gencontrol -v<version>
+ is used. That way we're consistent with the definition of that variable
+ in deb-substvars(5). Closes: #433477
+ * Add support of Dm-Upload-Allowed field. Closes: #453400
+ * Fix dpkg-shlibdeps's filtering of duplicated dependencies in fields of
+ lesser priority (when -d is used).
+ * Fix behaviour of dpkg-shlibdeps when the same binary was passed multiple
+ times for use in different dependency fields (-d option).
+ * Change logic of -si option of dpkg-genchanges to include the original
+ tarball only if the current upstream version differs from the upstream
+ version of the previous changelog entry. Replaces the heuristic based
+ on revision number (-0, -0.1 or -1). Closes: #28701
+ * Some code refactoring on dpkg-genchanges and bug fixes in the generation
+ of the Description: field. As a result, source only uploads will no more
+ have Description fields.
+ * Add support of wildcard entries in symbols files. This makes it much
+ simpler to write symbols files for well managed libraries but in that case
+ dpkg-gensymbols can't check any more if symbols have disappeared.
+ Closes: #459359
+
+ [ Updated manpages translations ]
+ * Fix typo in French. Closes: #460021
+ * German (Helge Kreutzmann).
+
+ [ Updated dpkg translations ]
+ * Basque (Piarres Beobide). Closes: #459565
+ * French (Christian Perrier).
+ * German, Basque, Norwegian Bokmål, Swedish, Vietnamese, Simplified Chinese,
+ Galician unfuzzied.
+ * Russian (Yuri Kozlov). Closes: #460708
+
+ [ Updated scripts translations ]
+ * Russian (Yuri Kozlov). Closes: #460709
+ * Swedish (Peter Karlsson).
+
+ -- Guillem Jover <[EMAIL PROTECTED]> Mon, 21 Jan 2008 10:00:45 +0200
+
+dpkg (1.14.15) unstable; 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
+ * Make dpkg-shlibdeps choose the right symbols files when we have several
+ debian/*/DEBIAN/symbols for a given soname. Closes: #458860
+ * Add a -S<pkgbuilddir> option to dpkg-shlibdeps to indicate a package build
+ tree to scan first when trying to find a needed library.
+ * Change dpkg-gensymbols to mark symbols that disappeared with #MISSING
+ instead of #DEPRECATED, it's clearer for people.
+ * Fix Dpkg::Shlibs::Objdump to properly take into account R_*_COPY
+ relocations. Closes: #454036
+ * Explain better the order in which postinst/prerm scripts are called
+ between a package and its dependencies. Thanks to Nicolas François and
+ Helge Kreutzmann for their suggestions. Closes: #379641
+ * Fix Dpkg::BuildOptions so that dpkg-buildpackage doesn't double all
+ options in DEB_BUILD_OPTIONS when called with the -j parameter.
+ Closes: #453656
+
+ [ 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.
+ * Properly print build message in dpkg-buildpackage for lzma and bzip2
+ compressed sources. Closes: #458519
+ * Promote bzip2 Recommends to Depends for dpkg-dev. Closes: #458521
+ * Add lzma to dpkg-dev Depends.
+ * Do not automatically enable -j if DEB_BUILD_OPTIONS contains parallel=n,
+ and allow overriding its value from the environment. Closes: #458589
+ * Fix Dpkg::BuildOptions to parse all options in DEB_BUILD_OPTIONS, so
+ that dpkg-buildpackage called with -j preserves unrecognized options.
+ * Fix several signed vs unsigned value comparisons that were making some
+ code to never be executed.
+
+ [ Updated dpkg translations ]
+ * French (Christian Perrier).
+ * German (Sven Joachim). Closes: #459223
+ * Norwegian Bokmål (Hans Fredrik Nordhaug). Closes: #457918, #458732
+ * Simplified Chinese (Deng Xiyue). Closes: #459018
+ * Swedish (Peter Karlsson).
+ * Vietnamese (Clytie Siddall). Closes: #459016
+
+ [ Updated scripts translations ]
+ * French (Christian Perrier).
+ * Swedish (Peter Karlsson).
+
+ [ Updated man pages translations ]
+ * Swedish (Peter Karlsson).
+
+ -- Guillem Jover <[EMAIL PROTECTED]> Mon, 07 Jan 2008 12:12:16 +0200
+
+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 <[EMAIL PROTECTED]> 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
+ from policy. Closes: #373003
+ * Fix control file parsing for field values starting with a colon.
+ Apparently nobody ever needed this until Vcs-Cvs came along.
+ Closes: #453364
+ * Copy the usr/share/doc directory to dpkg-dev and dselect (Instead
+ of using symlinks). The space requirements are minimal and adding
+ the needed dependencies to comply with policy would be way more
+ inconvenient. Pointed out by Rene Engelhard. Closes: #452730
+ * Allow more than one arch and more than one type of a package
+ in debian/files. Parts of the patch by Goswin von Brederlow
+ and Bastian Blank. Closes: #356299, #377400, #229143
+ * Allow building only architecture independent packages (-A).
+ Closes: #109794, #200454
+ * Bump Standards-Version to 3.7.3 (no changes)
+
+ [ Raphael Hertzog ]
+ * When dpkg-shlibdeps finds a lib in a directory which is just a symlink to
+ another directory that is also considered, remember the other directory
+ name as the canonical one. Closes: #453885
+ * dpkg-shlibdeps 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. Closes: #454616
+ * Included files in symbols files (via #include) do no more need to repeat
+ the header line. Closes: #455260
+ * Tweak the sort algorithm between dependencies so that intervals
+ are displayed as "a (>= 1), a (<< 2)" instead of the opposite.
+ Closes: #455520
+ * Extend format of symbols files to support arbitrary fields of
+ meta-information. First field is Build-Depends-Package used to extract the
+ version requirement possibly encoded in the Build-Depends field and make
+ sure that the generated dependency is at least as strict as this one.
+ * Fix dpkg-gensymbols to not update version info of a deprecated symbol.
+ Closes: #457739
+ * Fix dpkg-source's behaviour with options -sk -sK -sp -sP. Closes: #457784
+
+ [ Guillem Jover ]
+ * Ignore the man pages when building without NLS support. Closes: #457673
+ * Fix perl warnings:
+ - Check for undefined values when reading from the alternative db.
+ * Properly handle symlinks for alternatives with inexistent slave links.
+ Closes: #76295, #246906, #433567, #451872, #220044, #392440, #441021
+ Closes: #443241
+ Based on a patch by Daniel Leidert <[EMAIL PROTECTED]>.
+ * Fail when diverting to a non existent directory. Closes: #245562
+ Thanks to Flavio Stanchina <[EMAIL PROTECTED]>.
+ * Refactor update-alternatives.
+
+ [ Updated dpkg translations ]
+ * French (Christian Perrier, as this was trivial).
+ * Spanish (Javier Fernández-Sanguino Peña). Closes: #456984
+ * Swedish (Peter Karlsson).
+
+ [ Updated man pages translations ]
+ * German (Helge Kreutzmann).
+ * Swedish (Peter Karlsson).
+
+ [ Updated scripts translations ]
+ * French (Frédéric Bothamy).
+ * German (Helge Kreutzmann).
+ * Japanese (Kenshi Muto). Closes: #455841
+ * Swedish (Peter Karlsson).
+
+ -- Guillem Jover <[EMAIL PROTECTED]> Thu, 27 Dec 2007 09:16:45 +0200
+
+dpkg (1.14.12) unstable; urgency=low
+
+ [ Raphael Hertzog ]
+ * Add -I<file> option to dpkg-gensymbols to force the usage of a specific
+ symbols file.
+ * Dpkg::Shlibs::find_library() now returns canonicalized paths.
+ * dpkg-shlibdeps always tries the realpath() of a lib as fallback when
+ trying to identify the package of a lib (and not only for symlinks).
+ * dpkg-shlibdeps doesn't fail any more if it can't find unversioned
+ libraries on the presumption that they are just private libraries. Outputs
+ a warning instead.
+ * Expand the dpkg-shlibdeps manual page with explanations concerning
+ failures.
+ * The environment variable DPKG_GENSYMBOLS_CHECK_LEVEL can be used to force
+ dpkg-gensymbols to use a precise level of checks. Closes: #452022
+
+ [ Guillem Jover ]
+ * Define several private functions and variables as static.
+ * Move extern declarations to header files and stop defining them as extern.
+ * Unify parsing of Section and Priority in dpkg-gencontrol with Homepage.
+ * Switch dpkg-scanpackages to use the new Dpkg::ErrorHandling and
+ Dpkg::Versions modules.
+
+ -- Guillem Jover <[EMAIL PROTECTED]> Thu, 29 Nov 2007 06:14:09 +0200
+
+dpkg (1.14.11) unstable; urgency=low
+
+ [ Raphael Hertzog ]
+ * dpkg-shlibdeps now ignores the lack of dependency information in some
+ specific cases (instead of failing):
+ - when the library is in the same package than the binary analyzed
+ - when the library is not versionned and can't have a shlibs file
+ * dpkg-shlibdeps now only displays 10 warnings about symbols not found for
+ each binary and a count of skipped warnings. Closes: #452318
+ * dpkg-shlibdeps: optimize "dpkg -S" lookups by caching results, patch
+ from Aaron M. Ucko <[EMAIL PROTECTED]>. Closes: #452577
+
+ [ Guillem Jover ]
+ * Fix dpkg-scanpackages to properly support an optional override file.
+ Closes: #452621
+
+ -- Guillem Jover <[EMAIL PROTECTED]> Sat, 24 Nov 2007 07:19:02 +0200
+
+dpkg (1.14.10) unstable; urgency=low
+
+ [ Raphael Hertzog ]
+ * dpkg-shlibdeps now correctly identify private libraries (avoid many
+ warnings with perl/python modules). Closes: #452338
+ * Move capit() to a Dpkg::Fields module and use it in dpkg-shlibdeps.
+ Closes: #452262
+ * Add more debug messages to dpkg-shlibdeps to ease collecting information
+ in case of problems.
+ * dpkg-shlibdeps now accepts again empty dependencies in shlibs files.
+ * dpkg-shlibdeps will try harder to identify packages providing a library
+ by looking up dpkg -S on the realpath of any symlink to a library.
+ Closes: #452339
+ * dpkg-source now correctly identifies the extension of the
+ orig.tar.{gz,bz2,lzma} file and won't unexpectedly create "Format: 2.0"
+ .dsc files.
+
+ [ Guillem Jover ]
+ * Add support for Package-Type in dpkg-name.
+ * Restore cross compilation support by honouring the environment host and
+ arch variables to override the default values on the dpkg-dev scripts.
+
+ [ Updated man pages translations ]
+ * Swedish (Peter Karlsson)
+
+ [ Added scripts translations ]
+ * Swedish (Peter Karlsson)
+
+ -- Guillem Jover <[EMAIL PROTECTED]> Fri, 23 Nov 2007 06:32:27 +0200
+
+dpkg (1.14.9) unstable; urgency=low
+
+ [ Raphael Hertzog ]
+ * Fix bad behaviour of Dpkg::Path::get_pkg_root_dir() and adjust
+ dpkg-shlibdeps accordingly. Closes: #452012
+ * Fix Dpkg::Deps to accept empty fields. Closes: #452013
+
+ [ Updated man pages translations ]
+ * German (Helge Kreutzmann).
+
+ -- Guillem Jover <[EMAIL PROTECTED]> Tue, 20 Nov 2007 07:15:41 +0200
+
+dpkg (1.14.8) unstable; urgency=low
+
+ [ Raphael Hertzog ]
+ * Heavy rework of dpkg-shlibdeps:
+ - Support "symbols" files to generate finer-grained dependencies.
+ Those files can be created by the new dpkg-gensymbols command.
+ Closes: #430367
+ - Uses now all paths in RPATH (instead of only the first).
Closes: #395942
- * it's now able to parse include directives in /etc/ld.so.conf.
- Closes: #431597
- * libraries are also searched in the public directories of packages
+ - Support parsing include directives in /etc/ld.so.conf. Closes: #431597
+ - Libraries are also searched in the public directories of packages
being built and thus debian/shlibs.local can effectively define
dependencies for libraries that are being built. Closes: #80340
- * "symbols" files use the full SONAME as key instead of splitting it in
- (name, version) like the "shlibs" format requires it. This allows
- binaries to be linked with unversioned libraries and not fail.
- Closes: #48208
- Note that unversioned libraries are still a very bad idea.
- * dpkg-shlibdeps now supports "-x<package>" options that can be used
- to exclude packages from generated dependencies. This is
- particalularly useful to avoid dependencies on ourselves when a
- package contains a binary and a library (without requiring an
- shlibs.local file to override the usual shlibs file). It might also
- be used to avoid other unwanted dependencies (use with care though).
+ - "symbols" files use the full SONAME as key instead of splitting it in
+ (name, version) like in the "shlibs" format. This allows binaries to
+ be linked with unversioned libraries and not fail. Note that
+ unversioned libraries are still a very bad idea. Closes: #48208
+ - dpkg-shlibdeps now supports '-x<package>' options that can be used to
+ exclude packages from generated dependencies (use with care though).
Closes: #41907, #109954
- * If dpkg-shlibdeps doesn't find any dependency information for a
+ - If dpkg-shlibdeps doesn't find any dependency information for a
shared library that is actively used, then it will fail. This can be
- disabled with the option --ignore-missing-info. Closes: #10807
- * Switch perl programs to use the new Dpkg/Deps module. This changes the
- behaviour of dpkg-gencontrol which will rewrite and simplify dependencies
- as possible.
- Multiple dependencies on the same package are replaced by their
- intersection. Closes: #178203, #186809, #222652
- This applies to dependencies as well as build dependencies.
+ disabled with the option '--ignore-missing-info'. Closes: #10807
+ * Switch perl programs to use the new Dpkg::Deps module. This changes the
+ behaviour of dpkg-gencontrol and dpkg-source which will rewrite and
+ simplify dependencies and build dependencies as possible. Multiple
+ dependencies on the same package are replaced by their intersection.
+ Closes: #178203, #186809, #222652
[ Frank Lichtenheld ]
* Add $(MAKE) check to build target
@@@ -535,51 -45,44 +551,51 @@@
Closes: #445858
* Fix Dpkg::BuildOptions (and thereby dpkg-buildpackage) to really
set DEB_BUILD_OPTIONS. Found by Daniel Shepler. Closes: #446119
+ * Change some ' in shell code in dpkg-source.1 and dpkg-query.1 to
+ proper \(aq. Reported by Daniel van Eeden. Closes: #447476
[ Guillem Jover ]
* Use shipped perl modules when calling perl programs at build time.
- * Switch perl programs to use the new Dpkg/ErrorHandling module.
- * Switch perl programs to use the new Dpkg/Arch module.
+ * Switch perl programs to use the new Dpkg::ErrorHandling and Dpkg::Arch
+ perl modules.
* Add support for format strings in Dpkg::ErrorHandling functions.
+ * Move build and host arch detection code from dpkg-architecture to
+ Dpkg::Arch.
+ * Add initial udeb support:
+ - Support new fields fields Package-Type, Subarchitecture, Kernel-Version
+ and Installer-Menu-Item. Closes: #383916
+ - New '--type' option for dpkg-scanpackages.
+ * Make dpkg-dev Conflict on dpkg-cross << 2.0.0 which was sourcing
+ dpkg-buildpackage expecting it to be a shell script. Closes: #445852
+ * Get rid of undefined macros from man pages. Thanks to Colin Watson
+ for the analysis.
+
+ [ Updated dselect translations ]
+ * Czech (Miroslav Kure).
+
+ [ Added dpkg translations ]
+ * Thai (Theppitak Karoonboonyanan). Closes: #446501
[ Updated dpkg translations ]
+ * Czech (Miroslav Kure).
+ * Galician (Jacobo Tarrio). Closes: #446624
* Polish (Robert Luberda).
* Russian (Yuri Kozlov). Closes: #446278
- * Thai (Theppitak Karoonboonyanan). Closes: #446501
- * Galician (Jacobo Tarrio). Closes: #446624
[ Updated man pages translations ]
- * German (Helge Kreutzmann).
+ * German (Helge Kreutzmann). Closes: #448354
* Polish (Robert Luberda).
* Swedish (Peter Karlsson).
+ [ Added scripts translations ]
+ * German (Helge Kreutzmann). Closes: #448353
+
[ Updated scripts translations ]
* Polish (Robert Luberda).
+ * Swedish (Peter Karlsson).
[ Ian Jackson ]
- * postinst in cleanup iff status was good beforehand. Closes: #432893.
- This is the proper fix. If the package was halfconfigured, we
- don't run the postinst and that way there are no surprises.
- When we do run the postinst we know that we can without fear set
- the package to installed (or trig*, as the case may be).
- We achieve this by not registering the cu_prerm* handlers unless the
- package was >stat_halfconfigured beforehand. We have no more need
- to pass the previous state into the cu_prerm* postinst invocations.
* Run prerms during removal even if the package is in a trig* state.
- * Do not pointlessly clear reinstreq flag on postinst abort-remove.
- cu_prermremove is only be called via a push_cleanup in remove.c which
- is only executed if the package is at least halfconfigured so
- reinstreq must be clear to start with.
- * Mark reinstreq during unpack as late as possible, not before prerm.
- Previously the package would be reinstreq while we deal with
- conflictors' prerms and deconfiguration, but that's unnecessary.
-- Raphael Hertzog <[EMAIL PROTECTED]> Mon, 08 Oct 2007 20:49:51 +0200
@@@ -649,7 -152,7 +665,7 @@@ dpkg (1.14.7) unstable; urgency=lo
* German (Sven Joachim). Closes: #440537
* Nepali (Shiva Prasad Pokharel). Closes: #437825
* Portuguese (Miguel Figueiredo). Closes: #441113
- * Romanian (Eddy Petri?or).
+ * Romanian (Eddy Petrișor).
* Vietnamese (Clytie Siddall). Closes: #440502
* Korean (Sunjae Park). Closes: #443190
diff --combined src/processarc.c
index c14f25a,cf9d3e1..67978b0
--- a/src/processarc.c
+++ b/src/processarc.c
@@@ -60,7 -60,7 +60,7 @@@ void process_archive(const char *filena
static char *cidirbuf=0, *reasmbuf=0;
static struct fileinlist *newconffiles, *newfileslist;
static enum pkgstatus oldversionstatus;
- static struct varbuf infofnvb, fnvb, depprobwhy;
+ static struct varbuf infofnvb, fnvb, cfnvb, depprobwhy;
static struct tarcontext tc;
int c1, r, admindirlen, i, infodirlen, infodirbaseused, status;
@@@ -397,10 -397,10 +397,10 @@@
oldversionstatus == stat_triggersawaited ||
oldversionstatus == stat_triggerspending ||
oldversionstatus == stat_installed) {
- pkg->eflag |= eflagf_reinstreq;
pkg->status= stat_halfconfigured;
modstatdb_note(pkg);
- push_cleanup(cu_prermupgrade,~ehflag_normaltidy, 0,0, 1,(void*)pkg);
+ if (oldversionstatus > stat_halfconfigured)
+ push_cleanup(cu_prermupgrade,~ehflag_normaltidy, 0,0, 1,(void*)pkg);
maintainer_script_alternative(pkg, PRERMFILE, "pre-removal", cidir,
cidirrest,
"upgrade", "failed-upgrade");
pkg->status= stat_unpacked;
@@@ -417,6 -417,7 +417,7 @@@
else
printf(_("De-configuring %s ...\n"), deconpil->pkg->name);
+ assert(deconpil->pkg->status > stat_halfconfigured);
trig_activate_packageprocessing(deconpil->pkg);
deconpil->pkg->status= stat_halfconfigured;
modstatdb_note(deconpil->pkg);
@@@ -448,15 -449,18 +449,18 @@@
}
for (i = 0 ; i < cflict_index; i++) {
- if (!(conflictor[i]->status == stat_halfconfigured ||
- conflictor[i]->status == stat_triggersawaited ||
- conflictor[i]->status == stat_triggerspending ||
- conflictor[i]->status == stat_installed)) continue;
+ enum pkgstatus conflictoroldstatus= conflictor[i]->status;
+ if (!(conflictoroldstatus == stat_halfconfigured ||
+ conflictoroldstatus == stat_triggersawaited ||
+ conflictoroldstatus == stat_triggerspending ||
+ conflictoroldstatus == stat_installed)) continue;
trig_activate_packageprocessing(conflictor[i]);
conflictor[i]->status= stat_halfconfigured;
modstatdb_note(conflictor[i]);
- push_cleanup(cu_prerminfavour,~ehflag_normaltidy, 0,0,
- 2,(void*)conflictor[i],(void*)pkg);
+
+ if (conflictoroldstatus > stat_halfconfigured)
+ push_cleanup(cu_prerminfavour,~ehflag_normaltidy, 0,0,
+ 2,(void*)conflictor[i],(void*)pkg);
maintainer_script_installed(conflictor[i], PRERMFILE, "pre-removal",
"remove", "in-favour", pkg->name,
versiondescribe(&pkg->available.version,
@@@ -681,17 -685,12 +685,17 @@@
for (cfile= newfileslist; cfile; cfile= cfile->next) {
if (!cfile->namenode->filestat) {
cfile->namenode->filestat= nfmalloc(sizeof(struct stat));
- if (lstat(cfile->namenode->name, cfile->namenode->filestat)) {
+ varbufreset(&cfnvb);
+ varbufaddstr(&cfnvb,instdir);
+ varbufaddc(&cfnvb,'/');
+ varbufaddstr(&cfnvb,cfile->namenode->name);
+ varbufaddc(&cfnvb,0);
+ if (lstat(cfnvb.buf, cfile->namenode->filestat)) {
if (!(errno == ENOENT || errno == ELOOP || errno == ENOTDIR))
ohshite(_("unable to stat other new file `%.250s'"),
cfile->namenode->name);
memset(cfile->namenode->filestat, 0,
- sizeof(cfile->namenode->filestat));
+ sizeof(*cfile->namenode->filestat));
continue;
}
}
diff --combined src/remove.c
index c93fb67,4394b36..9eda674
--- a/src/remove.c
+++ b/src/remove.c
@@@ -168,9 -168,11 +168,11 @@@ void deferred_remove(struct pkginfo *pk
log_action("remove", pkg);
trig_activate_packageprocessing(pkg);
if (pkg->status >= stat_halfconfigured) {
+ enum pkgstatus oldstatus= pkg->status;
pkg->status= stat_halfconfigured;
modstatdb_note(pkg);
- push_cleanup(cu_prermremove,~ehflag_normaltidy, 0,0, 1,(void*)pkg);
+ if (oldstatus > stat_halfconfigured)
+ push_cleanup(cu_prermremove,~ehflag_normaltidy, 0,0, 1,(void*)pkg);
maintainer_script_installed(pkg, PRERMFILE, "pre-removal",
"remove", (char*)0);
pkg->status= stat_unpacked; /* Will turn into halfinstalled soon ... */
@@@ -248,7 -250,7 +250,7 @@@ static void removal_bulk_remove_files
}
debug(dbg_eachfiledetail, "removal_bulk removing `%s'", fnvb.buf);
if (!rmdir(fnvb.buf) || errno == ENOENT || errno == ELOOP) continue;
- if (errno == ENOTEMPTY) {
+ if (errno == ENOTEMPTY || errno == EEXIST) {
debug(dbg_eachfiledetail, "removal_bulk `%s' was not empty, will try
again later",
fnvb.buf);
push_leftover(&leftover,namenode);
@@@ -363,7 -365,7 +365,7 @@@ static void removal_bulk_remove_leftove
debug(dbg_eachfiledetail, "removal_bulk removing `%s'", fnvb.buf);
if (!rmdir(fnvb.buf) || errno == ENOENT || errno == ELOOP) continue;
- if (errno == ENOTEMPTY) {
+ if (errno == ENOTEMPTY || errno == EEXIST) {
fprintf(stderr,
_("dpkg - warning: while removing %.250s, directory `%.250s'
not empty "
"so not removed.\n"),
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
