X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Frules;h=4d1a760274e419a93444c3e98291881f28839ab9;hb=d12484c1ff2e57d1bf6f0ad5f9604fa4059ffa6d;hp=baff8f897a2b35d12f6c1db02675507b49656141;hpb=93c90551df21fc7df60ade835e29bdbe91f65744;p=dgit.git

diff --git a/debian/rules b/debian/rules
index baff8f89..4d1a7602 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,8 @@
 # dgit
 # Integration between git and Debian-style archives
 #
-# Copyright (C)2013-2016 Ian Jackson
+# Copyright (C)2013-2019 Ian Jackson
+# Copyright (C)2019      Sean Whitton
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -30,10 +31,25 @@ override_dh_gencontrol:
 	 v=$$(perl -ne 'print if s/^version:\s+//i' DEBIAN/control); \
 	 perl -i -pe "s/UNRELEASED/$$v/g if m/###substituted###/" usr/bin/dgit
 
+override_dh_auto_clean:
+	dh_auto_clean
+	make -C po clean
+
 globalperl=/usr/share/perl5
 
-override_dh_auto_install: specpkg_install_gdr specpkg_install_infra
+override_dh_auto_install: specpkg_install_gdp \
+ specpkg_install_gdr \
+ specpkg_install_infra
 	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:
+	dh_missing --fail-missing
+
+specpkg_install_gdp: p=git-debpush
 
 specpkg_install_gdr: p=git-debrebase
 specpkg_install_gdr: pm=GDR
@@ -41,13 +57,27 @@ specpkg_install_gdr: pm=GDR
 specpkg_install_infra: p=dgit-infrastructure
 specpkg_install_infra: pm=Infra
 
+define specpkg_install_common
+	make install-$(tok) prefix=/usr DESTDIR=debian/$(p) perldir=$(specperl)
+endef
+
+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
 specpkg_install_%:
-	make install-$(tok) prefix=/usr DESTDIR=debian/$(p) perldir=$(specperl)
+	$(specpkg_install_common)
 #	# 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; \
@@ -55,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)}};' \