[devscripts] 01/02: Revert "origtargz: Add --force-download to uscan --download-current ..."

[Osamu Aoki]

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

osamu pushed a commit to branch master
in repository devscripts.

commit 32f43a977e84e695073356707f3aaa4e4d9f746d
Author: Osamu Aoki <osamu at debian.org>
Date:   Fri Sep 29 21:31:28 2017 +0900

    Revert "origtargz: Add --force-download to uscan --download-current ..."
    
    Let me fix this in uscan where the problem initiated.
    
    This reverts commit 8536b84385fc553c25a1bc600976a61213bc4841.
    
    Signed-off-by: Osamu Aoki <osamu at debian.org>
---
 debian/changelog     | 4 ----
 scripts/origtargz.pl | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6327c7f..31c02d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,10 +23,6 @@ devscripts (2.17.11) UNRELEASED; urgency=medium
   * debian/control: Add missing entry in package long description
     for reproducible-check.
 
-  [ Christoph Berg ]
-  * origtargz: Add --force-download to uscan --download-current version;
-    recent uscan versions require it.
-
  -- Chris Lamb <lamby at debian.org>  Wed, 27 Sep 2017 13:24:39 +0100
 
 devscripts (2.17.10) unstable; urgency=medium
diff --git a/scripts/origtargz.pl b/scripts/origtargz.pl
index 6a3cc52..535d91f 100755
--- a/scripts/origtargz.pl
+++ b/scripts/origtargz.pl
@@ -2,7 +2,7 @@
 #
 # origtargz: fetch the orig tarball of a Debian package from various sources,
 # and unpack it
-# Copyright (C) 2012-2017  Christoph Berg <myon at debian.org>
+# Copyright (C) 2012-2016  Christoph Berg <myon at debian.org>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -290,7 +290,7 @@ sub download_origtar ()
 
 	if (-f "debian/watch") {
 		print "Trying uscan --download-current-version ...\n";
-		system "uscan --download-current-version --force-download --rename\n";
+		system "uscan --download-current-version --rename\n";
 	}
 
 	if (my @f = glob "../${package}_$fileversion.orig.tar.*") {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git