diff -Nru bzr-pipeline-1.4/NEWS bzr-pipeline-1.5/NEWS --- bzr-pipeline-1.4/NEWS 2012-01-20 01:10:21.000000000 +0000 +++ bzr-pipeline-1.5/NEWS 2014-01-28 04:09:48.000000000 +0000 @@ -2,6 +2,10 @@ Pipeline Release Notes ###################### +Release 1.5 "Funky Fixture" (2014-01-27) +######################################## +Indicate compatibility with bzr 2.6 + Release 1.4 "Energetic Elbow" (2012-01-19) ############################################# Fix store command to not prompt. diff -Nru bzr-pipeline-1.4/__init__.py bzr-pipeline-1.5/__init__.py --- bzr-pipeline-1.4/__init__.py 2012-01-20 01:10:21.000000000 +0000 +++ bzr-pipeline-1.5/__init__.py 2014-01-28 04:09:48.000000000 +0000 @@ -19,11 +19,11 @@ from bzrlib.trace import warning -__version__ = '1.4' -version_info = (1, 4, 0) +__version__ = '1.5' +version_info = (1, 5, 0) minimum_bzrlib_version = (2, 2) -maximum_bzrlib_version = (2, 5) +maximum_bzrlib_version = (2, 6) TOO_OLD = 'too_old' diff -Nru bzr-pipeline-1.4/debian/changelog bzr-pipeline-1.5/debian/changelog --- bzr-pipeline-1.4/debian/changelog 2013-08-08 01:58:32.000000000 +0000 +++ bzr-pipeline-1.5/debian/changelog 2014-01-28 18:57:29.000000000 +0000 @@ -1,3 +1,13 @@ +bzr-pipeline (1.5-1) unstable; urgency=medium + + * New upstream release. + * Drop bzr2.6compat.diff, applied upstream. + * Bump Standards-Version to 3.9.5, no changes needed. + * Point to version specific copy of the GPL-2 in debian/copyright + instead of the symlink. + + -- Andrew Starr-Bochicchio Tue, 28 Jan 2014 13:57:26 -0500 + bzr-pipeline (1.4-7) unstable; urgency=low * debian/patches/bzr2.6compat.diff: Mark compatible with diff -Nru bzr-pipeline-1.4/debian/control bzr-pipeline-1.5/debian/control --- bzr-pipeline-1.4/debian/control 2013-08-04 19:20:12.000000000 +0000 +++ bzr-pipeline-1.5/debian/control 2014-01-28 18:47:48.000000000 +0000 @@ -12,7 +12,7 @@ python-bzrlib.tests, python-subunit Build-Depends-Indep: python-testtools -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 X-Python-Version: >= 2.5 Vcs-Bzr: http://anonscm.debian.org/bzr/pkg-bazaar/bzr-pipeline/unstable Vcs-Browser: http://anonscm.debian.org/loggerhead/pkg-bazaar/bzr-pipeline/unstable diff -Nru bzr-pipeline-1.4/debian/copyright bzr-pipeline-1.5/debian/copyright --- bzr-pipeline-1.4/debian/copyright 2013-05-23 17:01:37.000000000 +0000 +++ bzr-pipeline-1.5/debian/copyright 2014-01-28 18:55:19.000000000 +0000 @@ -12,7 +12,8 @@ /usr/share/common-licenses/GPL-2 Files: debian/* -Copyright: 2010 Jelmer Vernooij +Copyright: 2010 Jelmer Vernooij , + 2013-2014 Andrew Starr-Bochicchio License: GPL-2+ License: GPL-2+ @@ -27,6 +28,6 @@ GNU General Public License for more details. . You should have received a copy of the GNU General Public License with - the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL; + the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. diff -Nru bzr-pipeline-1.4/debian/patches/bzr2.6compat.diff bzr-pipeline-1.5/debian/patches/bzr2.6compat.diff --- bzr-pipeline-1.4/debian/patches/bzr2.6compat.diff 2013-08-08 01:58:11.000000000 +0000 +++ bzr-pipeline-1.5/debian/patches/bzr2.6compat.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -Description: Mark as compatible with bzr 2.6 -Origin: commit, revision id: a.starr.b@gmail.com-20130808014505-5sjyyxdi24p9jgvk -Author: Andrew Starr-Bochicchio -Last-Update: 2013-08-08 -Applied-Upstream: no -X-Bzr-Revision-Id: a.starr.b@gmail.com-20130808014505-5sjyyxdi24p9jgvk -Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718870 - -=== modified file '__init__.py' ---- old/__init__.py 2012-01-20 01:09:36 +0000 -+++ new/__init__.py 2013-08-08 01:45:05 +0000 -@@ -23,7 +23,7 @@ - version_info = (1, 4, 0) - - minimum_bzrlib_version = (2, 2) --maximum_bzrlib_version = (2, 5) -+maximum_bzrlib_version = (2, 6) - - - TOO_OLD = 'too_old' - diff -Nru bzr-pipeline-1.4/debian/patches/series bzr-pipeline-1.5/debian/patches/series --- bzr-pipeline-1.4/debian/patches/series 2013-08-08 01:47:30.000000000 +0000 +++ bzr-pipeline-1.5/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -bzr2.6compat.diff diff -Nru bzr-pipeline-1.4/setup.py bzr-pipeline-1.5/setup.py --- bzr-pipeline-1.4/setup.py 2012-01-20 01:10:21.000000000 +0000 +++ bzr-pipeline-1.5/setup.py 2014-01-28 04:09:48.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/env python from distutils.core import setup setup(name="BzrPipeline", - version="1.4", + version="1.5", description="Bazaar plugin for working with a sequence of branches.", author="Aaron Bentley", author_email="aaron@aaronbentley.com",