debian/0000755000000000000000000000000012060370137007165 5ustar debian/changelog0000644000000000000000000000024612060370050011033 0ustar git-bzr-ng (0+git20120823-1) unstable; urgency=low * Initial release. (Closes: #497153) -- Stefano Rivera Fri, 07 Dec 2012 15:33:28 +0200 debian/rules0000755000000000000000000000201112060366563010247 0ustar #!/usr/bin/make -f %: dh $@ --with python2 override_dh_auto_build: dh_auto_build $(MAKE) -C doc override_dh_auto_clean: dh_auto_clean $(MAKE) -C doc clean || rm -rf doc GIT_REPO ?= https://github.com/termie/git-bzr-ng RDATE=$(shell dpkg-parsechangelog | sed -rne 's,^Version: .*\+git([0-9]+).*,\1,p') FDATE=$(shell echo $(RDATE) | sed -r 's/([0-9]{4})([0-9]{2})([0-9]{2})/\1-\2-\3/') VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: (.+)-.*,\1,p') get-packaged-orig-source: @echo "You can build this from a local repo by supplying the GIT_REPO variable" rm -rf git-bzr-ng-$(VER).orig git clone $(GIT_REPO) git-bzr-ng-$(VER).orig ifeq (,$(RDATE)) cd git-bzr-ng-$(VER).orig && git checkout $(VER) else set -e; \ cd git-bzr-ng-$(VER).orig; \ git checkout $$(git rev-list --date-order --until=$(FDATE) master | head -n1) endif rm -rf git-bzr-ng-$(VER).orig/.git* GZIP=--best tar -cz --owner root --group root --mode a+rX \ -f git-bzr-ng_$(VER).orig.tar.gz git-bzr-ng-$(VER).orig rm -rf git-bzr-ng-$(VER).orig debian/watch0000644000000000000000000000013112014230573010207 0ustar version=3 http://githubredir.debian.net/github/termie/git-bzr-ng/git-bzr-ng-(.+).tar.gz debian/install0000644000000000000000000000002112060367061010551 0ustar git-bzr /usr/bin debian/compat0000644000000000000000000000000212014230573010361 0ustar 8 debian/source/0000755000000000000000000000000012060370101010454 5ustar debian/source/format0000644000000000000000000000001412014230573011671 0ustar 3.0 (quilt) debian/copyright0000644000000000000000000000351212060367061011123 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: git-bzr-ng Upstream-Contact: Andy Smith Source: https://github.com/termie/git-bzr-ng Files: * Copyright: 2008, Evan Martin , 2010, Andy Smith License: BSD-3-clause Files: debian/* Copyright: 2012, Stefano Rivera License: BSD-3-clause License: BSD-3-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. * Neither the name of the author nor the names of contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. debian/control0000644000000000000000000000151112060367061010570 0ustar Source: git-bzr-ng Section: vcs Priority: optional Maintainer: Python Applications Packaging Team Uploaders: Stefano Rivera Build-Depends: debhelper (>= 8.1), python-all (>= 2.6.6-3~), python-docutils Standards-Version: 3.9.4 Homepage: https://github.com/termie/git-bzr-ng Vcs-Svn: svn://svn.debian.org/python-apps/packages/git-bzr-ng/trunk/ Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/git-bzr-ng/trunk/ Package: git-bzr-ng Architecture: all Depends: bzr-fastimport, git, ${misc:Depends}, ${python:Depends} Description: bi-directional git to bzr bridge: never fear bzr again git-bzr-ng is a bidirectional bridge between git and bzr that lets you stop worrying which version control the code you love is using -- as long as they are using git or bzr ;) debian/manpages0000644000000000000000000000001412060366467010711 0ustar doc/*.[0-9] debian/patches/0000755000000000000000000000000012060370101010603 5ustar debian/patches/marks-help0000644000000000000000000000123512060366077012613 0ustar Description: Show the correct help for the marks command, not push help Author: Stefano Rivera Last-Update: 2012-12-07 Forwarded: https://github.com/termie/git-bzr-ng/pull/51 --- a/git-bzr +++ b/git-bzr @@ -640,8 +640,8 @@ def cmd_marks(args): - parser = optparse.OptionParser(usage='git bzr push ') - parser.description = ('Effectively a bzr push ') + parser = optparse.OptionParser(usage='git bzr marks') + parser.description = ('Show the current marks files for a branch') parser.add_option('--git', action='store_true', dest='git', default=True, help='show the git marks file') debian/patches/series0000644000000000000000000000002312060365655012035 0ustar manpage marks-help debian/patches/manpage0000644000000000000000000000543512060367415012163 0ustar Description: Add a simple manpage, built from rst with docutils Author: Stefano Rivera Last-Update: 2012-12-07 Forwarded: https://github.com/termie/git-bzr-ng/pull/50 --- /dev/null +++ b/doc/Makefile @@ -0,0 +1,12 @@ +SOURCES=$(wildcard *.[0-9].rst) +OUTPUT=$(patsubst %.rst, %, $(SOURCES)) + +.PHONY: all +all: $(OUTPUT) + +.PHONY: clean +clean: + rm -f $(OUTPUT) + +%: %.rst + rst2man $^ > $@ --- /dev/null +++ b/doc/git-bzr.1.rst @@ -0,0 +1,104 @@ +========= + git-bzr +========= + +---------------------------------------- +Bidirectional bridge between git and bzr +---------------------------------------- + +:Date: 2012-12-07 +:Manual section: 1 +:Manual group: Git-Bzr-Ng + +SYNOPSIS +======== + +| `git bzr init` +| `git bzr clone` [--strip_tags] [] +| `git bzr clear` [] +| `git bzr push` [--overwrite] [--parent_branch=] [] +| `git bzr sync` [--overwrite] +| `git bzr pull` [--overwrite] +| `git bzr import` [--strip_tags] +| `git bzr marks` [--file] [--git|--bzr] + +DESCRIPTION +=========== + +A bidirectional bridge between git and bzr that lets you stop worrying +which version control the code you love is using -- as long as they are +using git or bzr. + +COMMANDS +======== + +Several subcommands are available. +With no arguments specified, shows the available subcommands. + +`init` +------ + +Initialize a new bzr tracking branch based on master. + +`clone` +------- + +Clone a bzr branch from into the `master` branch of a newly +created git repository in . +If the isn't specified, it's deduced from the . +Like `git clone`, it creates remote-tracking bzr branches. + +With ``--strip_tags``, tags are stripped from bzr when importing. + +`clear` +------- + +Remove bzr tracking branches for , or the current branch, if +not specified. + +`push` +------ + +Push to the bzr repository (or the remembered url, if not +specified). + +With ``--parent_branch=``, is used as the +parent branch. + +With ``--overwrite``, history can be overwritten. + +`sync` +------ + +Sync bzr tracking branch . + +With ``--overwrite``, history can be overwritten. + +`pull` +------ + +Sync bzr tracking branch and pull from it. + +With ``--overwrite``, history can be overwritten. + +`import` +-------- + +Import bzr branch into a git repository, as . + +With ``--strip_tags``, tags are stripped from bzr when importing. + +`marks` +------- + +Display the current marks files for the current branch. +By default, the git marks are shown, with ``--bzr``, the bzr marks are +shown. + +With ``--file``, the marks file name is shown, rather than its contents. + +SEE ALSO +======== + +``git``\ (1), +``bzr``\ (1) debian/docs0000644000000000000000000000001312014230573010030 0ustar README.rst