[devscripts] 01/01: reset $origcount to 0 for each watch file

[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 a42e04faa95c39c8fc0902d0b8d0f953d6d55b34
Author: Osamu Aoki <osamu at debian.org>
Date:   Sat Aug 12 15:30:57 2017 -0400

    reset $origcount to 0 for each watch file
---
 debian/changelog | 1 +
 scripts/uscan.pl | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a6eb162..4dc0ebe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ devscripts (2.17.10) UNRELEASED; urgency=medium
   * uscan:
     + Fix the new package version regex for filenamemangle.  Closes: #869150
     + Fix example URL for pagemangle.  Closes: #864914
+    + Set $origcount to 0 for each watch file. Closes: #840232
 
  -- Mattia Rizzolo <mattia at debian.org>  Tue, 25 Jul 2017 14:18:24 +0200
 
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index e54b4e6..67b6894 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -4182,6 +4182,7 @@ sub process_watchfile ($$$$)
 	s/\@ARCHIVE_EXT\@/$archive_ext/g;
 	s/\@SIGNATURE_EXT\@/$signature_ext/g;
 
+    	$origcount = 0; # reset to 0 for each watch file
 	$status +=
 	    process_watchline($_, $watch_version, $dir, $package, $version,
 			      $watchfile);

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