Bug#704652: RFP: git-subtree -- subtree merge/split tool from git/contrib/subtree
Jonathan, all,
I've prepared an alternative patch for adding 'git-subtree' to Debian by
building a separate arch-indep 'git-subtree' package as suggested by
Martin (see attached).
The first version of the patch is against the current 'debian-sid'
branch, while the second one is on top of my patch from
http://bugs.debian.org/740349 (to add a 'git-credential-gnome-keyring'
package).
Tests pass:
make[3]: Entering directory `/tmp/buildd/git-1.9.0/contrib/subtree/t'
*** t7900-subtree.sh ***
...
# passed all 55 test(s)
1..55
and documentation is included in the package as well.
Please let me know, if something is missing.
Greetings from Oldenburg,
Philipp
--
vay' DalarghDI' yIqaw
From c98e2803ea3f4e7db9bc5ceb8740f055dbd7 Mon Sep 17 00:00:00 2001
From: Philipp A. Hartmann p...@qo.cx
Date: Wed, 5 Mar 2014 01:27:10 +0100
Subject: [PATCH] git-subtree: add new package (closes: #704652)
This patch adds a 'git-subtree' package, providing the 'git subtree'
command to merge subtrees together and split a repository into subtrees.
Signed-off-by: Philipp A. Hartmann p...@qo.cx
---
debian/changelog| 5 +
debian/control | 17 +
debian/git-subtree.docs | 1 +
debian/rules| 16
4 files changed, 39 insertions(+)
create mode 100644 debian/git-subtree.docs
diff --git a/debian/changelog b/debian/changelog
index 943612d..bbdcce9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
git (1:1.9.0-1.1) unstable; urgency=low
+ [ Jonathan Nieder ]
* git-email: Recommends: libio-socket-ssl-perl (= 1.951) since
earlier versions do not use OpenSSL's defaults when ca_path
and ca_file are unset.
+ [ Philipp A. Hartmann ]
+ * git-subtree: add new package for 'git subtree' command from
+contrib/ directory (closes: #704652)
+
-- Jonathan Nieder jrnie...@gmail.com Tue, 25 Feb 2014 21:16:56 -0800
git (1:1.9.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 14e14b7..8a3c7bf 100644
--- a/debian/control
+++ b/debian/control
@@ -234,6 +234,23 @@ Description: fast, scalable, distributed revision control system (email add-on)
This package provides the git-send-email program for sending series of
patch emails.
+Package: git-subtree
+Architecture: all
+Multi-Arch: foreign
+Depends: git ( 1:1.7.0.2) | git-core
+Description: fast, scalable, distributed revision control system (subtree command)
+ Git is popular version control system designed to handle very large
+ projects with speed and efficiency; it is used for many high profile
+ open source projects, most notably the Linux kernel.
+ .
+ Git falls in the category of distributed source code management tools.
+ Every Git working directory is a full-fledged repository with full
+ revision tracking capabilities, not dependent on network access or a
+ central server.
+ .
+ This package provides the git-subtree command to merge subtrees together
+ and split a repository into subtrees.
+
Package: git-daemon-run
Architecture: all
Multi-Arch: foreign
diff --git a/debian/git-subtree.docs b/debian/git-subtree.docs
new file mode 100644
index 000..09ec4bc
--- /dev/null
+++ b/debian/git-subtree.docs
@@ -0,0 +1 @@
+contrib/subtree/todo
diff --git a/debian/rules b/debian/rules
index 69cb7a8..6a2e39f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,6 +48,7 @@ PKG_INDEP += gitweb
PKG_INDEP += git-all
PKG_INDEP += git-el
PKG_INDEP += git-man
+PKG_INDEP += git-subtree
TMP =$(shell pwd)/tmp
GIT =$(shell pwd)/debian/git
@@ -92,6 +93,15 @@ build-indep-stamp: patch-stamp build-arch-stamp
$(MAKE) -C t $(OPTS) $(CURDIR)/debian/test-bzr.sh
# git-mediawiki
$(MAKE) -Ccontrib/mw-to-git all $(OPTS)
+ # git-subtree
+ DESTDIR='$(GIT)'-subtree $(MAKE) -Ccontrib/subtree \
+ all doc $(OPTS) libexecdir=/usr/lib/git-core
+ test -z '$(TEST)' || \
+ PATH='$(CURDIR):$(CURDIR)/contrib/subtree:$(PATH)' \
+ $(MAKE) -Ccontrib/subtree $(TEST) $(OPTS) prefix= || \
+ PATH='$(CURDIR):$(CURDIR)/contrib/subtree:$(PATH)' \
+ GIT_TEST_OPTS=--verbose \
+ $(MAKE) -Ccontrib/subtree $(TEST) $(OPTS) prefix=
touch build-indep-stamp
clean: deb-checkdir
@@ -99,6 +109,8 @@ clean: deb-checkdir
rm -f debian/git-remote-bzr.xml debian/git-remote-bzr.html
rm -f Documentation/git-remote-bzr.1
$(MAKE) clean $(OPTS)
+ $(MAKE) -Ccontrib/subtree clean $(OPTS)
+ rm -f contrib/subtree/git-subtree
! test -e patch-stamp || \
{ \
set -e; \
@@ -178,6 +190,7 @@ install-arch: deb-checkdir deb-checkuid build-arch-stamp
rm -rf '$(GIT)'/usr/share/doc/git/contrib/completion
rm -rf '$(GIT)'/usr/share/doc/git/contrib/emacs
rm -rf '$(GIT)'/usr/share/doc/git/contrib/mw-to-git
+ rm -rf '$(GIT)'/usr/share/doc/git/contrib/subtree
find '$(GIT)'/usr/share/doc/git/contrib -type f | xargs chmod 0644
find '$(GIT)'/usr/share/doc/git/contrib -type d | xargs chmod 0755
# remove contrib hooks, they are now installed in
@@ -353,6 +366,9 @@ install-indep:
Bug#704652: RFP: git-subtree -- subtree merge/split tool from git/contrib/subtree
Me too. I need this tool and would like it available standardly. -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#704652: RFP: git-subtree -- subtree merge/split tool from git/contrib/subtree
Hi, On Sun, 2013-10-13 at 16:47 +0200, Gilles Filippini wrote: Hi, (...) Patch proposal attached. Thanks, _g. I'd very much like to see this added as well (is the current patch good to go?). Should it part of the main git package (as in the proposed patch), or rather as a separate git-subtree package? -- Martin Erik Werner martinerikwer...@gmail.com -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#704652: RFP: git-subtree -- subtree merge/split tool from git/contrib/subtree
Hi, Jonathan Nieder a écrit , Le 30/09/2013 20:59: pini wrote: [Subject: RFP: git-subtree -- subtree merge/split tool from git/contrib] Any news on this topic? Thanks for your interest. No news --- so if you know someone who's made the appropriate tweaks to debian/rules and tried it out, the patches would be welcome. ;-) See /usr/share/doc/git/README.source for more hints. Patch proposal attached. Thanks, _g. From 7550725b279522bf7ab1ade8568d28211edba102 Mon Sep 17 00:00:00 2001 From: Gilles Filippini p...@debian.org Date: Sun, 13 Oct 2013 16:41:04 +0200 Subject: [PATCH] Install git-subtree from contrib --- debian/changelog | 7 +++ debian/rules | 9 + 2 files changed, 16 insertions(+) diff --git a/debian/changelog b/debian/changelog index f78b6ec..b950da1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +git (1:1.8.4-1.2) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Install git-subtree from contrib. + + -- Gilles Filippini p...@debian.org Sat, 12 Oct 2013 19:34:24 +0200 + git (1:1.8.4-1.1) experimental; urgency=low * debian/control: Build-Depends tcl instead of tcl8.5. diff --git a/debian/rules b/debian/rules index 4cdd764..a5833df 100755 --- a/debian/rules +++ b/debian/rules @@ -9,6 +9,7 @@ LDFLAGS :=$(shell dpkg-buildflags --get LDFLAGS) STRIP =strip TEST =test OPTS =NO_OPENSSL=1 prefix=/usr gitexecdir=/usr/lib/git-core \ + libexecdir=/usr/lib/git-core \ mandir=/usr/share/man htmldir=/usr/share/doc/git/html \ INSTALLDIRS=vendor \ NO_PYTHON=1 \ @@ -65,9 +66,14 @@ build-arch: deb-checkdir build-arch-stamp build-arch-stamp: patch-stamp -$(CC) -v DESTDIR='$(GIT)' $(MAKE) all $(OPTS) + DESTDIR='$(GIT)' $(MAKE) -C contrib/subtree all $(OPTS) + ln -s contrib/subtree/git-subtree test -z '$(TEST)' || \ DESTDIR='$(GIT)' $(MAKE) $(TEST) $(OPTS) || \ GIT_TEST_OPTS=--verbose DESTDIR='$(GIT)' $(MAKE) $(TEST) $(OPTS) + test -z '$(TEST)' || \ + DESTDIR='$(GIT)' $(MAKE) -C contrib/subtree $(TEST) $(OPTS) prefix= || \ + GIT_TEST_OPTS=--verbose DESTDIR='$(GIT)' $(MAKE) -C contrib/subtree $(TEST) $(OPTS) prefix= touch build-arch-stamp build-indep: deb-checkdir build-indep-stamp @@ -106,6 +112,7 @@ clean: deb-checkdir rm -rf '$(GIT)'$$i; \ done rm -f debian/files debian/substvars + rm -f git-subtree install: install-arch install-indep git.install: install-arch @@ -114,6 +121,7 @@ install-arch: deb-checkdir deb-checkuid build-arch-stamp rm -rf '$(GIT)' install -d -m0755 '$(GIT)'/usr/bin DESTDIR='$(GIT)' $(MAKE) install $(OPTS) + DESTDIR='$(GIT)' $(MAKE) -C contrib/subtree install $(OPTS) install -d -m0755 '$(GIT)'/var/lib/git rm -f '$(GIT)'/usr/share/perl5/Error.pm rm -rf '$(GIT)'/usr/share/man @@ -190,6 +198,7 @@ install-indep: build-arch-stamp build-indep-stamp rm -rf '$(GIT)'-man install -d -m0755 '$(GIT)'-man/usr/share/man/man3 DESTDIR='$(GIT)'-man $(MAKE) install-doc $(OPTS) + DESTDIR='$(GIT)'-man $(MAKE) -C contrib/subtree install-doc $(OPTS) install -m 0644 '$(TMP)'/usr/share/man/man3/Git* \ '$(GIT)'-man/usr/share/man/man3/ # don't include arch, cvs, svn, email, gui, and gitk man pages -- 1.8.4 signature.asc Description: OpenPGP digital signature
Bug#704652: RFP: git-subtree -- subtree merge/split tool from git/contrib/subtree
Hi Jonathan, Any news on this topic? Thanks in advance, _g. Jonathan Nieder a écrit , Le 04/04/2013 06:04: Source: git Version: 1:1.8.2-1 Severity: wishlist Control: submitter -1 Thom Hastings tghasti...@gmail.com Hi Thom, Thom Hastings wrote: any idea when the latest git will be put into the experimental branch for amd64? i need it to do git subtrees Debian experimental currently has git 1.8.2, which is the latest released version. It doesn't install git-subtree to $PATH, though, and I suppose it should. Filing a bug as a reminder. Thanks for writing, Jonathan -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#704652: RFP: git-subtree -- subtree merge/split tool from git/contrib/subtree
Hi, pini wrote: [Subject: RFP: git-subtree -- subtree merge/split tool from git/contrib] Any news on this topic? Thanks for your interest. No news --- so if you know someone who's made the appropriate tweaks to debian/rules and tried it out, the patches would be welcome. ;-) See /usr/share/doc/git/README.source for more hints. If no one else gets to it, I'd still like to get this done, but it's not on the top of my list of things to do. Ciao, Jonathan -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#704652: RFP: git-subtree -- subtree merge/split tool from git/contrib/subtree
Source: git Version: 1:1.8.2-1 Severity: wishlist Control: submitter -1 Thom Hastings tghasti...@gmail.com Hi Thom, Thom Hastings wrote: any idea when the latest git will be put into the experimental branch for amd64? i need it to do git subtrees Debian experimental currently has git 1.8.2, which is the latest released version. It doesn't install git-subtree to $PATH, though, and I suppose it should. Filing a bug as a reminder. Thanks for writing, Jonathan -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
