-
Committer:
Bazaar Package Importer
-
Author(s):
James Westby, Jelmer Vernooij, James Westby
-
Date:
2009-07-26 18:38:47 UTC
-
Revision ID:
james.westby@ubuntu.com-20090726183847-4qjh3ktbpc1jubzg
Tags: 2.2~ubuntu3
[ Jelmer Vernooij ]
* Automatically use merge mode if there's only a debian/ directory in
the packaging branch. Closes: #529816.
[ James Westby ]
* Merge merge-package command from Muharem Hrnjadovic to allow merging
another branch of the same package in a way that will avoid spurious
conflicts from divergent upstream histories. Thanks Muharem.
* Don't crash on merge-upstream due to API changes not being fully applied.
* Add plugin information as parsed by "bzr plugin-info".
* Improve the error when the upstream tag is missing during merge-upstream.
* Also query the config file for the revision to use in export-upstream
(LP: #415572)
* Don't populate the commit message editor with all lines added to
debian/changelog. Only use the stripped version of the "change" lines.
* Always use the date from debian/changelog during import-dsc. Thanks
Sveinung Kvilhaugsvik.
* pristine-tar errors are no longer fatal for building the package.
Thanks Muharem. (LP: #417153)
* Refuse to build a conflicted tree. Thanks Muharem. (LP: #381303)
* Don't crash if there are no deb-src lines when building. (LP: #375897)
* Make import-dsc work against redirected URIs. Thanks Muharem (LP: #337209)