Bug#685787: return the repacked filename instead the original

Csillag Tamas cstamas at digitus.itk.ppke.hu
Tue Dec 18 17:28:48 UTC 2012


Hi,

I include a one line patch which returns the name of the modified (repacked,
file excluded) tarball. This make uscan suitable for use with git-import-orig
(and others) without this they just silently work on the original untouched
tarball which in unintended.

The patch is based on the work already available at
git://git.debian.org/git/users/tille/devscripts.git

This all is part of a bigger picture (for me) which I documented here:
http://cstamas.hu/blog/posts/Standard_mechanism_for_repacking_upstream_tarballs_in_debian/

-------------------------------------------
>From 744a59c5ac09ff2204fd0c95402362101d1c91b8 Mon Sep 17 00:00:00 2001
From: CSILLAG Tamas <cstamas at digitus.itk.ppke.hu>
Date: Tue, 18 Dec 2012 18:11:45 +0100
Subject: [PATCH] return the modified name in target

    The returned target value is updated to the right repacked file.
---
 scripts/uscan.pl |    1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 7372ede..051e09f 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -1561,6 +1561,7 @@ EOF
 		$msg .= " and renamed it as $renamed_base";
 	    } elsif ($symlink eq 'files-excluded') {
 		$msg .= " and removed files from it in ${pkg}_${newversion}${excludesuffix}.orig.tar.$suffix\n";
+                $dehs_tags{'target'}                = "${pkg}_${newversion}${excludesuffix}.orig.tar.$suffix";
 	    } else {
 		$dehs_tags{'target'} = $newfile_base;
 	    }
-- 
1.7.10.4

-------------------------------------------

Regards,
  cstamas
-- 
CSILLAG Tamas (cstamas) - http://cstamas.hu/



More information about the devscripts-devel mailing list