On Wed, Jul 02, 2014 at 05:01:15PM -0700, Vagrant Cascadian wrote: > On Thu, May 29, 2014 at 11:52:29AM +0800, Paul Wise wrote: > > On Wed, 2014-05-28 at 10:21 -0700, Jonathan Nieder wrote: ... > If a transitional package is definitely needed, I'm of the opinion that it's > better to ship the transitional package in the new source package, as then you > don't need to coordinate uploads between two source packages when it comes > time > to drop the transitional package. I'd be willing to actually work on the > differing versions, if needed. > > > It seems to be a fairly straightforward package, really. Sven's packaging > seemed to work fine for me. There aren't many files for copyright review. How > can I help?
Once I got the idea in my head, I couldn't help myself: https://anonscm.debian.org/gitweb/?p=users/vagrant/git-remote-bzr.git It's basically an updated version of Sven's packaging with a git-bzr transitional package and the real git-remote-bzr package, against the current git-remote-bzr git. live well, vagrant
commit 20e92aeeea7ccec21a9556bdd3b65fcd5d5d491b
Author: Vagrant Cascadian <vagr...@debian.org>
Date: Wed Jul 2 20:31:26 2014 -0700
Add debian dir, based on work from Sven Joachim from:
https://bugs.debian.org/702697
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..2fa5064
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,12 @@
+git-remote-bzr (0.2+20140702~1-1) UNRELEASED; urgency=low
+
+ [ Sven Joachim ]
+ * Initial release (Closes: #702697).
+
+ [ Vagrant Cascadian ]
+ * Upstream version from git snapshot.
+ * Refreshed locale patch.
+ * Add git-bzr transitional package.
+ * Updated debian/copyright.
+
+ -- Vagrant Cascadian <vagr...@debian.org> Wed, 02 Jul 2014 19:54:42 -0700
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..f3242ff
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,33 @@
+Source: git-remote-bzr
+Section: vcs
+Priority: extra
+Maintainer: Debian QA Group <packa...@qa.debian.org>
+Build-Depends: debhelper (>= 9)
+Build-Depends-Indep: asciidoc, xmlto,
+# Needed for the testsuite
+ bzr, git, python, python-bzrlib
+Standards-Version: 3.9.5
+Homepage: https://github.com/felipec/git-remote-bzr
+#Vcs-Git: git://git.debian.org/collab-maint/git-remote-bzr.git
+#Vcs-Browser: http://git.debian.org/?p=collab-maint/git-remote-bzr.git;a=summary
+
+Package: git-remote-bzr
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}, git, python, python-bzrlib
+Suggests: git-doc, bzr
+Conflicts: bzr-git
+Breaks: git-bzr (<< 2:${source:Version})
+Replaces: git-bzr
+Description: bidirectional bridge between Git and Bazaar
+ This package provides the bzr remote helper, which allows Git to
+ read from and write to Bazaar repositories as though they were remote
+ Git repositories.
+
+Package: git-bzr
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}, git-remote-bzr,
+Description: transitional package
+ Transitional package to install git-remote-bzr.
+
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..a8f1d52
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,35 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: git-remote-bzr
+Source: https://github.com/felipec/git-remote-bzr
+
+Files: *
+Copyright: 2012-2014 Felipe Contreras
+License: GPL-2.0+
+
+Files: test/sharness.sh
+Copyright: 2005-2012 Junio C Hamano
+ 2011-2012 Mathias Lafeldt
+ 2005-2012 Git project
+License: GPL-2.0+
+
+Files: debian/*
+Copyright: 2014 Sven Joachim <svenj...@gmx.de>
+ 2014 Vagrant Cascadian <vagr...@debian.org>
+License: GPL-2.0+
+
+License: GPL-2.0+
+ This package 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 package 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
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/debian/git-remote-bzr.docs b/debian/git-remote-bzr.docs
new file mode 100644
index 0000000..2ed350c
--- /dev/null
+++ b/debian/git-remote-bzr.docs
@@ -0,0 +1 @@
+README.asciidoc
diff --git a/debian/patches/debian-locale.diff b/debian/patches/debian-locale.diff
new file mode 100644
index 0000000..285f157
--- /dev/null
+++ b/debian/patches/debian-locale.diff
@@ -0,0 +1,38 @@
+Description: Use C.UTF-8 locale in tests rather than en_US.UTF-8
+ The en_US.UTF-8 locale is not guaranteed to exist, and if it doesn't,
+ several tests fail.
+Author: Sven Joachim <svenj...@gmx.de>
+Forwarded: no
+Last-Update: 2014-07-02
+
+Index: git-remote-bzr/test/main.t
+===================================================================
+--- git-remote-bzr.orig/test/main.t
++++ git-remote-bzr/test/main.t
+@@ -212,7 +212,7 @@ rm -rf bzrrepo gitrepo
+ test_expect_success 'fetch utf-8 filenames' '
+ test_when_finished "rm -rf bzrrepo gitrepo && LC_ALL=C" &&
+
+- LC_ALL=en_US.UTF-8 &&
++ LC_ALL=C.UTF-8 &&
+ export LC_ALL &&
+
+ (
+@@ -245,7 +245,7 @@ test_expect_success 'push utf-8 filename
+
+ mkdir -p tmp && cd tmp &&
+
+- LC_ALL=en_US.UTF-8 &&
++ LC_ALL=C.UTF-8 &&
+ export LC_ALL &&
+
+ (
+@@ -384,7 +384,7 @@ test_expect_success 'strip' '
+ test_expect_success 'export utf-8 authors' '
+ test_when_finished "rm -rf bzrrepo gitrepo && LC_ALL=C && GIT_COMMITTER_NAME=\"C O Mitter\"" &&
+
+- LC_ALL=en_US.UTF-8 &&
++ LC_ALL=C.UTF-8 &&
+ export LC_ALL &&
+
+ GIT_COMMITTER_NAME="Grégoire" &&
diff --git a/debian/patches/debian-shebang.diff b/debian/patches/debian-shebang.diff
new file mode 100644
index 0000000..770caf1
--- /dev/null
+++ b/debian/patches/debian-shebang.diff
@@ -0,0 +1,16 @@
+Description: Change shebang line to /usr/bin/python
+ Using /usr/bin/env is unnecessary since we know where the python
+ interpreter is, and older versions of the python package did not
+ provide /usr/bin/python2.
+Author: Sven Joachim <svenj...@gmx.de>
+Forwarded: not-needed
+Last-Update: 2014-05-23
+
+--- git-remote-bzr-0.2.orig/git-remote-bzr
++++ git-remote-bzr-0.2/git-remote-bzr
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python2
++#!/usr/bin/python
+ #
+ # Copyright (c) 2012 Felipe Contreras
+ #
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..93330e9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+debian-shebang.diff
+debian-locale.diff
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..753d8b1
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,14 @@
+#!/usr/bin/make -f
+
+override_dh_auto_build:
+ dh_auto_build -- doc
+
+override_dh_auto_install:
+ dh_auto_install -- prefix=/usr DESTDIR=debian/git-remote-bzr install-doc
+
+override_dh_gencontrol:
+ dh_gencontrol
+ sed -i -e 's,^Version: ,Version: 2:,' debian/git-bzr/DEBIAN/control
+
+%:
+ dh $@
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..88a0241
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts="filenamemangle=s/(?:.*\/)?v?(\d[\d\.]*)\.tar\.gz/git-remote-bzr-$1.tar.gz/" \
+ https://github.com/felipec/git-remote-bzr/tags (?:.*/)?v?(\d[\d\.]*)\.tar\.gz
signature.asc
Description: Digital signature
