-
Committer:
Jelmer Vernooij
-
Date:
2012-12-13 17:50:09 UTC
-
mfrom:
(3930.5.43 unstable-2.6)
-
Revision ID:
jelmer@samba.org-20121213175009-4wzdecnu3q2l0pt2
* Merge from Debian. Remaining changes:
+ Drop build dependencies on python-{meliae,lzma,medusa}, which are
not in main.
+ Drop 06_new_zlib patch and add build-conflicts for newer versions of
zlib.
+ Adjust Vcs field in debian/control for Ubuntu
* Remove myself from uploaders.
* New upstream snapshot.
+ Now ships bzr-grep. Added relevant Replaces/Breaks/Provides.
+ Add 04_revert_ui_changes to work around test failures.
* Add autopkgtest header. Closes: #692680
* Fix 03_spurious_test_failure to not patch the same file twice, causing
dpkg-source -x to emit a warning.
* New upstream snapshot.
+ Reverts use of --no-tty when gpg signing commits.
Closes: #673484
* New upstream snapshot.
* Remove Jeff Bailey and Reinhard Tartler from uploaders.
* Update 03_spurious_test_failure: Disable two more flaky tests.
* New upstream snapshot.
+ Drop 04_serve_address patch, now applied upstream.
+ Fixes cloning from HTTP URLs using urllib. Closes: #666496
* Add 04_serve_address to cope with localhost lookup issues during the
testsuite on some buildds.
* New upstream snapshot.
+ Fixes acute accent marks in manual page. Closes: #458157
+ Documents launchpad plugin commands in manual page.
Closes: #452503
+ Fixes 'bzr help branches'. Closes: #664777
* Recommend python-gpgme in the bzr package. Closes: #663272
* New upstream snapshot.
* New zlib versions are slightly more efficient.
* Fix bzrlib.osutils.local_concurrency() when used on GNU/kFreeBSD
with Python's multiprocessing module available. Closes: #647690
* New upstream release.