[Python-apps-commits] r9298 - in packages/git-bzr-ng/trunk/debian (8 files)
stefanor at users.alioth.debian.org
stefanor at users.alioth.debian.org
Fri Dec 7 13:30:58 UTC 2012
Date: Friday, December 7, 2012 @ 13:30:56
Author: stefanor
Revision: 9298
Manpage, correct git commit location in get-packaged-orig-source
Added:
packages/git-bzr-ng/trunk/debian/manpages
packages/git-bzr-ng/trunk/debian/patches/
packages/git-bzr-ng/trunk/debian/patches/manpage
packages/git-bzr-ng/trunk/debian/patches/marks-help
packages/git-bzr-ng/trunk/debian/patches/series
Modified:
packages/git-bzr-ng/trunk/debian/changelog
packages/git-bzr-ng/trunk/debian/control
packages/git-bzr-ng/trunk/debian/rules
Modified: packages/git-bzr-ng/trunk/debian/changelog
===================================================================
--- packages/git-bzr-ng/trunk/debian/changelog 2012-12-06 20:19:22 UTC (rev 9297)
+++ packages/git-bzr-ng/trunk/debian/changelog 2012-12-07 13:30:56 UTC (rev 9298)
@@ -1,4 +1,4 @@
-git-bzr-ng (0+git20120117-1) UNRELEASED; urgency=low
+git-bzr-ng (0+git20120823-1) UNRELEASED; urgency=low
* Initial release. (Closes: #497153)
Modified: packages/git-bzr-ng/trunk/debian/control
===================================================================
--- packages/git-bzr-ng/trunk/debian/control 2012-12-06 20:19:22 UTC (rev 9297)
+++ packages/git-bzr-ng/trunk/debian/control 2012-12-07 13:30:56 UTC (rev 9298)
@@ -3,17 +3,15 @@
Priority: optional
Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
Uploaders: Stefano Rivera <stefanor at debian.org>
-Build-Depends:
- debhelper (>= 8),
- python-all (>= 2.6.6-3~)
-Standards-Version: 3.9.3
+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: ${misc:Depends}, ${python:Depends}, git, bzr-fastimport
+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
Added: packages/git-bzr-ng/trunk/debian/manpages
===================================================================
--- packages/git-bzr-ng/trunk/debian/manpages (rev 0)
+++ packages/git-bzr-ng/trunk/debian/manpages 2012-12-07 13:30:56 UTC (rev 9298)
@@ -0,0 +1 @@
+doc/*.[0-9]
Added: packages/git-bzr-ng/trunk/debian/patches/manpage
===================================================================
--- packages/git-bzr-ng/trunk/debian/patches/manpage (rev 0)
+++ packages/git-bzr-ng/trunk/debian/patches/manpage 2012-12-07 13:30:56 UTC (rev 9298)
@@ -0,0 +1,127 @@
+Description: Add a simple manpage, built from rst with docutils
+Author: Stefano Rivera <stefanor at debian.org>
+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] <url> [<target>]
++| `git bzr clear` [<bzr_branch>]
++| `git bzr push` [--overwrite] [--parent_branch=<parent_branch>] [<url>]
++| `git bzr sync` [--overwrite] <bzr_branch>
++| `git bzr pull` [--overwrite] <bzr_branch>
++| `git bzr import` [--strip_tags] <url> <new_branch>
++| `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 <url> into the `master` branch of a newly
++created git repository in <target>.
++If the <target> isn't specified, it's deduced from the <url>.
++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 <bzr_branch>, or the current branch, if
++not specified.
++
++`push`
++------
++
++Push to the bzr repository <url> (or the remembered url, if not
++specified).
++
++With ``--parent_branch=<parent_branch>``, <parent_branch> is used as the
++parent branch.
++
++With ``--overwrite``, history can be overwritten.
++
++`sync`
++------
++
++Sync bzr tracking branch <bzr_branch>.
++
++With ``--overwrite``, history can be overwritten.
++
++`pull`
++------
++
++Sync bzr tracking branch <bzr_branch> and pull from it.
++
++With ``--overwrite``, history can be overwritten.
++
++`import`
++--------
++
++Import bzr branch <url> into a git repository, as <new_branch>.
++
++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)
Added: packages/git-bzr-ng/trunk/debian/patches/marks-help
===================================================================
--- packages/git-bzr-ng/trunk/debian/patches/marks-help (rev 0)
+++ packages/git-bzr-ng/trunk/debian/patches/marks-help 2012-12-07 13:30:56 UTC (rev 9298)
@@ -0,0 +1,18 @@
+Description: Show the correct help for the marks command, not push help
+Author: Stefano Rivera <stefanor at debian.org>
+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 <url>')
+- parser.description = ('Effectively a bzr push <url>')
++ 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')
Added: packages/git-bzr-ng/trunk/debian/patches/series
===================================================================
--- packages/git-bzr-ng/trunk/debian/patches/series (rev 0)
+++ packages/git-bzr-ng/trunk/debian/patches/series 2012-12-07 13:30:56 UTC (rev 9298)
@@ -0,0 +1,2 @@
+manpage
+marks-help
Modified: packages/git-bzr-ng/trunk/debian/rules
===================================================================
--- packages/git-bzr-ng/trunk/debian/rules 2012-12-06 20:19:22 UTC (rev 9297)
+++ packages/git-bzr-ng/trunk/debian/rules 2012-12-07 13:30:56 UTC (rev 9298)
@@ -3,6 +3,14 @@
%:
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/')
@@ -13,9 +21,11 @@
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 git-bzr-ng-$(VER)
+ cd git-bzr-ng-$(VER).orig && git checkout $(VER)
else
- cd git-bzr-ng-$(VER).orig && git checkout HEAD@{$(FDATE)}
+ 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 \
More information about the Python-apps-commits
mailing list