X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Frules;h=4d1a760274e419a93444c3e98291881f28839ab9;hb=HEAD;hp=9c2afb38b2ce68ae7634f51902230cc2428db50e;hpb=5805ac6d5c891d90c6a5edc2fb10b5269e41203f;p=dgit.git

diff --git a/debian/rules b/debian/rules
index 9c2afb38..4d1a7602 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,6 +43,7 @@ override_dh_auto_install: specpkg_install_gdp \
 	make install prefix=/usr DESTDIR=debian/dgit
 	make -C po install prefix=/usr DESTDIR=../debian/tmp \
 		SUPPRESS_PO_UPDATE=1 S=''
+	mv debian/dgit/usr/bin/git-playtree-setup debian/dgit/usr/share/dgit
 	make -C po4a install DESTDIR=../debian/tmp S=''
 
 override_dh_missing:
@@ -64,6 +65,9 @@ specpkg_install_gdp: tok=gdp
 specpkg_install_gdp: specperl=/usr/share/dgit/gdp/perl5
 specpkg_install_gdp:
 	$(specpkg_install_common)
+	set -x; perl -i -pe 'next unless m/###substituted###/;' \
+ -e 's{^(git_playtree_setup)=.*}{$$1=/usr/share/$p/git-playtree-setup};' \
+		debian/$(p)/usr/bin/*
 
 specpkg_install_%: tok=$*
 specpkg_install_%: specperl=/usr/share/dgit/$(tok)/perl5
@@ -72,6 +76,8 @@ specpkg_install_%:
 #	# Most of the Perl modules in this package live in
 #	# $(specperl).  The exception is Debian::Dgit::Infra, which
 #	# lives in $(globalperl) and adds $(specperl) to @INC.
+#	# We also abuse this for git-playtree-setup.  In .debs, this
+#	# goes in the per-.deb @INC dir.  See Dgit.pm::playtree_setup.
 	set -ex; \
 	 base=debian/$(p); \
 	 mod=Debian/Dgit/$(pm).pm; \
@@ -79,6 +85,7 @@ specpkg_install_%:
 	 dst=$${base}$(globalperl)/$${mod}; \
 	 mkdir -p $${dst%/*}; \
 	 mv -f $$src $$dst; \
+	 install -m 755 git-playtree-setup $${base}$(specperl); \
 	 perl -i -p -e 'next unless m/###substituted###/;' \
 		-e 'next unless s/^# (?=unshift \@INC,)//;' \
 		-e 'die unless s{q\{\S+\}}{q{$(specperl)}};' \