git-playtree-setup: Provide to git-debpush

Not used yet, so no overall functional change to the script.
The .deb has a new file.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

diff --git a/debian/git-debpush.install b/debian/git-debpush.install
new file mode 100644 (file)
index 0000000..563b42f
--- /dev/null
+++ b/debian/git-debpush.install
@@ -0,0 +1 @@
+git-playtree-create    /usr/share/git-debpush

diff --git a/debian/rules b/debian/rules
index 4e44118d8b245efb21a643b9de798e45c980489e..6ce2c3b02a6d0ab21ec559e7914096c3da807639 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -65,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

diff --git a/git-debpush b/git-debpush
index 1bfb0936c2e934087b50e4a2f3ec482e0af3cb37..ca737d20a97fd341dff16a10d46329b62e60dfac 100755 (executable)
--- a/git-debpush
+++ b/git-debpush
@@ -38,6 +38,7 @@ set -o pipefail
 # **** Helper functions and variables ****
 
 us="$(basename $0)"
+git_playtree_create=git-playtree-create ###substituted###
 
 cleanup() {
     if [ -d "$temp" ]; then