The following commit has been merged in the master branch:
commit 2995d146ddd26d479740a7b6934f7ad349139730
Author: James Vega <[email protected]>
Date: Fri Dec 24 01:18:30 2010 -0500
Add “target” element to --dehs' XML.
Closes: #598514
Signed-off-by: James Vega <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index 44123cc..8eed35a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,11 @@ devscripts (2.10.70) UNRELEASED; urgency=low
binary independent packages.
* pts-subscribe: Handle “--until 0” the same as “--forever”. (Closes:
#604740)
- * uscan: Update documentation to use “.+” instead of “.*” in groupings.
- Thanks to Ben Finney for the patch. (Closes: #606060)
+ * uscan:
+ + Update documentation to use “.+” instead of “.*” in groupings. Thanks
+ to Ben Finney for the patch. (Closes: #606060)
+ + Add “target” element to --dehs' XML, specifying the name of the
+ downloaded file. (Closes: #598514)
* debcheckout: Use the correct prototype for set_destdir. (Closes: #606053)
-- James Vega <[email protected]> Thu, 02 Dec 2010 20:27:34 -0500
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 3c95f34..b69170d 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -1418,17 +1418,23 @@ EOF
} elsif ($dehs) {
my $msg = "Successfully downloaded updated package $newfile_base";
if ($newfile_base =~ /\.(tar\.gz|tgz)$/) {
+ $dehs_tags{'target'} = "${pkg}_${newversion}.orig.tar.gz";
if ($symlink eq 'symlink') {
$msg .= " and symlinked ${pkg}_${newversion}.orig.tar.gz to it";
} elsif ($symlink eq 'rename') {
$msg .= " and renamed it as ${pkg}_${newversion}.orig.tar.gz";
+ } else {
+ $dehs_tags{'target'} = $newfile_base;
}
}
elsif ($newfile_base =~ /\.(tar\.bz2|tbz2?)$/) {
+ $dehs_tags{'target'} = "${pkg}_${newversion}.orig.tar.bz2";
if ($symlink eq 'symlink') {
$msg .= " and symlinked ${pkg}_${newversion}.orig.tar.bz2 to
it";
} elsif ($symlink eq 'rename') {
$msg .= " and renamed it as ${pkg}_${newversion}.orig.tar.bz2";
+ } else {
+ $dehs_tags{'target'} = $newfile_base;
}
}
dehs_msg($msg);
@@ -1745,7 +1751,7 @@ sub dehs_output ()
for my $tag (qw(package debian-uversion debian-mangled-uversion
upstream-version upstream-url
- status messages warnings errors)) {
+ status target messages warnings errors)) {
if (exists $dehs_tags{$tag}) {
if (ref $dehs_tags{$tag} eq "ARRAY") {
foreach my $entry (@{$dehs_tags{$tag}}) {
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
