summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
1e94700)
The name is from when I thought it would actually mkdir. But it
doesn't. No overall functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
# $maindir_gitdir contains our main working "dgit", HEAD, etc.
# $maindir_gitcommon the shared stuff, including .objects
# $maindir_gitdir contains our main working "dgit", HEAD, etc.
# $maindir_gitcommon the shared stuff, including .objects
- # we need to invoke git-playtree-create via git because
+ # we need to invoke git-playtree-setup via git because
# there may be config options it needs which are only available
# to us, sensibly, in @git
# there may be config options it needs which are only available
# to us, sensibly, in @git
# @INC is conveniently available.
my $newpath = join ':', +(grep { !m/:/ } @INC),
'/usr/share/dgit', $ENV{PATH};
# @INC is conveniently available.
my $newpath = join ':', +(grep { !m/:/ } @INC),
'/usr/share/dgit', $ENV{PATH};
- runcmd qw(env), "PATH=$newpath", @git, qw(playtree-create .);
+ runcmd qw(env), "PATH=$newpath", @git, qw(playtree-setup .);
ensuredir '.git/info';
open GA, "> .git/info/attributes" or confess "$!";
ensuredir '.git/info';
open GA, "> .git/info/attributes" or confess "$!";
txtdocdir=$(prefix)/share/doc/dgit
absurddir=$(prefix)/share/dgit/absurd
txtdocdir=$(prefix)/share/doc/dgit
absurddir=$(prefix)/share/dgit/absurd
-PROGRAMS=dgit dgit-badcommit-fixup git-playtree-create
+PROGRAMS=dgit dgit-badcommit-fixup git-playtree-setup
MAN1PAGES=dgit.1
MAN7PAGES=dgit.7 \
MAN1PAGES=dgit.1
MAN7PAGES=dgit.7 \
-git-playtree-create /usr/share/git-debpush
+git-playtree-setup /usr/share/git-debpush
make install prefix=/usr DESTDIR=debian/dgit
make -C po install prefix=/usr DESTDIR=../debian/tmp \
SUPPRESS_PO_UPDATE=1 S=''
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-create debian/dgit/usr/share/dgit
+ mv debian/dgit/usr/bin/git-playtree-setup debian/dgit/usr/share/dgit
make -C po4a install DESTDIR=../debian/tmp S=''
override_dh_missing:
make -C po4a install DESTDIR=../debian/tmp S=''
override_dh_missing:
# # 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.
# # 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-create. In .debs, this
+# # 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); \
# # goes in the per-.deb @INC dir. See Dgit.pm::playtree_setup.
set -ex; \
base=debian/$(p); \
dst=$${base}$(globalperl)/$${mod}; \
mkdir -p $${dst%/*}; \
mv -f $$src $$dst; \
dst=$${base}$(globalperl)/$${mod}; \
mkdir -p $${dst%/*}; \
mv -f $$src $$dst; \
- install -m 755 git-playtree-create $${base}$(specperl); \
+ 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)}};' \
perl -i -p -e 'next unless m/###substituted###/;' \
-e 'next unless s/^# (?=unshift \@INC,)//;' \
-e 'die unless s{q\{\S+\}}{q{$(specperl)}};' \
# **** Helper functions and variables ****
us="$(basename $0)"
# **** Helper functions and variables ****
us="$(basename $0)"
-git_playtree_create=git-playtree-create ###substituted###
-git_playtree_create=${DEBPUSH_GIT_PLAYTREE_CREATE-$git_playtree_create}
+git_playtree_setup=git-playtree-setup ###substituted###
+git_playtree_setup=${DEBPUSH_GIT_PLAYTREE_SETUP-$git_playtree_setup}
cleanup() {
if [ -d "$temp" ]; then
cleanup() {
if [ -d "$temp" ]; then
: ${DGIT_INFRA_PFX:=$DGIT_TEST_INTREE${DGIT_TEST_INTREE:+/infra/}}
: ${DGIT_GITDEBREBASE_TEST:=$DGIT_TEST_INTREE/git-debrebase}
: ${DGIT_MANPAGES_SOURCE_DIR:=$DGIT_TEST_INTREE}
: ${DGIT_INFRA_PFX:=$DGIT_TEST_INTREE${DGIT_TEST_INTREE:+/infra/}}
: ${DGIT_GITDEBREBASE_TEST:=$DGIT_TEST_INTREE/git-debrebase}
: ${DGIT_MANPAGES_SOURCE_DIR:=$DGIT_TEST_INTREE}
- : ${DEBPUSH_GIT_PLAYTREE_CREATE:=$DGIT_TEST_INTREE/git-playtree-create}
+ : ${DEBPUSH_GIT_PLAYTREE_SETUP:=$DGIT_TEST_INTREE/git-playtree-setup}
export DGIT_TEST DGIT_BADCOMMIT_FIXUP
export DGIT_REPOS_SERVER_TEST DGIT_SSH_DISPATCH_TEST
export DGIT_TEST DGIT_BADCOMMIT_FIXUP
export DGIT_REPOS_SERVER_TEST DGIT_SSH_DISPATCH_TEST
- export DGIT_MANPAGES_SOURCE_DIR DEBPUSH_GIT_PLAYTREE_CREATE
+ export DGIT_MANPAGES_SOURCE_DIR DEBPUSH_GIT_PLAYTREE_SETUP
export PERLLIB="$DGIT_TEST_INTREE${PERLLIB:+:}${PERLLIB}"
}
export PERLLIB="$DGIT_TEST_INTREE${PERLLIB:+:}${PERLLIB}"
}