[SCM] Git repository for devscripts branch, master, updated. v2.12.4-173-ge69abea

[James McCoy]

The following commit has been merged in the master branch:
commit e69abeacb6d278eaaadf75b45c30604abc45a718
Author: James McCoy <jamessan at debian.org>
Date:   Sat Mar 9 20:16:02 2013 -0500

    debdiff: Handle control files with odd permissions.
    
    Closes: #702610
    Signed-off-by: James McCoy <jamessan at debian.org>

diff --git a/debian/changelog b/debian/changelog
index b69a646..e2baf2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ devscripts (2.13.1) UNRELEASED; urgency=low
   [ Benjamin Drung ]
   * wnpp-check: Correct download links to fix regression from previous release.
 
+  [ James McCoy ]
+  * debdiff: Handle control files with odd permissions.  Thanks to Julian
+    Gilbey for the patch.  (Closes: #702610)
+
  -- Benjamin Drung <bdrung at debian.org>  Tue, 19 Feb 2013 17:22:32 +0100
 
 devscripts (2.13.0) experimental; urgency=low
diff --git a/scripts/debdiff.pl b/scripts/debdiff.pl
index 6ceee8f..57f7a77 100755
--- a/scripts/debdiff.pl
+++ b/scripts/debdiff.pl
@@ -1018,6 +1018,7 @@ sub wdiff_control_files($$$$$)
 		    }
 		}
 		close $fd;
+		chmod 0644, $file;
 		open $fd, '>', $file or fatal "Cannot write $file: $!";
 		print $fd sort @hdrs;
 		close $fd;
diff --git a/test/Makefile b/test/Makefile
index 8aea6fe..7b10a5c 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -3,6 +3,7 @@ test:
 	./test_checkbashisms
 	./test_dd-list
 	./test_debchange
+	./test_debdiff
 	./test_licensecheck
 
 online-test:
diff --git a/test/debdiff/devscripts_2.13.0_any.deb b/test/debdiff/devscripts_2.13.0_any.deb
new file mode 100644
index 0000000..3ba462c
Binary files /dev/null and b/test/debdiff/devscripts_2.13.0_any.deb differ
diff --git a/test/debdiff/devscripts_2.13.1_any.deb b/test/debdiff/devscripts_2.13.1_any.deb
new file mode 100644
index 0000000..5a58db1
Binary files /dev/null and b/test/debdiff/devscripts_2.13.1_any.deb differ
diff --git a/test/test_dd-list b/test/test_debdiff
similarity index 71%
copy from test/test_dd-list
copy to test/test_debdiff
index e9619ac..8f168ba 100755
--- a/test/test_dd-list
+++ b/test/test_debdiff
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2012, James McCoy <jamessan at debian.org>
+# Copyright (C) 2013, James McCoy <jamessan 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
@@ -16,18 +16,18 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 if test "$1" = --installed; then
-    COMMAND=dd-list
+    COMMAND=debdiff
     shift
 else
-    COMMAND="../scripts/dd-list.pl"
+    COMMAND="../scripts/debdiff.pl"
 fi
 
 WORKDIR="$(readlink -f "${0%/*}")"
 
-testBinariesFromSameSource() {
-  $COMMAND -s ${WORKDIR}/dd-list/sources vim-gtk vim-nox 2>&1 >/dev/null
+test() {
+  $COMMAND ${WORKDIR}/debdiff/devscripts_2.13.0_any.deb ${WORKDIR}/debdiff/devscripts_2.13.1_any.deb >/dev/null 2>/dev/null
   rc=$?
-  assertEquals 'packages found' 0 $rc
+  assertEquals 'difference found, no errors' 1 $rc
 }
 
 . shunit2

-- 
Git repository for devscripts