lp://staging/ubuntu/hardy-proposed/dpkg
- Get this branch:
- bzr branch lp://staging/ubuntu/hardy-proposed/dpkg
Branch merges
Branch information
Recent revisions
- 52. By Martin Pitt
-
scripts/
Dpkg/Changelog/ Debian. pm: Fix instantiation of
Dpkg::Changelog::Entry class. This fixes the changelog parser to not fail
when an unexpected changelog entry appears without the preceding heading
line. Thanks to Morten Kjeldgaard for the patch! (LP: #206790) - 51. By Soren Hansen
-
[ Stephan Hermann ]
* Re-Introduced the "Description" field in *_source.changes files, according
to Debian Policy.
This was removed during 1.14.16.6 upload and will be reintroduced in
1.14.17
Changes were taken from debians dpkg git Thx to Raphael Herzog for
pointing this out[ Soren Hansen ]
* Remove NO_PKG_MANGLE to re-enable building of dpkg ddeb's. - 50. By Soren Hansen
-
* Fix wrong call to open in Dpkg/Control.pm that makes using a different
control file than debian/control fail horribly.
* Pass NO_PKG_MANGLE environment variable to dh_strip to make this package
not ftbfs. When this is built, published and in the buildd's, we'll
reupload without this to regenerate dpkg-dbgsym and such. - 49. By Soren Hansen
-
[ Soren Hansen ]
* Merge from debian unstable, remaining changes:
- Add m_strdup to mlib.
- Use i686 for lpia in cputable and triplettable.
- Hack Dpkg::Arch to return i686 for lpia.
- tarfn.c:
+ Avoid freeing uninitialised h.{Link,}Name (can cause crash if .deb
becomes unreadable while we start up). (LP #138887)
+ Use m_malloc instead of malloc (and ditch ad-hoc error handling).Launchpad integration:
* Implement changelog-closes- bugs for Ubuntu (see
https://wiki.ubuntu. com/ClosingBugs FromChangelog).
* Add Launchpad-Bugs-Fixed to dpkg-genchanges too, to make it not
complain about unknown fields.DebianMaintain
erField:
* scripts/dpkg-source. pl: Check that debian/control complies to
https://wiki.ubuntu. com/DebianMaint ainerField: Refuse to build a source
package if we have an Ubuntu version number, but Maintainer: is not an
Ubuntu address. Output a warning if there is no XSBC-Original-Maintainer:
field for packages with an Ubuntu version number.
* scripts/dpkg-source. pl: Only fail to build the source package if $DEBEMAIL
contains 'ubuntu'. If not, only print a warning.
* debian/control: Change Maintainer/XSBC-Original- Maintainer field. Trigger support:
* Implement triggers as per
http://lists.debian. org/debian- dpkg/2007/ 04/msg00076. html (changes too
massive to enumerate here).
* Add "Breaks: apt (<< 0.7.6ubuntu6), aptitude (<< 0.4.6.1-1ubuntu2)", as
triggers add two extra states, which apt and aptitude before then do not
know about.
* An early version of trigger support caused LP #133172. To fix which
systems have had the broken version work we have to rename
triggers/Deferred to triggers/Unincorp. The error messages, comments,
etc. will be improved later.Status-fd changes:
* Changes to --status-fd and logging, motivated by the need to
fix apt's progress reporting in the presence of triggers (not introduced
in this version, but accidentally left out of previous merge's changelog
entry):
- Call log_action for trigger processing and configuration.
- Produce "processing:" output on --status-fd for start of
processing operations (from log_action).
- Consolidate clone-and-hack --status-fd output writing into
routine statusfd_send[v].
- Improve documentation of --status-fd output.
- Add log message at start of archivefiles() and packages()
(which will assist debugging).
- For upgrade, call log_message after printing to stderr,
as is done elsewhere.
- avoid closing fsys tarfile pipe twice even in normal
operation - normally EBADF but might sometimes close some other
desired fd and cause hideous doom. (LP #137191)
- avoid duplicate attempts to [f]close in obscure error
situations which might conceiveably close wrong fds
- cast &fd to void* when passing to push_cleanup cu_closefd
- fix parse.c:parsedb to use ehflag_normaltidy in a sane way
- when passing &fd to push_cleanup cu_closefd, make fd always static
In the longer term --status-fd output ought probably to be made
identical to the log output which is richer and more sanely
formatted.
* New with this merge: Added test case for Launchpad-Bugs-Fixed. [ Matthias Klose ]
* dpkg-buildpackage: Set a set of environment variables for setting
compiler and linker options, unless already set in the environment.
See https://wiki.ubuntu. com/DistCompile rFlags for the details. - 48. By Soren Hansen
-
* Merge from debian unstable, remaining changes:
- Add m_strdup to mlib.
- Use i686 for lpia in cputable and triplettable.
- Hack Dpkg::Arch to return i686 for lpia.
- tarfn.c:
+ Avoid freeing uninitialised h.{Link,}Name (can cause crash if .deb
becomes unreadable while we start up). (LP #138887)
+ Use m_malloc instead of malloc (and ditch ad-hoc error handling).Launchpad integration:
* Implement changelog-closes- bugs for Ubuntu (see
https://wiki.ubuntu. com/ClosingBugs FromChangelog).
* Add Launchpad-Bugs-Fixed to dpkg-genchanges too, to make it not
complain about unknown fields.DebianMaintain
erField:
* scripts/dpkg-source. pl: Check that debian/control complies to
https://wiki.ubuntu. com/DebianMaint ainerField: Refuse to build a source
package if we have an Ubuntu version number, but Maintainer: is not an
Ubuntu address. Output a warning if there is no XSBC-Original-Maintainer:
field for packages with an Ubuntu version number.
* scripts/dpkg-source. pl: Only fail to build the source package if $DEBEMAIL
contains 'ubuntu'. If not, only print a warning.
* debian/control: Change Maintainer/XSBC-Original- Maintainer field. Trigger support:
* Implement triggers as per
http://lists.debian. org/debian- dpkg/2007/ 04/msg00076. html (changes too
massive to enumerate here).
* Add "Breaks: apt (<< 0.7.6ubuntu6), aptitude (<< 0.4.6.1-1ubuntu2)", as
triggers add two extra states, which apt and aptitude before then do not
know about.
* An early version of trigger support caused LP #133172. To fix which
systems have had the broken version work we have to rename
triggers/Deferred to triggers/Unincorp. The error messages, comments,
etc. will be improved later.Status-fd changes:
* Changes to --status-fd and logging, motivated by the need to
fix apt's progress reporting in the presence of triggers (not introduced
in this version, but accidentally left out of previous merge's changelog
entry):
- Call log_action for trigger processing and configuration.
- Produce "processing:" output on --status-fd for start of
processing operations (from log_action).
- Consolidate clone-and-hack --status-fd output writing into
routine statusfd_send[v].
- Improve documentation of --status-fd output.
- Add log message at start of archivefiles() and packages()
(which will assist debugging).
- For upgrade, call log_message after printing to stderr,
as is done elsewhere.
- avoid closing fsys tarfile pipe twice even in normal
operation - normally EBADF but might sometimes close some other
desired fd and cause hideous doom. (LP #137191)
- avoid duplicate attempts to [f]close in obscure error
situations which might conceiveably close wrong fds
- cast &fd to void* when passing to push_cleanup cu_closefd
- fix parse.c:parsedb to use ehflag_normaltidy in a sane way
- when passing &fd to push_cleanup cu_closefd, make fd always static
In the longer term --status-fd output ought probably to be made
identical to the log output which is richer and more sanely
formatted. - 47. By Matthias Klose
-
* Cherry pick from current trunk:
- Fix dpkg-shlibdeps choosing bad symbols files when there are several
providing the same soname. LP: #177917. - 45. By Matthias Klose
-
* Cherry pick from current trunk:
- Included files in symbols files (via #include) do no more need to repeat
the header line. Closes: #455260
- scripts/Dpkg/Shlibs/ SymbolFile. pm (merge_symbols): Do not update
the deprecated version of a a symbol if it is already marked deprecated. - 44. By Soren Hansen
-
* Merge from debian unstable, remaining changes:
- Add m_strdup to mlib (part of the fix for Debian #379028).
- Use i686 for lpia in cputable and triplettable.
- Hack Dpkg::Arch to return i686 for lpiaLaunchpad integration:
* Implement changelog-closes- bugs for Ubuntu (see
https://wiki.ubuntu. com/ClosingBugs FromChangelog).
* Add Launchpad-Bugs-Fixed to dpkg-genchanges too, to make it not
complain about unknown fields.DebianMaintain
erField:
* scripts/dpkg-source. pl: Check that debian/control complies to
https://wiki.ubuntu. com/DebianMaint ainerField: Refuse to build a source
package if we have an Ubuntu version number, but Maintainer: is not an
Ubuntu address. Output a warning if there is no XSBC-Original-Maintainer:
field for packages with an Ubuntu version number.
* scripts/dpkg-source. pl: Only fail to build the source package if $DEBEMAIL
contains 'ubuntu'. If not, only print a warning.
* debian/control: Change Maintainer/XSBC-Original- Maintainer field. Trigger support:
* Implement triggers as per
http://lists.debian. org/debian- dpkg/2007/ 04/msg00076. html (changes too
massive to enumerate here).
* Add "Breaks: apt (<< 0.7.6ubuntu6), aptitude (<< 0.4.6.1-1ubuntu2)", as
triggers add two extra states, which apt and aptitude before then do not
know about.
* An early version of trigger support caused LP #133172. To fix which
systems have had the broken version work we have to rename
triggers/Deferred to triggers/Unincorp. The error messages, comments,
etc. will be improved later. - 43. By Ian Jackson
-
* Fix some portability problems revealed by compiler warnings:
- missing <dpkg.h> in tarfn.c, implicit declaration of m_malloc
- missing cast for %ld ohshite at info.c:98
- unused yyunput (missing %option nounput) in trigdeferred.l
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/ubuntu/lucid/dpkg