Commit 54456cb6 authored by Axel Beckert's avatar Axel Beckert

Backwards-compatible transition from git-import-* to gbp-import-*

parent 109c277b
......@@ -123,7 +123,7 @@ See L<dpt-gen-itp(1)>.
See L<dpt-get-ubuntu-packages(1)>.
=item B<import-orig> - git-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)>.
......
......@@ -45,6 +45,9 @@ pkg-perl-tools (0.5) UNRELEASED; urgency=low
* Add build dependency on spell checkers. Needed by t/spelling.st.
* Add more stopwords to t/spelling.st.
[ Axel Beckert ]
* Backwards-compatible transition from git-import-* to gbp-import-*
-- gregor herrmann <gregoa@debian.org> Sun, 27 Oct 2013 22:32:09 +0100
pkg-perl-tools (0.4) unstable; urgency=low
......
......@@ -34,7 +34,11 @@ UTAG="$(git tag | grep -x "$UVERSION" || git tag | grep -x "v$UVERSION" || git t
UNAME=$(awk '/Upstream-Name:/ {print $2;}' debian/copyright)
# download and import
git-import-orig --uscan --pristine-tar ${UTAG:+--upstream-vcs-tag="$UTAG"}
if [ -x /usr/bin/gbp-import-orig ]; then
gbp-import-orig --uscan --pristine-tar ${UTAG:+--upstream-vcs-tag="$UTAG"}
else
git-import-orig --uscan --pristine-tar ${UTAG:+--upstream-vcs-tag="$UTAG"}
fi
# cleanup on request
if [ -n "$DPT_RM_TARGZ" ] ; then
......@@ -45,7 +49,7 @@ fi
POD=<<'EOF'
=head1 NAME
dpt-import-orig - git-import-orig wrapper with upstream tracking support
dpt-import-orig - gbp-import-orig wrapper with upstream tracking support
=head1 SYNOPSIS
......@@ -53,7 +57,7 @@ B<dpt import-orig>
=head1 DESCRIPTION
B<dpt import-orig> is a wrapper around B<git-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,11 @@ while ( my $r = pop @releases ) {
}
}
run([ 'git-import-orig', '--no-merge',
'--pristine-tar', "--upstream-version=$version",
run([ (-x '/usr/bin/gbp-import-orig' ? 'gbp-import-orig' : 'git-import-orig'),
'--no-merge', '--pristine-tar', "--upstream-version=$version",
$filename
]
) or die "git-import-orig failed";
) or die "gbp-import-orig failed";
say "$me: $source\_$version.orig.tar.gz imported.";
}
......@@ -187,7 +187,7 @@ that have no corresponding tags like C<upstream/x.y.z>.
For each missing tag, an attempt is made to download the upstream sources from
L<http://snapshot.debian.org/> and then put them in version control using
L<git-import-orig(1)>.
L<gbp-import-orig(1)>.
If the C<upstream> branch is also not present, it is either created from the
remote repository, or, if it is not present on the remote repository, created
......
......@@ -92,7 +92,11 @@ EOF
apt-get source -t unstable -d $PACKAGE
cd $TOP/packages
git-import-dsc --pristine-tar $TMP/$PACKAGE*.dsc
if [ -x /usr/bin/gbp-import-dsc ]; then
gbp-import-dsc --pristine-tar $TMP/$PACKAGE*.dsc
else
git-import-dsc --pristine-tar $TMP/$PACKAGE*.dsc
fi
fi
cd $PACKAGE
......@@ -161,7 +165,7 @@ maintenance by the Debian Perl group.
B<dpt takeover> first creates a local Git repository either from existing Git
repository specified with the B<-g> option, or by importing the current package
available in Debian/unstable via L<git-import-dsc(1)>.
available in Debian/unstable via L<gbp-import-dsc(1)>.
Next B<dpt takeover> adds suitable entries to F<debian/changelog>, using
information given by the B<-m> or the B<-a> options.
......@@ -196,7 +200,7 @@ Conflicts with B<-m>.
=item B<-g> I<URL>
URL of an existing Git repository to clone. If not present L<git-import-dsc> is
URL of an existing Git repository to clone. If not present L<gbp-import-dsc> is
used to prime the local Git repository from the package available in the Debian
archive.
......
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