[SCM] Git repository for devscripts branch, master, updated. v2.12.4-112-g10d124a

[James McCoy]

The following commit has been merged in the master branch:
commit 10d124a6558ef59100ec57cbdbc7a5793a400912
Author: Cyril Brulebois <kibi at debian.org>
Date:   Fri Dec 14 11:35:46 2012 +0100

    Don't auto reverse diffs when the same version is passed and when DEBDIFF_AUTO_VER_SORT=yes
    
    Closes: #650732
    Signed-off-by: Cyril Brulebois <kibi at debian.org>
    Signed-off-by: James McCoy <jamessan at debian.org>

diff --git a/debian/changelog b/debian/changelog
index aaa22ab..7eae30a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,10 @@ devscripts (2.12.6+exp1) UNRELEASED; urgency=low
   * debian/control: Mark devscripts Multi-Arch: foreign.
     Thanks to Colin Watson. (Closes: #694760)
 
+  [ Cyril Brulebois ]
+  * Don't auto reverse diffs when DEBDIFF_AUTO_VER_SORT is set to yes, and
+    when the version in both packages is the same. (Closes: #650732)
+
  -- James McCoy <jamessan at debian.org>  Sat, 15 Sep 2012 16:12:16 -0400
 
 devscripts (2.12.6) unstable; urgency=low
diff --git a/scripts/debdiff.pl b/scripts/debdiff.pl
index 2ec4a81..6ceee8f 100755
--- a/scripts/debdiff.pl
+++ b/scripts/debdiff.pl
@@ -516,7 +516,7 @@ elsif ($type eq 'dsc') {
 
     @versions = Devscripts::Versort::versort(@versions);
     # If the versions are currently out of order, should we swap them?
-    if ($auto_ver_sort and !$guessed_version and $versions[0][1] == 1) {
+    if ($auto_ver_sort and !$guessed_version and $versions[0][1] == 1 and $versions[0][0] ne $versions[1][0]) {
 	foreach my $var ((\@origs, \@diffs, \@dscs, \@dscformats)) {
 	    my $temp = @{$var}[1];
 	    @{$var}[1] = @{$var}[2];

-- 
Git repository for devscripts