This is an automated email from the git hooks/post-receive script. osamu pushed a commit to branch master in repository devscripts.
commit dae1f81ab1f5f5d2c6c68616e6fef438091717ec Author: Osamu Aoki <[email protected]> Date: Wed Mar 2 21:23:26 2016 +0900 uscan: destdir support for version 4 Closes: #814686 --- debian/changelog | 1 + scripts/uscan.pl | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1eef0b5..2036c09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ devscripts (2.16.2) UNRELEASED; urgency=medium + Fix glitches around rules such as "s<...> <...>g" and add their tests. + Reactivate --no-verbose mode. Closes: #815645 + + Fix --destdir for version 4. Closes:#814686 [ Dominique Dumont ] * licensecheck: diff --git a/scripts/uscan.pl b/scripts/uscan.pl index 7233f4f..f7d21c7 100755 --- a/scripts/uscan.pl +++ b/scripts/uscan.pl @@ -1686,12 +1686,12 @@ Gilbey. use 5.010; # defined-or (//) use strict; use warnings; -use Cwd; -use Cwd 'abs_path'; +use Cwd qw/cwd abs_path/; use Dpkg::Changelog::Parse qw(changelog_parse); use Dpkg::IPC; use File::Basename; -use File::Copy; +use File::Copy qw/copy/; +use File::Spec qw/catfile/; use File::Temp qw/tempfile tempdir/; use List::Util qw/first/; use filetest 'access'; @@ -1893,6 +1893,7 @@ my $exclusion = 1; my $origcount = 0; my @components = (); my $orig; +my @origtars = (); my $repacksuffix_used = 0; my $uscanlog; my $common_newversion ; # undef initially (for MUT, version=same) @@ -3713,6 +3714,7 @@ EOF $common_mangled_newversion = $1 if $target =~ m/[^_]+_(.+)\.orig\.tar\.(?:gz|bz2|lzma|xz)$/; uscan_verbose "New orig.tar.* tarball version (after mk-origtargz): $common_mangled_newversion\n"; } + push @origtars, $target; if ($opt_log) { # Check pkg-ver.tar.gz and pkg_ver.orig.tar.gz @@ -3773,6 +3775,11 @@ EOF } } push @cmd, "--upstream-version", $common_mangled_newversion; + if (abs_path($destdir) ne abs_path("..")) { + foreach my $origtar (@origtars) { + copy(catfile($destdir, $origtar), catfile("..", $origtar)); + } + } } elsif ($watch_version > 1) { # Any symlink requests are already handled by uscan if ($cmd[0] eq "uupdate") { @@ -4063,6 +4070,7 @@ sub process_watchfile ($$$$) my $status=0; my $nextline; %dehs_tags = (); + @origtars = (); uscan_verbose "Process $dir/$watchfile (package=$package version=$version)\n"; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git _______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
