debian/0000755000000000000000000000000012143547540007173 5ustar debian/rules0000755000000000000000000000063712143547034010257 0ustar #!/usr/bin/make -f %: dh --with python2 --buildsystem=python_distutils $* ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) CONCURRENCY = BZR_CONCURRENCY=$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) endif ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) override_dh_auto_test: $(CONCURRENCY) BZR_PLUGINS_AT=loom@$(CURDIR) /usr/bin/bzr selftest -s bp.loom \ -v --parallel=fork endif debian/bzr-builddeb.conf0000644000000000000000000000022512143547034012404 0ustar [BUILDDEB] export-upstream-revision = tag:bzr-loom-$UPSTREAM_VERSION upstream-branch = lp:bzr-loom [HOOKS] merge-upstream = ./debian/update-deps.py debian/copyright0000644000000000000000000000447512143547034011136 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: bzr-loom Upstream-Contact: Bazaar Developers Debianized-By: Jelmer Vernooij Debianized-Date: Sa 14. Jun 17:41:27 CEST 2008 Source: http://launchpad.net/bzr-loom Files: * Comment: Upstream authors: Robert Collins Scott James Remnant Aaron Bentley Rob Weir Copyright: 2005, 2006, 2007, 2008 Canonical Ltd 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 with 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. . On Debian systems, the full text of the GPL version 2 can be found in /usr/share/common-licenses/GPL-2 Files: debian/* Copyright: 2008-2012 Jelmer Vernooij 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 with 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. . On Debian systems, the full text of the GPL version 2 can be found in /usr/share/common-licenses/GPL-2 debian/changelog0000644000000000000000000001302612143547517011053 0ustar bzr-loom (2.2.0-5) unstable; urgency=low * Upload to unstable. * Use anonscm.debian.org in the Vcs fields. -- Andrew Starr-Bochicchio Sat, 11 May 2013 19:07:55 -0400 bzr-loom (2.2.0-4) experimental; urgency=low * debian/tests/control: Tests depend on python-subunit. * debian/control: Bump Standards-Version to 3.9.4 -- Andrew Starr-Bochicchio Mon, 28 Jan 2013 20:05:36 -0500 bzr-loom (2.2.0-3) experimental; urgency=low * Re-add pkg-bazaar to maintainer field and myself to uploades. * debian/control: Add XS-Testsuite header in source stanza. (Closes: #692656) * debian/patches/BzrBranch5.patch: BzrBranch5 has moved in bzr 2.5 (Closes: #695215). * debian/patches/root_inventory.patch: Adjust for another API change in bzr 2.5. -- Andrew Starr-Bochicchio Mon, 10 Dec 2012 13:23:04 -0500 bzr-loom (2.2.0-2) unstable; urgency=low * Use machine-parseable copyright file format. * Bump standards version to 3.9.3 (no changes). * Orphan package. -- Jelmer Vernooij Sun, 01 Apr 2012 16:26:31 +0200 bzr-loom (2.2.0-1) unstable; urgency=low * Add script for automatically updating dependencies on merge. * New upstream release. + Fixes compatibility with newer versions of bzr. LP: #924521 -- Jelmer Vernooij Sun, 26 Feb 2012 17:51:52 +0100 bzr-loom (2.1+bzr151-1) unstable; urgency=low * New upstream snapshot. * Add autopkgtest tests. -- Jelmer Vernooij Sun, 26 Feb 2012 17:09:55 +0100 bzr-loom (2.1+bzr150-1) unstable; urgency=low * New upstream snapshot. -- Jelmer Vernooij Wed, 08 Feb 2012 12:13:10 +0100 bzr-loom (2.1+bzr148-1) unstable; urgency=low [ Max Bowsher ] * New upstream snapshot. * Drop 01_fix_record_entry_contents, merged upstream. [ Jelmer Vernooij ] * New upstream snapshot. + Fixes compatibility with newer versions of bzr. Closes: #652776 -- Jelmer Vernooij Tue, 20 Dec 2011 16:26:03 +0100 bzr-loom (2.1+bzr139-1) unstable; urgency=low * New upstream snapshot. * Add 01_fix_record_entry_contents. Closes: #634428 -- Jelmer Vernooij Tue, 19 Jul 2011 12:24:29 +0200 bzr-loom (2.1+bzr132-2) unstable; urgency=low * Re-arrange | condition in build deps to make sbuild happy. * Bump standards version to 3.9.2 (no changes). -- Jelmer Vernooij Fri, 06 May 2011 03:31:26 +0200 bzr-loom (2.1+bzr132-1) unstable; urgency=low * Switch to dh_python2. Closes: #616761 * New upstream snapshot. * Switch to debhelper 7, drop cdbs. * Add build dependency on python-bzrlib.tests, required for compatibility with newer versions of Bazaar. -- Jelmer Vernooij Sun, 01 May 2011 04:36:13 +0200 bzr-loom (2.1+bzr130-1) unstable; urgency=low * New upstream snapshot. * Support running the test suite in parallel. -- Jelmer Vernooij Sun, 27 Feb 2011 23:03:52 +0100 bzr-loom (2.1+bzr127-1) unstable; urgency=low * New upstream snapshot. * Run the testsuite. * Bump standards version to 3.9.1 (no changes). * Add myself to uploaders. -- Jelmer Vernooij Fri, 14 Jan 2011 20:00:50 +0100 bzr-loom (2.1-1) unstable; urgency=low [ Andrew Starr-Bochicchio ] * New upstream release. (Closes: #547756) * debian/copyright: Point to GPL-2 not versionless symlink. * debian/control: - Bump Standards-Version to 3.8.4, no changes needed. - Add Vcs-Browser field and fix Vcs-Bzr field. - Add myself to Uploaders field. (Closes: #534760) - Drop un-needed python-dev Build-Dep. * debian/rules: - Install NEWS file as upstream changelog. - Install README to docs. - Remove custom get-orig-source target. * debian/watch: Upstream now releases tarballs. * Convert to DebSrc format 3.0 (quilt). [ Jelmer Vernooij ] * Remove myself from uploaders. -- Andrew Starr-Bochicchio Sat, 24 Apr 2010 00:05:28 -0400 bzr-loom (1.4.0~bzr97-1) unstable; urgency=low * New upstream snapshot. + Fixes compatibility with recent versions of bzr. (Closes: #532947) * Bump standards version to 3.8.2. -- Jelmer Vernooij Sat, 27 Jun 2009 01:36:16 +0200 bzr-loom (1.4.0~bzr95-1) unstable; urgency=low * Move to section vcs. * Bump standards version to 3.8.1. * New upstream snapshot. -- Jelmer Vernooij Tue, 05 May 2009 17:29:03 +0200 bzr-loom (1.4.0~bzr93-2) unstable; urgency=low * Fix minimum version dependency on Bazaar. (Closes: #518095) * Add get-orig-source rule. (Closes: #518097) -- Jelmer Vernooij Thu, 05 Mar 2009 14:15:36 +0100 bzr-loom (1.4.0~bzr93-1) unstable; urgency=low * New upstream snapshot. * Add dummy watch file explaining how to export bzr revisions. -- Jelmer Vernooij Wed, 18 Feb 2009 19:45:30 +0100 bzr-loom (1.4.0~bzr91-1) experimental; urgency=low * New upstream snapshot. + Fixes status command for newer versions of bzr. -- Jelmer Vernooij Fri, 16 Jan 2009 14:16:49 +0100 bzr-loom (1.4.0~bzr90-1) experimental; urgency=low * New upstream snapshot. -- Jelmer Vernooij Tue, 13 Jan 2009 17:06:01 +0100 bzr-loom (1.4.0~bzr87-1) unstable; urgency=low * New upstream snapshot. -- Jelmer Vernooij Fri, 07 Nov 2008 16:11:37 +0100 bzr-loom (1.4.0~bzr84-1) unstable; urgency=low * Initial release. (Closes: #486242) -- Jelmer Vernooij Sat, 14 Jun 2008 18:38:17 +0200 debian/update-deps.py0000755000000000000000000000257012143547034011765 0ustar #!/usr/bin/python # Update dependencies based on version.py # Copyright (C) 2012 Jelmer Vernooij # Licensed under the GNU GPL, version 2 or later. from debian.deb822 import Deb822, PkgRelation import os, sys sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) from version import bzr_minimum_version, bzr_maximum_version def update_relation(l, pkg, kind, version): found = False for pr in l: if len(pr) != 1: # only update simple build deps continue e = pr[0] if e["name"] == pkg and e["version"] and e["version"][0] == kind: e["version"] = (kind, version) found = True if not found: l.append([{"version": (kind, version), "name": pkg, "arch": None}]) f = open('debian/control', 'r') source = Deb822(f) def update_deps(control, field): bdi = PkgRelation.parse_relations(control[field]) update_relation(bdi, "python-bzrlib", ">=", "%d.%d~" % bzr_minimum_version[:2]) if bzr_maximum_version is not None: update_relation(bdi, "python-bzrlib", "<<", "%d.%d.0" % (bzr_maximum_version[0], bzr_maximum_version[1]+1)) control[field] = PkgRelation.str(bdi) update_deps(source, "Build-Depends") binary = Deb822(f) update_deps(binary, "Depends") f = open("debian/control", "w+") try: source.dump(f) f.write("\n") binary.dump(f) finally: f.close() debian/watch0000644000000000000000000000015412143547034010222 0ustar version=3 https://launchpad.net/bzr-loom/+download https://launchpad.net/bzr-loom/.*/bzr-loom-(.*)\.tar\.gz debian/compat0000644000000000000000000000000212143547034010367 0ustar 7 debian/patches/0000755000000000000000000000000012143547540010622 5ustar debian/patches/BzrBranch5.patch0000644000000000000000000000364412143547107013611 0ustar Description: BzrBranch5 has moved in bzr 2.6 Origin: http://bazaar.launchpad.net/~bzr-loom-devs/bzr-loom/trunk/revision/160 Bug: https://bugs.launchpad.net/ubuntu/+source/bzr-loom/+bug/1025030 Index: bzr-loom/branch.py =================================================================== --- bzr-loom.orig/branch.py 2012-09-26 22:24:18.315432000 -0400 +++ bzr-loom/branch.py 2012-09-26 22:24:43.783109139 -0400 @@ -53,6 +53,12 @@ EMPTY_REVISION = 'empty:' +try: + from bzrlib.branchfmt.fullhistory import BzrBranch5, BzrBranchFormat5 +except ImportError: + from bzrlib.branch import BzrBranch5, BzrBranchFormat5 + + def create_thread(loom, thread_name): """Create a thread in the branch loom called thread.""" require_loom_branch(loom) @@ -88,7 +94,7 @@ raise AlreadyLoom(branch) try: format = { - bzrlib.branch.BzrBranchFormat5: BzrBranchLoomFormat1, + BzrBranchFormat5: BzrBranchLoomFormat1, bzrlib.branch.BzrBranchFormat6: BzrBranchLoomFormat6, bzrlib.branch.BzrBranchFormat7: BzrBranchLoomFormat7, }[branch._format.__class__]() @@ -744,7 +750,7 @@ return bzrlib.branch.Branch.hooks['post_push'] -class LoomBranch(LoomSupport, bzrlib.branch.BzrBranch5): +class LoomBranch(LoomSupport, BzrBranch5): """The Loom branch. A mixin is used as the easiest migration path to support branch6. A @@ -844,7 +850,7 @@ -class BzrBranchLoomFormat1(LoomFormatMixin, bzrlib.branch.BzrBranchFormat5): +class BzrBranchLoomFormat1(LoomFormatMixin, BzrBranchFormat5): """Loom's first format. This format is an extension to BzrBranchFormat5 with the following changes: @@ -859,7 +865,7 @@ def _branch_class(self): return LoomBranch - _parent_classs = bzrlib.branch.BzrBranchFormat5 + _parent_classs = BzrBranchFormat5 @classmethod def get_format_string(cls): debian/patches/root_inventory.patch0000644000000000000000000000155512143547107014750 0ustar Description: Adjust for API change in bzr 2.5 Author: Colin Watson Forwarded: no Last-Update: 2012-10-09 Index: b/branch.py =================================================================== --- a/branch.py +++ b/branch.py @@ -170,7 +170,7 @@ :param loom_content_lines: the unicode content to be used for the loom. """ self._inventory = bzrlib.inventory.Inventory() - self.inventory.add(loom_meta_ie) + self.root_inventory.add(loom_meta_ie) self._loom_stream = loom_stream self._loom_sha1 = loom_sha1 Index: b/version.py =================================================================== --- a/version.py +++ b/version.py @@ -24,5 +24,5 @@ ] bzr_plugin_version = (2, 2, 0, 'final', 0) -bzr_minimum_version = (2, 4, 0) +bzr_minimum_version = (2, 5, 0) bzr_maximum_version = None debian/patches/series0000644000000000000000000000004612143547107012036 0ustar root_inventory.patch BzrBranch5.patch debian/tests/0000755000000000000000000000000012143547540010335 5ustar debian/tests/testsuite0000755000000000000000000000025712143547034012316 0ustar #!/bin/sh # Note that since the installed version of the package has to be tested, # there is no mucking about with BZR_PLUGINS_AT. bzr selftest -s bp.loom -v --parallel=fork debian/tests/control0000644000000000000000000000013512143547107011736 0ustar Tests: testsuite Depends: bzr, python-bzrlib.tests, python-subunit Features: no-build-needed debian/control0000644000000000000000000000212312143547424010575 0ustar Source: bzr-loom Section: vcs Priority: optional Maintainer: Debian Bazaar Maintainers Uploaders: Andrew Starr-Bochicchio Homepage: https://launchpad.net/bzr-loom Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3), python-bzrlib (>= 2.5~) Build-Depends-Indep: bzr, python-subunit, python-testtools, python-bzrlib.tests | bzr (<< 2.4.0~beta1-2) Standards-Version: 3.9.4 X-Python-Version: >= 2.4 XS-Testsuite: autopkgtest Vcs-Bzr: http://anonscm.debian.org/bzr/bzr/pkg-bazaar/bzr-loom/unstable Vcs-Browser: http://anonscm.debian.org/loggerhead/pkg-bazaar/bzr-loom/unstable Package: bzr-loom Architecture: all Depends: ${misc:Depends}, ${python:Depends}, python-bzrlib (>= 2.5~) Recommends: bzr Enhances: bzr Description: Focused patch plugin support for Bazaar Loom is a Bazaar plugin to assist in developing focused patches. It adds a 'loom' to a bzr branch. . A loom allows the development of multiple patches at once, while still giving each patch a branch of its own. debian/docs0000644000000000000000000000003212143547034010037 0ustar HOWTO CONTRIBUTORS README debian/source/0000755000000000000000000000000012143547540010473 5ustar debian/source/format0000644000000000000000000000001412143547034011677 0ustar 3.0 (quilt)