[devscripts] 01/02: uscan: fix regression in uscan when --destdir is set

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository devscripts.

commit e13eaad1c972cd7540bb5a3ba1ca24bc12cfb5e9
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Jan 5 13:03:54 2016 -0200

    uscan: fix regression in uscan when --destdir is set
    
    Closes: #809662
    
    Patch by Alex Mestiashvili <mailatgoogl at gmail.com>
---
 debian/changelog | 9 +++++++++
 scripts/uscan.pl | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ffdae82..0451e4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+devscripts (2.15.11) UNRELEASED; urgency=medium
+
+  [ Antonio Terceiro ]
+  * uscan:
+    - fix regression in uscan when --destdir is set (Closes: #809662)
+      Patch by Alex Mestiashvili <mailatgoogl at gmail.com>
+
+ -- Antonio Terceiro <terceiro at debian.org>  Tue, 05 Jan 2016 13:01:05 -0200
+
 devscripts (2.15.10) unstable; urgency=low
 
   [ Benjamin Drung ]
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index f1a7014..3e704b0 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -3702,8 +3702,8 @@ EOF
     }
     my $umd5sum = Digest::MD5->new;
     my $omd5sum = Digest::MD5->new;
-    open (my $ufh, '<', "../${newfile_base}") or die "Can't open '${newfile_base}': $!";
-    open (my $ofh, '<', "../${target}") or die "Can't open '${target}': $!";
+    open (my $ufh, '<', "${destdir}/${newfile_base}") or die "Can't open '${destdir}/${newfile_base}': $!";
+    open (my $ofh, '<', "${destdir}/${target}") or die "Can't open '${destdir}/${target}': $!";
     $umd5sum->addfile($ufh);
     $omd5sum->addfile($ofh);
     close($ufh);

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