-
Committer:
Bazaar Package Importer
-
Author(s):
Jelmer Vernooij, Jelmer Vernooij, James Westby, John Arbash Meinel, Steve Langasek
-
Date:
2010-02-13 01:16:00 UTC
-
mfrom:
(5.1.3 sid)
-
Revision ID:
james.westby@ubuntu.com-20100213011600-rk7qnk7damysiahs
Tags: 2.4
[ Jelmer Vernooij ]
* Switch section to vcs.
* Allow the directory service to work with older version of python-apt.
[ James Westby ]
* Correct typo that causes packages with .orig.tar.bz2 to fail to build.
* Also merge tags in merge-package.
* Adapt to the python-apt 0.8 API. Thanks to Julian Andres Klode.
(Closes: #572093)
* Fix merge-upstream with just a branch. (LP: #528273)
[ John Arbash Meinel ]
* Improve the changelog merge hook to be smarter when both sides change.
[ Steve Langasek ]
* Make merge-upstream --v3 unpack .tar.bz2 with the correct arguments.
(LP: #529900)