lp:~vexo/bzr/upstream

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

2 recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3991. By Reagan Sanders on 2013-08-26

Fixed patches.

3990. By Reagan Sanders on 2013-08-26

Fixed patches.

3989. By Reagan Sanders on 2013-08-26

Merged 2.6.

3988. By Jelmer Vernooij on 2012-12-13

releasing version 2.6.0~bzr6571-1ubuntu1

3987. By Jelmer Vernooij on 2012-12-13

* 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.

3986. By Jelmer Vernooij on 2012-12-13

Merging shared upstream rev into target branch.

3985. By Didier Roche-Tolomelli on 2012-12-13

Releasing 2.6.0~beta2-0ubuntu3

3984. By Didier Roche-Tolomelli on 2012-12-13

Releasing 2.6.0~beta2-0ubuntu2.

3983. By Jelmer Vernooij on 2012-07-11

releasing version 2.6.0~beta2-0ubuntu1

3982. By Jelmer Vernooij on 2012-07-11

* New upstream release.
 + Make lazy imports proxy by default so that concurrent resolution is
   robust. LP: #593536
 + Crash report squashes errors when formatting plugin list.
   LP: #488766
 + Launchpad plugin subcommands are now documented in the
   manual page. LP: #843801
 + New shortcut 'co:' for referring to colocated branches. LP: #833665
 + bzr missing will now show revision tags. LP: #559072
 + BZR_REMOTE_PATH is now documented in the manual page. LP: #197618
 + Prevent erroneous writing of branch configuration. LP: #948339
 + New --overwrite-tags option for push and pull. LP: #681792
 + Support readline() when streaming files over HTTP. LP: #963769
* Drop no-tty reversion patch; now included upstream.