Debian Bug report logs - #831521
[uscan] add support to run custom mk-origtargz

Full log

🔗 View this message in rfc822 format

X-Loop: [email protected]
Subject: Bug#831521: Custom repacking
Reply-To: Osamu Aoki <[email protected]>, [email protected]
Resent-From: Osamu Aoki <[email protected]>
Resent-To: [email protected]
Resent-CC: Devscripts Devel Team <[email protected]>
X-Loop: [email protected]
Resent-Date: Mon, 28 Aug 2017 14:15:01 +0000
Resent-Message-ID: <[email protected]>
Resent-Sender: [email protected]
X-Debian-PR-Message: followup 831521
X-Debian-PR-Package: devscripts
X-Debian-PR-Keywords: 
References: <[email protected]> <[email protected]> <[email protected]> <[email protected]>
X-Debian-PR-Source: devscripts
Received: via spool by [email protected] id=B831521.150392958221335
          (code B ref 831521); Mon, 28 Aug 2017 14:15:01 +0000
Received: (at 831521) by bugs.debian.org; 28 Aug 2017 14:13:02 +0000
X-Spam-Checker-Version: SpamAssassin 3.4.1-bugs.debian.org_2005_01_02
	(2015-04-28) on buxtehude.debian.org
X-Spam-Level: 
X-Spam-Status: No, score=-4.0 required=4.0 tests=DIGITS_LETTERS,FROMDEVELOPER,
	HAS_BUG_NUMBER,MURPHY_DRUGS_REL8,RP_MATCHES_RCVD autolearn=unavailable
	autolearn_force=no version=3.4.1-bugs.debian.org_2005_01_02
X-Spam-Bayes: score:0.5  spammytokens: hammytokens:
Received: from muffat.debian.org ([2607:f8f0:614:1::1274:33])
	from C=NA,ST=NA,L=Ankh Morpork,O=Debian SMTP,OU=Debian SMTP CA,CN=muffat.debian.org,[email protected] (verified)
	by buxtehude.debian.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
	(Exim 4.89)
	(envelope-from <[email protected]>)
	id 1dmKmk-0005Xo-GY
	for [email protected]; Mon, 28 Aug 2017 14:13:02 +0000
Received: from paradis2.debian.org ([2001:41c8:1000:21::21:31] helo=paradis.debian.org)
	from C=NA,ST=NA,L=Ankh Morpork,O=Debian SMTP,OU=Debian SMTP CA,CN=paradis.debian.org,[email protected] (verified)
	by muffat.debian.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
	(Exim 4.89)
	(envelope-from <[email protected]>)
	id 1dmKmj-0006C8-68; Mon, 28 Aug 2017 14:13:01 +0000
Received: from osamu by paradis.debian.org with local (Exim 4.89)
	(envelope-from <[email protected]>)
	id 1dmKmh-0004XH-Eb; Mon, 28 Aug 2017 14:12:59 +0000
Date: Mon, 28 Aug 2017 23:12:56 +0900
From: Osamu Aoki <[email protected]>
To: Sergio Durigan Junior <[email protected]>, [email protected]
Cc: Christopher Hoskin <[email protected]>
Message-ID: <[email protected]>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <[email protected]>
User-Agent: NeoMutt/20170113 (1.7.2)

Hi,

On Sun, Aug 27, 2017 at 05:24:43PM -0400, Sergio Durigan Junior wrote:
> Anyway, I took the liberty and implemented the following mostly-untested
> patch to uscan which uses your idea and executes debian/mk-origtargz (if
> it exists and is executable) instead of the system's mk-origtargz.

Thanks 
 
> diff --git a/scripts/uscan.pl b/scripts/uscan.pl
> index f871daf2..49a7acb2 100755
> --- a/scripts/uscan.pl
> +++ b/scripts/uscan.pl
> @@ -60,8 +60,9 @@ than the last upstream version.
>  =item * B<uscan> saves the downloaded tarball to the parent B<../> directory:
>  I<< ../<upkg>-<uversion>.tar.gz >>
>  
> -=item * B<uscan> invokes B<mk-origtargz> to create the source tarball: I<<
> -../<spkg>_<oversion>.orig.tar.gz >>
> +=item * B<uscan> invokes B<mk-origtargz> to create the source tarball:
> +I<< ../<spkg>_<oversion>.orig.tar.gz >> (if F<debian/mk-origtargz>
> +exists and is executable, then execute it instead).
>  
>  =over
>  
> @@ -706,7 +707,8 @@ doesn't work.
>  
>  B<uscan> invokes B<mk-origtargz> to create the source tarball properly named
>  for the source package with B<.orig.> (or B<< .orig-<component>. >> for the
> -secondary tarballs) in its filename.
> +secondary tarballs) in its filename.  If F<debian/mk-origtargz> exists and is
> +executable, then B<uscan> invokes it instead.
>  
>  =over
>  
> @@ -3764,7 +3766,15 @@ EOF
>      my $path = "$destdir/$newfile_base";
>      my $target = $newfile_base;
>      unless ($symlink eq "no") {
> -	my @cmd = ("mk-origtargz");
> +	my @cmd = ();
> +	if (-x 'debian/mk-origtargz') {
> +	    # If the user has specified a personalized 'mk-origtargz'
> +	    # under debian/, we use it instead of the system script.
> +	    push @cmd "debian/mk-origtargz";
> +	    uscan_verbose "Using debian/mk-origtargz instead of mk-origtargz\n";
> +	} else {
> +	    push @cmd "mk-origtargz";
> +	}
>  	push @cmd, "--package", $pkg;
>  	push @cmd, "--version", $common_mangled_newversion;
>  	push @cmd, '--repack-suffix', $options{repacksuffix} if defined $options{repacksuffix};

Yes, this is what I am talking about.  Maybe, we should add
F<debian/uupdate> in the same way. 

Adding these features are easy but let's go slow.  Once we add any
features, we can't remove them easily.  Let's wait and check if there
are no objection or second thought.

Regards,

Osamu

Send a report that this bug log contains spam.