[SCM] Git repository for devscripts branch, master, updated. v2.11.3-4-g76227af

[Adam D. Barratt]

The following commit has been merged in the master branch:
commit 76227af1ee8d68f4844f642325eac903ca21e739
Author: Adam D. Barratt <a...@adam-barratt.org.uk>
Date:   Sun Feb 12 20:58:10 2012 +0000

    debdiff: Fix a regression in the handling of embedded tarballs (a side 
effect of the changes introduced to resolve #571528).

diff --git a/debian/changelog b/debian/changelog
index ff4712b..9ac66a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ devscripts (2.11.4) UNRELEASED; urgency=low
     because apt-cache policy does not output port numbers in URLs
     (Closes: #601951)
 
+  [ Adam D. Barratt ]
+  * debdiff: Fix a regression in the handling of embedded tarballs (a side
+    effect of the changes introduced to resolve #571528).
+
  -- James McCoy <james...@debian.org>  Wed, 18 Jan 2012 20:25:01 -0500
 
 devscripts (2.11.3) unstable; urgency=low
diff --git a/scripts/debdiff.pl b/scripts/debdiff.pl
index 24d0670..fa0c367 100755
--- a/scripts/debdiff.pl
+++ b/scripts/debdiff.pl
@@ -586,7 +586,7 @@ elsif ($type eq 'dsc') {
                              chdir => "$diri/$sdiri",
                              nocheck => 1);
                        if (-d "$diri/$sdiri/$filename") {
-                           move "$diri/$sdiri/$filename", $unpacked;
+                           move "$diri/$sdiri/$filename", 
"$diri/$sdiri/$unpacked";
                        }
                    }
            }

-- 
Git repository for devscripts


-- 
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.