Commit 97e31e3c authored by Axel Beckert's avatar Axel Beckert

Replace calls to "gbp-something" with "gbp something" to support gbp ≥ 0.6.24.

parent f3067d6b
......@@ -127,7 +127,7 @@ See L<dpt-gen-itp(1)>.
See L<dpt-get-ubuntu-packages(1)>.
=item B<import-orig> - gbp-import-orig wrapper with upstream tracking support
=item B<import-orig> - "gbp import-orig" wrapper with upstream tracking support
See L<dpt-import-orig(1)>.
......
......@@ -44,6 +44,10 @@ pkg-perl-tools (0.20) UNRELEASED; urgency=medium
* check-build: Strip as well udebs when choosing to strip
arch:any .debs
[ Axel Beckert ]
* Replace all command calls with "gbp-something" with "gbp something" to
support git-buildpackage ≥ 0.6.24.
-- gregor herrmann <gregoa@debian.org> Mon, 13 Oct 2014 21:24:50 +0200
pkg-perl-tools (0.19) unstable; urgency=medium
......
......@@ -18,10 +18,10 @@ for pkg in "$@"; do
if [ -d "$pkg" ]; then
echo "Updating existing checkout in ${DPT_PACKAGES}/$pkg"
cd "$pkg"
gbp-pull
gbp pull
cd - > /dev/null
else
gbp-clone --all git+ssh://git.debian.org/git/pkg-perl/packages/$pkg.git
gbp clone --all git+ssh://git.debian.org/git/pkg-perl/packages/$pkg.git
echo "$pkg ready in ${DPT_PACKAGES}/$pkg"
fi
......
......@@ -28,7 +28,7 @@ if git remote show | grep -qx upstream-repo ; then
git fetch upstream-repo
fi
gbp-pull
gbp pull
# uscan and versions
PKG="$(dpkg-parsechangelog --show-field Source)"
......@@ -72,7 +72,7 @@ fi
POD=<<'EOF'
=head1 NAME
dpt-import-orig - gbp-import-orig wrapper with upstream tracking support
dpt-import-orig - "gbp import-orig" wrapper with upstream tracking support
=head1 SYNOPSIS
......@@ -80,7 +80,7 @@ B<dpt import-orig>
=head1 DESCRIPTION
B<dpt import-orig> is a wrapper around B<gbp-import-orig> using its
B<dpt import-orig> is a wrapper around B<gbp import-orig> using its
B<--uscan> and B<--upstream-vcs-tag> options to fetch and import tarballs
and link to upstream Git tags.
......
......@@ -156,11 +156,13 @@ while ( my $r = pop @releases ) {
}
}
run([ (-x '/usr/bin/gbp-import-orig' ? 'gbp-import-orig' : 'git-import-orig'),
my @gbp_import_orig_cmd =
-x '/usr/bin/gbp' ? qw(gbp import-orig) : qw(git-import-orig);
run([ @gbp_import_orig_cmd,
'--no-merge', '--pristine-tar', "--upstream-version=$version",
$filename
]
) or die "gbp-import-orig failed";
) or die join(' ', @gbp_import_orig_cmd).' failed';
say "$me: $source\_$version.orig.tar.gz imported.";
}
......
......@@ -97,8 +97,8 @@ EOF
apt-get source -t unstable -d $PACKAGE
cd $TOP/packages
if [ -x /usr/bin/gbp-import-dsc ]; then
gbp-import-dsc --pristine-tar $TMP/$PACKAGE*.dsc
if [ -x /usr/bin/gbp ]; then
gbp import-dsc --pristine-tar $TMP/$PACKAGE*.dsc
else
git-import-dsc --pristine-tar $TMP/$PACKAGE*.dsc
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment