diff -Nru bzr-2.6.0~bzr6571/debian/changelog bzr-2.6.0~bzr6571/debian/changelog --- bzr-2.6.0~bzr6571/debian/changelog 2013-01-18 18:41:35.000000000 -0500 +++ bzr-2.6.0~bzr6571/debian/changelog 2013-01-18 19:07:28.000000000 -0500 @@ -1,3 +1,14 @@ +bzr (2.6.0~bzr6571-4ubuntu1) raring; urgency=low + + * Merge from Debian experimental. Remaining Ubuntu changes: + - Drop build dependencies on python-{meliae,lzma,medusa}, + which are not in main. + - Adjust Vcs field in debian/control for Ubuntu. + * Drop 04_apport_bytesio and 05_tcp_serve_localhost, they are + not used in Debian and it seems to build fine without them. + + -- Andrew Starr-Bochicchio Mon, 07 Jan 2013 20:02:12 -0500 + bzr (2.6.0~bzr6571-4) experimental; urgency=low * debian/tests/control: Add python-subunit to autopkgtest @@ -26,6 +37,23 @@ -- Andrew Starr-Bochicchio Sun, 06 Jan 2013 19:20:39 -0500 +bzr (2.6.0~bzr6571-1ubuntu2) raring; urgency=low + + * Add python-subunit test dependency. (LP: #1101206) + + -- Martin Pitt Fri, 18 Jan 2013 17:56:00 +0100 + +bzr (2.6.0~bzr6571-1ubuntu1) raring; urgency=low + + * 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 + + -- Jelmer Vernooij Thu, 13 Dec 2012 18:49:21 +0100 + bzr (2.6.0~bzr6571-1) experimental; urgency=low [ Jelmer Vernooij ] @@ -87,6 +115,66 @@ -- Jelmer Vernooij Mon, 19 Mar 2012 03:05:46 +0100 +bzr (2.6.0~beta2-0ubuntu3) raring; urgency=low + + * debian/patches/07_fix_ftbfs_on_doc.patch: + - Fixed a syntax error in ``doc/ja/user-guide/http_smart_server.txt`` that + causes breakage with docutils 0.9.1. + (Thanks to Vincent Ladeuil, Jelmer Vernooij, LP: #1066307) + + -- Didier Roche Thu, 22 Nov 2012 15:41:45 +0100 + +bzr (2.6.0~beta2-0ubuntu2) raring; urgency=low + + * debian/patches/06_set_bzrtip_revid_for_propose.patch: + - set bzr proposed branch tip revid as reviewed_id for bzr lp-propose + --approve (LP: #1082032) + + -- Didier Roche Thu, 22 Nov 2012 15:21:51 +0100 + +bzr (2.6.0~beta2-0ubuntu1) quantal; urgency=low + + * 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. + + -- Jelmer Vernooij Wed, 11 Jul 2012 12:58:34 +0200 + +bzr (2.6.0~beta1-0ubuntu2) quantal; urgency=low + + * Revert use of --no-tty. LP: #1014570 + + -- Jelmer Vernooij Fri, 29 Jun 2012 11:17:51 +0200 + +bzr (2.6.0~beta1-0ubuntu1) quantal; urgency=low + + * New upstream release. + + Fixes handling of colocated branches in `bzr rmbranch`. LP: #920653 + + rmbranch now refuses to remove active branch. LP: #922953 + + Connecting with HTTPS via HTTP correctly uses host name of destination + rather than that of proxy. LP: #944696 + + No longer requires tty when GPG signing commits. LP: #847388 + + Fixes unicode erorrs when translated progress task messages + contain non-ascii text. LP: #966934 + + Fixes display of help for configuration options that overlap + with other topics. LP: #941672 + + Drop 06_spurious_test_failure: applied upstream. LP: #874153 + + Drop 05_allow_no_slash_controldirs: applied upstream. + * Drop unnecessary build conflicts with zlib. + + -- Jelmer Vernooij Fri, 08 Jun 2012 12:59:27 +0200 + bzr (2.5.0+bzr6492-1) unstable; urgency=low * Recommend python-gpgme in the bzr package. Closes: #663272 @@ -94,6 +182,26 @@ -- Jelmer Vernooij Mon, 19 Mar 2012 02:38:36 +0100 +bzr (2.5.0-2ubuntu2) precise; urgency=low + + * Add 06_spurious_test_failure: mark flapping test as known + failing if it fails. + * Update Vcs-Bzr field to refer to precise rather than oneiric + location. + + -- Jelmer Vernooij Wed, 04 Apr 2012 02:09:24 +0200 + +bzr (2.5.0-2ubuntu1) precise; urgency=low + + * 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 + + -- Scott Kitterman Wed, 21 Mar 2012 23:10:53 -0400 + bzr (2.5.0-2) unstable; urgency=low * Use parseable format for copyright file. @@ -104,6 +212,16 @@ -- Jelmer Vernooij Tue, 06 Mar 2012 01:27:01 +0100 +bzr (2.5.0-1ubuntu1) precise; urgency=low + + * 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. + + -- Jelmer Vernooij Sat, 25 Feb 2012 16:13:22 +0100 + bzr (2.5.0-1) unstable; urgency=low * New upstream release. @@ -114,6 +232,14 @@ -- Jelmer Vernooij Fri, 24 Feb 2012 18:13:29 +0100 +bzr (2.5.0~bzr6473-1ubuntu1) precise; urgency=low + + * Merge from Debian. Remaining changes: + + Drop build dependencies on python-{meliae,lzma,medusa}, which are + not in main. + + -- Jelmer Vernooij Mon, 23 Jan 2012 13:42:55 +0100 + bzr (2.5.0~bzr6473-1) unstable; urgency=low * New upstream snapshot. @@ -138,6 +264,14 @@ -- Jelmer Vernooij Tue, 24 Jan 2012 23:43:36 +0100 +bzr (2.5.0~beta5-3ubuntu1) precise; urgency=low + + * Merge from Debian. Remaining changes: + + Drop build dependencies on python-{meliae,lzma,medusa}, which are + not in main. + + -- Jelmer Vernooij Mon, 23 Jan 2012 13:42:55 +0100 + bzr (2.5.0~beta5-3) unstable; urgency=low * Use CommitBuilder.get_basis_delta() in commit builder tests @@ -145,12 +279,28 @@ -- Jelmer Vernooij Sun, 22 Jan 2012 20:35:57 +0100 +bzr (2.5.0~beta5-2ubuntu1) precise; urgency=low + + * Merge from Debian. Remaining changes: + + Drop build dependencies on python-{meliae,lzma,medusa}, which are + not in main. + + -- Jelmer Vernooij Fri, 20 Jan 2012 19:19:52 +0100 + bzr (2.5.0~beta5-2) unstable; urgency=low * Add patch to use empty string for default colocated branch name. -- Jelmer Vernooij Fri, 20 Jan 2012 18:00:20 +0100 +bzr (2.5.0~beta5-1ubuntu1) precise; urgency=low + + * Merge from Debian. Remaining changes: + + Drop build dependencies on python-{meliae,lzma,medusa}, which are + not in main. + + -- Jelmer Vernooij Mon, 16 Jan 2012 20:04:45 +0100 + bzr (2.5.0~beta5-1) unstable; urgency=low * New upstream release.. @@ -170,12 +320,34 @@ -- Jelmer Vernooij Thu, 08 Dec 2011 14:22:35 +0100 +bzr (2.5.0~beta4-1ubuntu1) precise; urgency=low + + * Merge from Debian. Remaining changes: + + Drop build dependencies on python-{meliae,lzma,medusa}, which are + not in main. + + -- Jelmer Vernooij Thu, 08 Dec 2011 13:21:44 +0100 + bzr (2.5.0~beta4-1) unstable; urgency=low * New upstream release. -- Jelmer Vernooij Thu, 08 Dec 2011 12:24:34 +0100 +bzr (2.5.0~beta3-2ubuntu2) precise; urgency=low + + * Drop python-gpgme-dbg from build-depends, since it is not in main. + + -- Jelmer Vernooij Tue, 29 Nov 2011 18:50:24 +0100 + +bzr (2.5.0~beta3-2ubuntu1) precise; urgency=low + + * Merge from Debian. Remaining changes: + + Drop build dependencies on python-{meliae,lzma,medusa}, which are + not in main. + + -- Jelmer Vernooij Thu, 10 Nov 2011 16:02:01 +0100 + bzr (2.5.0~beta3-2) experimental; urgency=low * Build-depend on python-paramiko, python-pycurl and python-gpgme for use in @@ -186,6 +358,15 @@ -- Jelmer Vernooij Fri, 11 Nov 2011 18:11:58 +0100 +bzr (2.5.0~beta3-1ubuntu1) precise; urgency=low + + * Merge from Debian. Remaining changes: + + Drop build dependencies on python-{subunit,meliae,lzma,medusa}, which are + not in main. + + Disable support for running selftest in parallel (requires subunit). + + -- Jelmer Vernooij Thu, 10 Nov 2011 16:02:01 +0100 + bzr (2.5.0~beta3-1) experimental; urgency=low * New upstream release. @@ -205,6 +386,21 @@ -- Jelmer Vernooij Fri, 04 Nov 2011 23:32:32 +0100 +bzr (2.5.0~beta2-0ubuntu1) precise; urgency=low + + * New upstream release. + + Fixes compatibility with cython 0.15. LP: #837221 + + Fixes handling of timestamps in diffs for absent files in working tree. + LP: #847435 + + Fixes overflow error in dirstate when dealing with large files. + LP: #683191 + * Merge from Debian. Remaining changes: + + Drop build dependencies on python-{subunit,meliae,lzma,medusa}, which are + not in main. + + Disable support for running selftest in parallel (requires subunit). + + -- Jelmer Vernooij Fri, 04 Nov 2011 22:55:11 +0100 + bzr (2.5.0~beta1-2) experimental; urgency=low * Add Build-Conflicts to python-gpgme, to work around test suite @@ -233,6 +429,15 @@ -- Jelmer Vernooij Fri, 04 Nov 2011 23:16:04 +0100 +bzr (2.4.1-1ubuntu1) oneiric; urgency=low + + * Merge from Debian. Remaining changes: + + Drop build dependencies on python-{subunit,meliae,lzma,medusa}, which are + not in main. + + Disable support for running selftest in parallel (requires subunit). + + -- Jelmer Vernooij Tue, 13 Sep 2011 15:39:19 +0200 + bzr (2.4.1-1) unstable; urgency=low * New upstream release. @@ -240,6 +445,15 @@ -- Jelmer Vernooij Tue, 13 Sep 2011 14:23:54 +0200 +bzr (2.4.0-3ubuntu1) oneiric; urgency=low + + * Merge from Debian. Remaining changes: + + Drop build dependencies on python-{subunit,meliae,lzma,medusa}, which are + not in main. + + Disable support for running selftest in parallel (requires subunit). + + -- Jelmer Vernooij Wed, 31 Aug 2011 17:08:56 +0200 + bzr (2.4.0-3) unstable; urgency=medium * Fix regression in open_write_stream, which breaks the bzr-builddeb @@ -263,12 +477,40 @@ -- Jelmer Vernooij Sat, 13 Aug 2011 21:57:09 +0200 +bzr (2.4.0-0ubuntu2) oneiric; urgency=low + + * Add support for older versions of python-testtools. + + -- Jelmer Vernooij Mon, 15 Aug 2011 00:15:08 +0200 + +bzr (2.4.0-0ubuntu1) oneiric; urgency=low + + * New upstream release. + + Fixes version number in deprecation warnings. LP: #794960 + + Fixes some spelling mistakes in manual page. LP: #814311 + + Prevents taking file system locks in read only transactions. + LP: #786980 + + Fix support for configuration files containing UTF-8 data. + LP: #688677 + + -- Jelmer Vernooij Sun, 14 Aug 2011 02:35:33 +0200 + bzr (2.4.0~beta5-3) unstable; urgency=low * Fix compatibility with Python 2.7. -- Jelmer Vernooij Tue, 19 Jul 2011 00:14:35 +0200 +bzr (2.4.0~beta5-2ubuntu1) oneiric; urgency=low + + * Merge from Debian. Remaining changes: + + Drop build dependencies on python-{subunit,meliae,lzma,medusa}, which are + not in main. + + Disable support for running selftest in parallel (requires subunit). + * Fix compatibility with newer versions of Python 2.7. LP: #809048 + + -- Jelmer Vernooij Thu, 14 Jul 2011 18:18:11 +0200 + bzr (2.4.0~beta5-2) unstable; urgency=low * Support all i18n-related environment variables not being set. @@ -288,6 +530,21 @@ -- Jelmer Vernooij Thu, 14 Jul 2011 15:35:42 +0200 +bzr (2.4.0~beta4-4ubuntu2) oneiric; urgency=low + + * Fix FTBFS: build without --parallel. + + -- Jelmer Vernooij Thu, 23 Jun 2011 11:45:29 +0200 + +bzr (2.4.0~beta4-4ubuntu1) oneiric; urgency=low + + * Merge from Debian. Remaining changes: + + Drop build dependencies on python-{subunit,meliae,lzma,medusa}, which are + not in main. + + Disable support for running selftest in parallel (requires subunit). + + -- Jelmer Vernooij Thu, 23 Jun 2011 10:57:10 +0200 + bzr (2.4.0~beta4-4) unstable; urgency=low * Add 09_utf8_config_files. @@ -310,6 +567,12 @@ -- Jelmer Vernooij Fri, 17 Jun 2011 16:10:52 +0200 +bzr (2.4.0~beta4-1ubuntu1) oneiric; urgency=low + + * Merge from Debian. + + -- Jelmer Vernooij Fri, 17 Jun 2011 12:30:59 +0200 + bzr (2.4.0~beta4-1) unstable; urgency=low * New upstream release. @@ -346,6 +609,15 @@ -- Jelmer Vernooij Sun, 01 May 2011 01:52:14 +0200 +bzr (2.4.0~beta2-2ubuntu1) oneiric; urgency=low + + * Merge from Debian experimental. + + Remove build dependencies not present in main: python-medusa, + python-subunit, python-meliae, python-lzma. + + Disable parallel testing. + + -- Jelmer Vernooij Sat, 30 Apr 2011 16:20:58 +0200 + bzr (2.4.0~beta2-2) experimental; urgency=low * Fix locale setting during TestExceptionReporting.test_undecodable_argv. @@ -404,6 +676,13 @@ -- Jelmer Vernooij Sun, 13 Mar 2011 15:08:21 +0100 +bzr (2.3.0-7) unstable; urgency=low + + * Switch to dh_python2. + * Switch to debhelper 7, drop cdbs. + + -- Jelmer Vernooij Mon, 07 Mar 2011 12:02:02 +0100 + bzr (2.3.0-6) unstable; urgency=low * Support running the test suite in parallel. diff -Nru bzr-2.6.0~bzr6571/debian/control bzr-2.6.0~bzr6571/debian/control --- bzr-2.6.0~bzr6571/debian/control 2013-01-06 18:48:42.000000000 -0500 +++ bzr-2.6.0~bzr6571/debian/control 2013-01-17 09:49:10.000000000 -0500 @@ -1,7 +1,8 @@ Source: bzr Section: vcs Priority: optional -Maintainer: Debian Bazaar Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Bazaar Maintainers Uploaders: Wouter van Heyst , Andrew Starr-Bochicchio Build-Conflicts: python-gpgme @@ -14,9 +15,6 @@ python-all-dev (>= 2.6.6-3), python-configobj (>= 4.7.2+ds-2), python-docutils, - python-lzma-dbg, - python-medusa, - python-meliae-dbg, python-paramiko, python-pycurl-dbg, python-sphinx (>= 1.0.7+dfsg), @@ -24,8 +22,7 @@ python-testtools (>= 0.9.5~) Standards-Version: 3.9.3 X-Python-Version: >= 2.6 -Vcs-Bzr: http://bzr.debian.org/bzr/pkg-bazaar/bzr/2.6 -Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-bazaar/bzr/2.6 +Vcs-Bzr: https://code.launchpad.net/ubuntu/+source/bzr Homepage: http://bazaar-vcs.org Dm-Upload-Allowed: yes XS-Testsuite: autopkgtest