diff -Nru bzr-2.5.0/debian/changelog bzr-2.5.0/debian/changelog --- bzr-2.5.0/debian/changelog 2012-02-25 15:37:18.000000000 +0000 +++ bzr-2.5.0/debian/changelog 2012-03-22 03:12:05.000000000 +0000 @@ -1,3 +1,24 @@ +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. + * Bump standards version to 3.9.3. + * Add 05_allow_no_slash_controldirs: Allow control directories to not + support creating branches with forward slashes in their name. + * Add basic test for autopkgtest. + + -- Jelmer Vernooij Tue, 06 Mar 2012 01:27:01 +0100 + bzr (2.5.0-1ubuntu1) precise; urgency=low * Merge from Debian. Remaining changes: diff -Nru bzr-2.5.0/debian/control bzr-2.5.0/debian/control --- bzr-2.5.0/debian/control 2012-02-25 15:54:04.000000000 +0000 +++ bzr-2.5.0/debian/control 2012-03-22 03:09:05.000000000 +0000 @@ -20,7 +20,7 @@ python-pycurl-dbg, python-subunit, python-testtools (>= 0.9.5~) -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 X-Python-Version: >= 2.6 Vcs-Bzr: https://code.launchpad.net/~bzr-core/ubuntu/oneiric/bzr/oneiric Homepage: http://bazaar-vcs.org diff -Nru bzr-2.5.0/debian/copyright bzr-2.5.0/debian/copyright --- bzr-2.5.0/debian/copyright 2012-02-24 11:23:31.000000000 +0000 +++ bzr-2.5.0/debian/copyright 2012-03-22 03:08:21.000000000 +0000 @@ -1,49 +1,59 @@ -Debianized by Norbert Tretkowski 2005-04-16 -New co-maintainer Jeff Bailey 2005-09-05 -New co-maintainer Rob Weir 2005-09-15 -New co-maintainer Andres Salomon 2006-01-24 -New co-maintainer Lars Wirzenius 2006-04-13 -New co-maintainer Adeodato Simó 2006-07-24 -New co-maintainer Wouter van Heyst 2007-01-17 -New co-maintainer Jelmer Vernooij 2008-05-02 -New co-maintainer John Francesco Ferlito - -And the project homepage is: - - - -Upstream authors (among others): - - | Martin Pool - | Robert Collins - | Aaron Bentley - | John Arbash Meinel - -Copyright and license terms: - - - The sources of Bazaar are: - - | Copyright (C) 2004, 2005, 2006, 2007 by Canonical Ltd - - | This program is free software; you can redistribute it and/or modify - | it under the terms of the GNU General Public License as published by - | the Free Software Foundation; either version 2 of the License, or - | (at your option) any later version. - | - | This program is distributed in the hope that it will be useful, - | but WITHOUT ANY WARRANTY; without even the implied warranty of - | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - | GNU General Public License for more details. - | - | You should have received a copy of the GNU General Public License - | along with this program; if not, write to the Free Software - | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - - On Debian systems, the full text of the GNU General Public License is available - in /usr/share/common-licenses/GPL-2. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: bzr +Upstream-Contact: Bazaar Developers +Source: https://launchpad.net/bzr/+download + +Files: debian/* +Copyright: Debian Bazaar Team +Comment: + Debianized by Norbert Tretkowski 2005-04-16 + New co-maintainer Jeff Bailey 2005-09-05 + New co-maintainer Rob Weir 2005-09-15 + New co-maintainer Andres Salomon 2006-01-24 + New co-maintainer Lars Wirzenius 2006-04-13 + New co-maintainer Adeodato Simó 2006-07-24 + New co-maintainer Wouter van Heyst 2007-01-17 + New co-maintainer Jelmer Vernooij 2008-05-02 + New co-maintainer John Francesco Ferlito + Robert Collins + Aaron Bentley + John Arbash Meinel +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + . + On Debian systems, the full text of the GNU General Public License is available + in /usr/share/common-licenses/GPL-2. diff -Nru bzr-2.5.0/debian/patches/05_allow_no_slash_controldirs bzr-2.5.0/debian/patches/05_allow_no_slash_controldirs --- bzr-2.5.0/debian/patches/05_allow_no_slash_controldirs 1970-01-01 00:00:00.000000000 +0000 +++ bzr-2.5.0/debian/patches/05_allow_no_slash_controldirs 2012-03-22 03:08:21.000000000 +0000 @@ -0,0 +1,41 @@ +Description: Allow creating branches with a slash in their name +Author: Jelmer Vernooij +Status: submitted upstream + +=== modified file 'bzrlib/tests/per_controldir_colo/test_supported.py' +--- a/bzrlib/tests/per_controldir_colo/test_supported.py 2012-02-19 14:34:22 +0000 ++++ b/bzrlib/tests/per_controldir_colo/test_supported.py 2012-03-05 23:34:55 +0000 +@@ -137,7 +137,11 @@ + + def test_branch_name_with_slash(self): + repo = self.make_repository('branch-1') +- target_branch = repo.bzrdir.create_branch(name='foo/bar') ++ try: ++ target_branch = repo.bzrdir.create_branch(name='foo/bar') ++ except errors.InvalidBranchName: ++ raise tests.TestNotApplicable( ++ "format does not support branches with / in their name") + self.assertEqual(['foo/bar'], repo.bzrdir.get_branches().keys()) + self.assertEqual( + target_branch.base, repo.bzrdir.open_branch(name='foo/bar').base) + +=== modified file 'bzrlib/errors.py' +--- a/bzrlib/errors.py 2012-02-02 12:10:04 +0000 ++++ b/bzrlib/errors.py 2012-03-05 23:50:00 +0000 +@@ -710,6 +710,15 @@ + _fmt = 'Already a branch: "%(path)s".' + + ++class InvalidBranchName(PathError): ++ ++ _fmt = "Invalid branch name: %(name)s" ++ ++ def __init__(self, name): ++ BzrError.__init__(self) ++ self.name = name ++ ++ + class ParentBranchExists(AlreadyBranchError): + + _fmt = 'Parent branch already exists: "%(path)s".' + diff -Nru bzr-2.5.0/debian/patches/series bzr-2.5.0/debian/patches/series --- bzr-2.5.0/debian/patches/series 2012-02-25 15:14:23.000000000 +0000 +++ bzr-2.5.0/debian/patches/series 2012-03-22 03:10:10.000000000 +0000 @@ -1,3 +1,4 @@ 01_selftest_package 02_external_configobj 03_spurious_test_failure +05_allow_no_slash_controldirs diff -Nru bzr-2.5.0/debian/tests/control bzr-2.5.0/debian/tests/control --- bzr-2.5.0/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ bzr-2.5.0/debian/tests/control 2012-03-22 03:08:21.000000000 +0000 @@ -0,0 +1,3 @@ +Tests: testsuite +Depends: bzr, python-bzrlib.tests +Features: no-build-needed diff -Nru bzr-2.5.0/debian/tests/testsuite bzr-2.5.0/debian/tests/testsuite --- bzr-2.5.0/debian/tests/testsuite 1970-01-01 00:00:00.000000000 +0000 +++ bzr-2.5.0/debian/tests/testsuite 2012-03-22 03:08:21.000000000 +0000 @@ -0,0 +1,2 @@ +#!/bin/sh +bzr selftest -v --parallel=fork --no-plugins