Bug#685787: devscripts: Enabling uscan to simply remove files from upstream source

Andreas Tille andreas at fam-tille.de
Sat Aug 25 05:28:59 UTC 2012


On Sat, Aug 25, 2012 at 12:08:54PM +0900, Charles Plessy wrote:
> Le Fri, Aug 24, 2012 at 04:38:13PM +0200, Andreas Tille a écrit :
> > 
> >  1. If (and only if) the debian/copyright file is
> > 
> >      Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
> 
> I think that this is too strict.  For instance, if the format specification is
> updated to incorporate the Files-Excluded field, then its version number will
> increase and then uscan will stop removing excluded files from the package
> where the Format field has been updated accordingly.

You are right here.
 
> Perhaps we should try to find a consensus on the version scheme, for instance
> proposing that there will be no backwards-incompatible change without increasing
> the major version number, or perhaps you can ignore the version number completely
> for the moment ?

I guess you mean something like this:

$ git diff
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index e118142..270fc3e 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -1448,7 +1448,7 @@ EOF
         $data->load('debian/copyright');
         # my $parser = new Parse::DebControl(1);
         # my $data = $parser->parse_file('debian/copyright', {discardCase=>1,singleBlock=>1,});
-        my $okformat = qr'http://www.debian.org/doc/packaging-manuals/copyright-format/1.0';
+        my $okformat = qr'http://www.debian.org/doc/packaging-manuals/copyright-format/[.\d]+';
         if ($data->{'format'} =~ m{^$okformat/?$} and $data->{'files-excluded'} ) {
             my $tempdir = tempdir ( "uscanXXXX", TMPDIR => 1, CLEANUP => 1 );
             my $globpattern = "*";


That's perfectly fine for me - thanks for the hint.

Kind regards

        Andreas.

-- 
http://fam-tille.de



More information about the devscripts-devel mailing list