diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2019-07-25 07:20:42 +0100 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2019-07-25 07:20:42 +0100 |
| commit | c3b21df9639ae811a7b8c436a34d558917526b47 (patch) | |
| tree | 96b68f3392b1a376bf487c53fafd3d215573ea36 /debian/rules | |
| parent | 839b666ac93688e2ef24c3fb7b1fbb0a0024bb33 (diff) | |
| parent | 97d91ead98b8c771271e1b6878b14db030932560 (diff) | |
Merge tag 'debian/9.5' into buster-bpo
dgit release 9.5 for unstable (sid) [dgit]
[dgit distro=debian no-split]
# gpg: Signature made Mon 22 Jul 2019 09:40:00 PM BST
# gpg: using RSA key 9B917007AE030E36E4FC248B695B7AE4BF066240
# gpg: Good signature from "Sean Whitton <spwhitton@spwhitton.name>" [ultimate]
# Primary key fingerprint: 8DC2 487E 51AB DD90 B5C4 753F 0F56 D055 3B6D 411B
# Subkey fingerprint: 9B91 7007 AE03 0E36 E4FC 248B 695B 7AE4 BF06 6240
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/debian/rules b/debian/rules index ea2ceac..4d1a760 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 @@ -42,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: @@ -63,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 @@ -71,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; \ @@ -78,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)}};' \ |