[devscripts] 02/03: Fix a few merge issues

[James McCoy]

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

jamessan pushed a commit to branch jessie-backports
in repository devscripts.

commit df372ae800cba98e58c972472054079ae2eeaeef
Author: James McCoy <jamessan at debian.org>
Date:   Thu Feb 18 21:41:27 2016 -0500

    Fix a few merge issues
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 scripts/uscan.pl       | 7 -------
 scripts/uupdate.1      | 3 ---
 test/test_licensecheck | 4 ----
 3 files changed, 14 deletions(-)

diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 1d52cd7..d78ec94 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -2708,7 +2708,6 @@ sub process_watchline ($$$$$$)
     # And mangle it if requested
     my $mangled_lastversion = $lastversion;
     foreach my $pat (@{$options{'dversionmangle'}}) {
-	print STDERR "$progname debug: dversionmangle rule $pat\n" if $debug;
 	if (! safe_replace(\$mangled_lastversion, $pat)) {
 	    uscan_warn "In $watchfile, potentially"
 	      . " unsafe or malformed dversionmangle"
@@ -2966,7 +2965,6 @@ sub process_watchline ($$$$$$)
 				    $href =~ m&^$_pattern$&);
 			}
 			foreach my $pat (@{$options{'uversionmangle'}}) {
-			    print STDERR "$progname debug: uversionmangle rule $pat\n" if $debug;
 			    if (! safe_replace(\$mangled_version, $pat)) {
 				uscan_warn "In $watchfile, potentially"
 			 	 . " unsafe or malformed uversionmangle"
@@ -3053,7 +3051,6 @@ sub process_watchline ($$$$$$)
 		my $file = $1;
 		my $mangled_version = join(".", $file =~ m/^$pattern$/);
 		foreach my $pat (@{$options{'uversionmangle'}}) {
-		    print STDERR "$progname debug: uversionmangle rule $pat\n" if $debug;
 		    if (! safe_replace(\$mangled_version, $pat)) {
 			uscan_warn "In $watchfile, potentially"
 			  . " unsafe or malformed uversionmangle"
@@ -3085,7 +3082,6 @@ sub process_watchline ($$$$$$)
 		    my $file = $1;
 		    my $mangled_version = join(".", $file =~ m/^$filepattern$/);
 		    foreach my $pat (@{$options{'uversionmangle'}}) {
-			print STDERR "$progname debug: uversionmangle rule $pat\n" if $debug;
 			if (! safe_replace(\$mangled_version, $pat)) {
 			    uscan_warn "In $watchfile, potentially"
 			      . " unsafe or malformed uversionmangle"
@@ -3163,8 +3159,6 @@ EOF
 	    return 1;
 	}
     }
-    print STDERR "$progname debug: new version $newversion\n" if $debug;
-    print STDERR "$progname debug: new filename $newfile\n" if $debug;
 
     # Determin download URL for tarball or signature
     my $upstream_url;
@@ -3227,7 +3221,6 @@ EOF
 	uscan_verbose "Matching target for downloadurlmangle: $upstream_url\n";
 	if (exists $options{'downloadurlmangle'}) {
 	    foreach my $pat (@{$options{'downloadurlmangle'}}) {
-		print STDERR "$progname debug: downloadurlmangle rule $pat\n" if $debug;
 		if (! safe_replace(\$upstream_url, $pat)) {
 		    uscan_warn "In $watchfile, potentially"
 		      . " unsafe or malformed downloadurlmangle"
diff --git a/scripts/uupdate.1 b/scripts/uupdate.1
index fe189eb..d7cfb0d 100644
--- a/scripts/uupdate.1
+++ b/scripts/uupdate.1
@@ -81,9 +81,6 @@ Simply create a symlink when moving a new upstream \fI.tar.gz\fR
 archive to the new \fI<package>_<version>.orig.tar.gz\fR location.
 This is the default behaviour.
 .TP
-.B \-\-verbose
-Give verbose output.
-.TP
 \fB\-\-no\-symlink\fR
 Copy the upstream \fI.tar.gz\fR to the new location instead of making
 a symlink, if \fI<package>_<version>.orig.tar.gz\fR is missing.  
diff --git a/test/test_licensecheck b/test/test_licensecheck
index 19700aa..67e97aa 100755
--- a/test/test_licensecheck
+++ b/test/test_licensecheck
@@ -75,10 +75,6 @@ testDuplicatedCopyright() {
     license2 "-m --copyright" "duplicated-copyright.rb" "Apache (v2.0)	2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs"
 }
 
-testDuplicatedCopyright() {
-    license2 "-m --copyright" "duplicated-copyright.rb" "Apache (v2.0)	2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs"
-}
-
 testLGPL() {
     license "lgpl-2.1.c" "LGPL (v2.1)"
     license "lgpl-2.1.h" "LGPL (v2.1)"

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