[pkg-perl-tools] 01/01: Replace calls to "gbp-something" with "gbp something" to support gbp ≥ 0.6.24.

[Axel Beckert]

This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch master
in repository pkg-perl-tools.

commit 97e31e3c80052cea4dcd1d0be4d6913a46430500
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Mon Apr 27 19:44:24 2015 +0200

    Replace calls to "gbp-something" with "gbp something" to support gbp ≥ 0.6.24.
---
 bin/dpt                  | 2 +-
 debian/changelog         | 4 ++++
 scripts/checkout         | 4 ++--
 scripts/import-orig      | 6 +++---
 scripts/missing-upstream | 6 ++++--
 scripts/takeover         | 4 ++--
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/bin/dpt b/bin/dpt
index 4666512..4b4348c 100755
--- a/bin/dpt
+++ b/bin/dpt
@@ -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)>.
 
diff --git a/debian/changelog b/debian/changelog
index 6d0f083..087b629 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 at debian.org>  Mon, 13 Oct 2014 21:24:50 +0200
 
 pkg-perl-tools (0.19) unstable; urgency=medium
diff --git a/scripts/checkout b/scripts/checkout
index daf91c4..73d17bc 100755
--- a/scripts/checkout
+++ b/scripts/checkout
@@ -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
diff --git a/scripts/import-orig b/scripts/import-orig
index 7ba01f7..9ec3ecc 100755
--- a/scripts/import-orig
+++ b/scripts/import-orig
@@ -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.
 
diff --git a/scripts/missing-upstream b/scripts/missing-upstream
index a1f8310..88732f9 100755
--- a/scripts/missing-upstream
+++ b/scripts/missing-upstream
@@ -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.";
 }
diff --git a/scripts/takeover b/scripts/takeover
index d9d1507..56b3cd8 100755
--- a/scripts/takeover
+++ b/scripts/takeover
@@ -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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/pkg-perl-tools.git