[SCM] Git repository for devscripts branch, master, updated. v2.11.7-50-g2f4da1d

Benjamin Drung bdrung at debian.org
Thu May 31 13:22:02 UTC 2012


The following commit has been merged in the master branch:
commit 7b927cd8a03b21e808c970faa37d29742d322dd9
Author: Thijs Kinkhorst <thijs at debian.org>
Date:   Wed Apr 11 13:53:09 2012 +0200

    Do not generate warnings when debdiff'ing dpkg source format 3.0 (git).
    
    For the purposes of debdiff, the git bundle can be considered the
    filename of the orig tarball. This prevents warnings when @origs
    is later used to compare filenames of the old and new package.

diff --git a/scripts/debdiff.pl b/scripts/debdiff.pl
index b80c945..7857836 100755
--- a/scripts/debdiff.pl
+++ b/scripts/debdiff.pl
@@ -500,7 +500,7 @@ elsif ($type eq 'dsc') {
 		if ($file =~ /\.diff\.gz$/) {
 		    $diffs[$i] = cwd() . '/' . $file;
 		}
-		elsif ($file =~ /(?:\.orig)?\.tar\.$compression_re_file_ext$/) {
+		elsif ($file =~ /((?:\.orig)?\.tar\.$compression_re_file_ext|\.git)$/) {
 		    $origs[$i] = $file;
 		}
 	    } else {

-- 
Git repository for devscripts



More information about the devscripts-devel mailing list