debian/0000755000000000000000000000000012227676174007204 5ustar debian/copyright0000644000000000000000000000250412177464232011132 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: bzr-git Upstream-Contact: Jelmer Vernooij Source: http://launchpad.net/bzr-git/ Files: * Copyright: 2006-2012, Canonical Ltd. 2008, John Carr 2007, David Allouche 2007-2012, Jelmer Vernooij License: GPL-2+ Files: debian/* Copyright: 2007-2012 Jelmer Vernooij License: GPL-2+ 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/source/0000755000000000000000000000000012227675622010501 5ustar debian/source/format0000644000000000000000000000001412177464232011704 0ustar 3.0 (quilt) debian/watch0000644000000000000000000000007312177464232010227 0ustar version=3 http://samba.org/~jelmer/bzr/bzr-git-(.*).tar.gz debian/patches/0000755000000000000000000000000012227675622010630 5ustar debian/patches/fix_test_pristine_tar.diff0000644000000000000000000000512712227674077016102 0ustar Description: Fix test failures due to there not being a .gitconfig Origin: commit, revision id: a.starr.b@gmail.com-20130815164206-dg7p880lnsphaa77 Author: Andrew Starr-Bochicchio Last-Update: 2013-08-15 Applied-Upstream: no X-Bzr-Revision-Id: a.starr.b@gmail.com-20130815164206-dg7p880lnsphaa77 Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=719261 === modified file 'pristine_tar.py' --- old/pristine_tar.py 2012-08-26 13:58:45 +0000 +++ new/pristine_tar.py 2013-08-15 16:42:06 +0000 @@ -77,7 +77,7 @@ def store_git_pristine_tar_data(repo, filename, delta, gitid, - message=None, **kwargs): + message=None, committer=None, **kwargs): """Add pristine tar data to a Git repository. :param repo: Git repository to add data to @@ -104,4 +104,4 @@ if message is None: message = 'pristine-tar data for %s' % filename return repo.do_commit(ref='refs/heads/pristine-tar', tree=tree.id, - message=message, **kwargs) + message=message, committer=committer, **kwargs) === modified file 'tests/test_pristine_tar.py' --- old/tests/test_pristine_tar.py 2012-08-26 13:58:45 +0000 +++ new/tests/test_pristine_tar.py 2013-08-15 16:42:06 +0000 @@ -65,7 +65,9 @@ r.object_store.add_object(b) t.add("README", stat.S_IFREG | 0644, b.id) r.object_store.add_object(t) - r.do_commit("Add README", tree=t.id, + r.do_commit("Add README", + committer="Foo Bar ", + tree=t.id, ref='refs/heads/pristine-tar') self.assertRaises(KeyError, read_git_pristine_tar_data, r, "foo") @@ -80,7 +82,9 @@ t.add("foo.delta", stat.S_IFREG | 0644, delta.id) t.add("foo.id", stat.S_IFREG | 0644, idfile.id) r.object_store.add_object(t) - r.do_commit("pristine tar delta for foo", tree=t.id, + r.do_commit("pristine tar delta for foo", + committer="Foo Bar ", + tree=t.id, ref='refs/heads/pristine-tar') self.assertEquals( ("some yummy data", "someid"), @@ -91,7 +95,8 @@ def test_store_new(self): r = GitMemoryRepo() - cid = store_git_pristine_tar_data(r, "foo", "mydelta", "myid") + cid = store_git_pristine_tar_data(r, "foo", "mydelta", "myid", + committer="Foo Bar ") tree = get_pristine_tar_tree(r) self.assertEquals( (stat.S_IFREG | 0644, "7b02de8ac4162e64f402c43487d8a40a505482e1"), debian/patches/series0000644000000000000000000000003312227674077012044 0ustar fix_test_pristine_tar.diff debian/control0000644000000000000000000000272112217657613010605 0ustar Source: bzr-git Section: vcs Priority: optional Maintainer: Debian Bazaar Maintainers Uploaders: Andrew Starr-Bochicchio , Jelmer Vernooij Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3), python-tdb Build-Depends-Indep: bzr (<< 2.7.0), bzr (>= 2.5~), bzr-fastimport (>= 0.12.0+bzr351), python-bzrlib.tests | bzr (<= 2.4.0~beta1-2), python-dulwich (>= 0.9.1~), python-fastimport, python-subunit, python-testtools (>= 0.9.2), python-unittest2 Standards-Version: 3.9.4 Homepage: http://bazaar-vcs.org/BzrForeignBranches/Git Vcs-Bzr: http://anonscm.debian.org/bzr/pkg-bazaar/bzr-git/unstable Vcs-Browser: http://anonscm.debian.org/loggerhead/pkg-bazaar/bzr-git/unstable X-Python-Version: >= 2.5 XS-Testsuite: autopkgtest Package: bzr-git Architecture: all Depends: bzr (<< 2.7.0), bzr (>= 2.5~), python-dulwich (>= 0.9.1~), ${misc:Depends}, ${python:Depends} Suggests: bzr-fastimport Recommends: python-tdb Enhances: bzr, git, loggerhead Provides: git-remote-bzr Description: Bazaar plugin providing Git integration This is a plugin for Bazaar that adds the ability to use Git repositories, both local and remote (git://, git+ssh:// and http://). It integrates with the regular Bazaar UI, and provides a new Bazaar subcommand `git-import` which imports all branches from a Git repository. . An experimental remote helper for Git that can push to and fetch from Bazaar branches is also provided. debian/changelog0000644000000000000000000002132612227674201011047 0ustar bzr-git (0.6.12-2) unstable; urgency=low * Reimport pristine tar fix. Closes: #725592 -- Jelmer Vernooij Wed, 16 Oct 2013 22:41:09 -0700 bzr-git (0.6.12-1) unstable; urgency=low * Add Provides: git-remote-bzr header. * New upstream release. + Fixes thin pack handling. Closes: #614741 -- Jelmer Vernooij Sun, 22 Sep 2013 22:22:19 +0100 bzr-git (0.6.11-2) unstable; urgency=low * debian/patches/fix_test_pristine_tar.diff: Fix FTBFS due to test failures (Closes: #719261). -- Andrew Starr-Bochicchio Thu, 15 Aug 2013 13:05:44 -0400 bzr-git (0.6.11-1) unstable; urgency=low * New upstream release. * Re-add myself to uploaders. -- Jelmer Vernooij Sun, 04 Aug 2013 17:09:40 +0000 bzr-git (0.6.9-4) unstable; urgency=low * Add python-fastimport to the autopkgtest dependencies. -- Andrew Starr-Bochicchio Fri, 24 May 2013 12:15:31 -0400 bzr-git (0.6.9-3) unstable; urgency=low [ Andrew Starr-Bochicchio ] * Upload to unstable. * Add myself to uploaders. * Bump Standards-Version to 3.9.4, no changes needed. * Update VCS fields. * Minor syntax fix in debian/copyright * Run wrap-and-sort on the control file. * debian/tests/git-remote: Make sure testsuite fails if the test does. [ Dmitry Shachnev ] * Several fixes for DEP-8 tests (Closes: #700694): - Use $ADTTMP instead of $TMPDIR. - Drop now default "Features: no-build-needed". - Add missing dependencies on bzr-git and python-subunit. - Redirect stderr of git clone to stdout. - Make tests fail on upstream testsuite failure. -- Andrew Starr-Bochicchio Thu, 23 May 2013 21:05:21 -0400 bzr-git (0.6.9-2) experimental; urgency=low * Orphan package. * Add XS-Testsuite header. Closes: #692655 -- Jelmer Vernooij Fri, 07 Sep 2012 02:11:31 +0200 bzr-git (0.6.9-1) unstable; urgency=low * New upstream release. + Fixes starting of git server. Closes: #674974 -- Jelmer Vernooij Tue, 29 May 2012 10:25:34 +0200 bzr-git (0.6.8-1) unstable; urgency=low * New upstream release. + Fixes creation of duplicate tags in git-remote-bzr. LP: #905275 * Install upstream changelog. -- Jelmer Vernooij Wed, 28 Mar 2012 14:58:18 +0200 bzr-git (0.6.7+bzr1582-1) unstable; urgency=low * Install git-remote-bzr into /usr/bin rather than /usr/lib/git-core so it gets picked up by non-system git installations. Thanks Jonathan Nieder. Closes: #658141. * Add debian/tests with simple test to run testsuite and smoke test for git remote helper. * Fix copyright format string in copyright file. * Bump standards version to 3.9.3. * New upstream snapshot. + Fixes compatibility with bzr 2.5. Closes: #942883 -- Jelmer Vernooij Tue, 28 Feb 2012 22:14:35 +0100 bzr-git (0.6.7-1) unstable; urgency=low * New upstream release. + Fixes compatibility with newer preleases of bzr. Closes: #656963 * Use DEP-5 in copyright file. -- Jelmer Vernooij Wed, 25 Jan 2012 02:29:29 +0100 bzr-git (0.6.6-1) unstable; urgency=low * Use DEP5 format for copyright file. * New upstream release. + Copes with new `possible_transports` argument for Branch.open added in bzr 2.5b4. Closes: #652178 + Copes with removal of global options in bzr 2.5b4. LP: #903639 + Fixes support for directories in `bzr add`. LP: #894195 -- Jelmer Vernooij Thu, 15 Dec 2011 19:06:37 +0100 bzr-git (0.6.5+bzr1465-1) unstable; urgency=low * New upstream snapshot. + Fix compatibility with older pre-releases of bzr 2.5. -- Jelmer Vernooij Wed, 09 Nov 2011 21:04:04 +0100 bzr-git (0.6.5-1) unstable; urgency=low * New upstream release. -- Jelmer Vernooij Tue, 08 Nov 2011 19:18:59 +0100 bzr-git (0.6.4-1) unstable; urgency=low * New upstream release. -- Jelmer Vernooij Thu, 03 Nov 2011 14:22:00 +0100 bzr-git (0.6.3-1) unstable; urgency=low * Support pre-release versions of bzr 2.5. * Depend on python-unittest2 for compatibility with older versions of Python. * New upstream release. + Install git-remote-bzr. -- Jelmer Vernooij Tue, 01 Nov 2011 13:29:29 +0100 bzr-git (0.6.2-1) unstable; urgency=low * New upstream release. + Depends on Dulwich 0.8.0. + Implements per_file_graph. LP: #677363 -- Jelmer Vernooij Sun, 07 Aug 2011 15:43:09 +0200 bzr-git (0.6.1+bzr1279-1) unstable; urgency=low * New upstream snapshot. -- Jelmer Vernooij Sat, 18 Jun 2011 17:00:46 +0200 bzr-git (0.6.0+bzr1270-1) unstable; urgency=low * New upstream snapshot. -- Jelmer Vernooij Sun, 05 Jun 2011 14:24:08 +0200 bzr-git (0.6.0+bzr1223-1) unstable; urgency=low * Re-arrange | condition in build deps to make sbuild happy. * Bump standards version to 3.9.2 (no changes). * New upstream snapshot. -- Jelmer Vernooij Fri, 06 May 2011 03:05:59 +0200 bzr-git (0.6.0+bzr1213-1) unstable; urgency=low * Add build dependency on python-bzrlib.tests for newer versions of bzr. * New upstream snapshot. -- Jelmer Vernooij Sun, 01 May 2011 03:27:52 +0200 bzr-git (0.6.0-1) unstable; urgency=low * New upstream release. -- Jelmer Vernooij Tue, 12 Apr 2011 23:13:28 +0200 bzr-git (0.5.4+bzr1148-1) unstable; urgency=low * Support running test suite in parallel. * Switch to dh_python2. Closes: #616757 * Switch to debhelper 7, drop cdbs. * New upstream snapshot. + Fixes some imported file keys. Closes: #614738 -- Jelmer Vernooij Wed, 23 Mar 2011 16:17:22 +0100 bzr-git (0.5.4-1) unstable; urgency=low * New upstream release. -- Jelmer Vernooij Thu, 10 Feb 2011 14:14:53 +0100 bzr-git (0.5.3-1) unstable; urgency=low * New upstream release. * Run testsuite as part of build. * Mark as only supporting Python >= 2.4. * Add Enhances: bzr. -- Jelmer Vernooij Fri, 21 Jan 2011 22:15:09 +0100 bzr-git (0.5.2+bzr1046-1) unstable; urgency=low * New upstream snapshot. + Fixes compatibility with Bazaar 2.3. -- Jelmer Vernooij Mon, 11 Oct 2010 11:35:52 +0200 bzr-git (0.5.2-1) unstable; urgency=low * New upstream release. * Bump standards version to 3.9.1. -- Jelmer Vernooij Sat, 31 Jul 2010 00:18:45 +0200 bzr-git (0.5.1-1) unstable; urgency=low * New upstream release. * Bump standards version to 3.8.4. -- Jelmer Vernooij Sun, 23 May 2010 01:36:43 +0200 bzr-git (0.5.0-1) unstable; urgency=medium * New upstream release. + Fixes breakage with newer versions of Python 2.6. * Bump standards version to 3.8.4. * Switch to dpkg-source 3.0 (quilt) format. -- Jelmer Vernooij Thu, 18 Mar 2010 16:09:25 +0000 bzr-git (0.4.3-2) unstable; urgency=low * Switch to dpkg-source 3.0 (quilt) format. -- Jelmer Vernooij Thu, 04 Feb 2010 02:29:30 +0100 bzr-git (0.4.3-1) unstable; urgency=low * New upstream release. + Supports 'bzr checkout'. Closes: #557295 -- Jelmer Vernooij Thu, 04 Feb 2010 02:29:13 +0100 bzr-git (0.4.2-1) unstable; urgency=low * New upstream release. * Bump standards version to 3.8.3. -- Jelmer Vernooij Thu, 01 Oct 2009 16:12:17 +0200 bzr-git (0.4.1-1) unstable; urgency=low * Bump standards version to 3.8.2. * New upstream release. * Depend on matching version of Dulwich. Closes: #537630 -- Jelmer Vernooij Thu, 23 Jul 2009 19:58:54 +0200 bzr-git (0.4.0-1) unstable; urgency=low * New upstream release. -- Jelmer Vernooij Thu, 18 Jun 2009 15:45:17 +0200 bzr-git (0.3.2-1) unstable; urgency=low * New upstream snapshot. * Drop python-tdb to recommends. -- Jelmer Vernooij Wed, 20 May 2009 19:27:22 +0200 bzr-git (0.3.1-1) unstable; urgency=low * New upstream snapshot. -- Jelmer Vernooij Tue, 12 May 2009 02:20:29 +0200 bzr-git (0.3.0-1) unstable; urgency=low * New upstream release. -- Jelmer Vernooij Sun, 10 May 2009 16:39:08 +0200 bzr-git (0.2.0-1) experimental; urgency=low * New upstream release. -- Jelmer Vernooij Thu, 30 Apr 2009 14:30:58 +0200 bzr-git (0.1.0+bzr324-1) experimental; urgency=low * New upstream snapshot. -- Jelmer Vernooij Mon, 06 Apr 2009 16:09:39 +0200 bzr-git (0.1.0+bzr275-1) experimental; urgency=low * Initial release. (Closes: #489169) -- Jelmer Vernooij Sat, 21 Mar 2009 17:22:42 +0100 debian/bzr-builddeb.conf0000644000000000000000000000022312177464232012407 0ustar [BUILDDEB] export-upstream-revision = tag:bzr-git-$UPSTREAM_VERSION upstream-branch = lp:bzr-git [HOOKS] merge-upstream = ./debian/update-deps.py debian/tests/0000755000000000000000000000000012227675622010343 5ustar debian/tests/git-remote0000644000000000000000000000052012177464232012334 0ustar #!/bin/sh -e cd "$ADTTMP" bzr whoami "Your Name " bzr init foo.bzr bzr ci --quiet --unchanged -m "Some commit" foo.bzr git clone "bzr::foo.bzr" foo.git 2>&1 cd foo.git COMMIT=`git log | grep "Some commit"` if [ -z "$COMMIT" ]; then echo 'Test failed...' exit 1 else echo 'Test succeeded...' exit 0 fi debian/tests/testsuite0000755000000000000000000000026512177464232012322 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. set -e bzr selftest -s bp.git -v --parallel=fork debian/tests/control0000644000000000000000000000021012177464232011734 0ustar Tests: testsuite Depends: git, bzr-git, python-bzrlib.tests, python-subunit, python-fastimport Tests: git-remote Depends: git, bzr-git debian/update-deps.py0000755000000000000000000000265612177464232011777 0ustar #!/usr/bin/python # Update dependencies based on info.py # Copyright (C) 2010 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 info import bzr_compatible_versions, dulwich_minimum_version def update_relation(l, pkg, kind, version): found = False for pr in l: if len(pr) != 1: # only update "simple" depends 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, "bzr", ">=", "%d.%d~" % bzr_compatible_versions[0][:2]) update_relation(bdi, "bzr", "<<", "%d.%d.0" % (bzr_compatible_versions[-1][0], bzr_compatible_versions[-1][1]+1)) update_relation(bdi, "python-dulwich", ">=", "%d.%d.%d~" % dulwich_minimum_version) control[field] = PkgRelation.str(bdi) update_deps(source, "Build-Depends-Indep") 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/rules0000755000000000000000000000106112177464232010254 0ustar #!/usr/bin/make -f %: dh --buildsystem=python_distutils --with python2 $* ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) CONCURRENCY = BZR_CONCURRENCY=$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) endif override_dh_auto_clean: dh_auto_clean find . -name "*.pyc" -print0 | xargs -0 rm -f ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) override_dh_auto_test: $(CONCURRENCY) BZR_PLUGINS_AT=git@$(CURDIR) /usr/bin/bzr selftest --parallel=fork \ -v -s bp.git endif override_dh_installchangelogs: dh_installchangelogs NEWS debian/manpages0000644000000000000000000000002112177464232010705 0ustar git-remote-bzr.1 debian/compat0000644000000000000000000000000212177464232010374 0ustar 5 debian/pycompat0000644000000000000000000000000212177464232010745 0ustar 2