[pkg-perl-tools] 01/01: Treat a "dpt import-orig" parameter as orig tar ball

[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 d3ea7ef90b6e25586355c1e082818e00ebe85128
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Thu May 26 01:08:50 2016 +0200

    Treat a "dpt import-orig" parameter as orig tar ball
    
    Pass it instead of "--uscan" to "gbp import-orig".
    
    Needed in case a newer upstream release has a (from dpkg's point of
    view) lower version number.
---
 debian/changelog    | 6 ++++++
 scripts/import-orig | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d4ae3f7..fc7cff5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
 pkg-perl-tools (0.31) UNRELEASED; urgency=medium
 
+  [ gregor herrmann ]
   * scripts/forward: change YAML::XS loading/usage
 
+  [ Axel Beckert ]
+  * Treat a "dpt import-orig" parameter as orig tar ball and pass it
+    instead of "--uscan" to "gbp import-orig". Needed if a newer upstream
+    release has a (from dpkg's point of view) lower version number.
+
  -- gregor herrmann <gregoa at debian.org>  Mon, 23 May 2016 22:37:41 +0200
 
 pkg-perl-tools (0.30) unstable; urgency=medium
diff --git a/scripts/import-orig b/scripts/import-orig
index 5b909bd..eed7ffd 100755
--- a/scripts/import-orig
+++ b/scripts/import-orig
@@ -53,7 +53,7 @@ fi
 # we're using --no-interactive here because
 # the dpt() shell function and "gbp import-orig"
 # don't play well together (waiting for input before showing the question)
-${IMPORT_CMD} --no-interactive --uscan --pristine-tar ${UTAG:+--upstream-vcs-tag="$UTAG"}
+${IMPORT_CMD} --no-interactive --pristine-tar ${UTAG:+--upstream-vcs-tag="$UTAG"} ${1:---uscan}
 
 # Create a changelog entry as a start, and to un-confuse git-dch later
 DVERSION="$(dpkg-parsechangelog --show-field Version)"

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