Re: Enabling uscan to simply remove files from upstream source

2012-09-07 Thread Jon Dowland
On Sat, Aug 25, 2012 at 05:18:57PM +0900, Charles Plessy wrote: I also considered, but the information of what files are excluded when creating the Debian source package is not relevant to upstream. More simply, I think that if debian/watch would radically change its format to YAML or the

Re: Enabling uscan to simply remove files from upstream source

2012-08-25 Thread Charles Plessy
Le Sat, Aug 25, 2012 at 07:24:06AM +0200, Andreas Tille a écrit : On Sat, Aug 25, 2012 at 01:03:03PM +0900, Charles Plessy wrote: I also think that the current proposal would be a good opportunity to transfer the information about source location and excluded files in a separate file

Re: Enabling uscan to simply remove files from upstream source

2012-08-25 Thread Jonas Smedegaard
On 12-08-24 at 01:06pm, Stefano Zacchiroli wrote: On Fri, Aug 24, 2012 at 12:33:09PM +0200, Jonas Smedegaard wrote: Files-Excluded: # ignore copy of lua lua_5.1.4/ […] Above means inventing a *new* syntax for files, instead of reusing the existing one from Files:

Re: Enabling uscan to simply remove files from upstream source

2012-08-25 Thread Jonas Smedegaard
Hi Charles, On 12-08-25 at 01:03pm, Charles Plessy wrote: a paragraph must not contain multiple instances of the same field. Interesting. Where is that defined? - Jonas P.S. I realize now that in this conversations I've wrongly used section when referring to paragraph, and paragraph when

Re: Enabling uscan to simply remove files from upstream source

2012-08-25 Thread Lars Wirzenius
On Sat, Aug 25, 2012 at 12:34:28PM +0200, Jonas Smedegaard wrote: Hi Charles, On 12-08-25 at 01:03pm, Charles Plessy wrote: a paragraph must not contain multiple instances of the same field. Interesting. Where is that defined? Policy, 5.1, Syntax of control files

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

2012-08-25 Thread Andreas Tille
On Sat, Aug 25, 2012 at 02:59:33PM +0200, gregor herrmann wrote: The attached patch does the following: Attached are some patches based on devscipts+git plus your original patch. I forgot to mention that my patch was also based on devscripts git and I wonder whether somebody from the

Re: Enabling uscan to simply remove files from upstream source

2012-08-24 Thread Jon Dowland
On Thu, Aug 23, 2012 at 12:38:14PM -0500, Peter Samuelson wrote: ...Or add the exclude list to a file called 'debian/watch'. I struggle to see why. I suppose because uscan reads debian/watch, but the point of that file is to document where to find upstream sources, the name implies that, and

Re: Enabling uscan to simply remove files from upstream source

2012-08-24 Thread Jonas Smedegaard
On 12-08-23 at 05:15pm, Peter Samuelson wrote: Automating get-orig-source is a fine idea, but tying it to DEP-5 would be unfortunate. [Jonas Smedegaard] You mean that you prefer a separate file for this info? What should be its name? What should be its syntax? ...and why

Re: Enabling uscan to simply remove files from upstream source

2012-08-24 Thread Andreas Tille
Hi Paul, On Wed, Aug 22, 2012 at 09:39:00AM +0800, Paul Wise wrote: On Tue, Aug 21, 2012 at 6:21 PM, Andreas Tille wrote: Any further hints / remarks? In comparison to the current method for repacking (debian/rules get-orig-source), this doesn't allow per-file-set comments about why the

Re: Enabling uscan to simply remove files from upstream source

2012-08-24 Thread Andreas Tille
On Thu, Aug 23, 2012 at 05:15:35PM -0500, Peter Samuelson wrote: Well, two reasons not to bundle it into DEP-5 format files. First, there may be a lot of people like me who would find value in a config-file-driven 'get-orig-source' but who do not find any value in maintaining debian/copyright

Re: Enabling uscan to simply remove files from upstream source

2012-08-24 Thread Andreas Tille
On Fri, Aug 24, 2012 at 10:59:10AM +0200, Jonas Smedegaard wrote: Anyway, I thought I wanted a separate file, but then I remembered that uscan already uses 'debian/watch' for configuration. The syntax of a watch file is pretty awkward, being based on (logical) lines rather than

How to handle dirty tarballs (Was: Enabling uscan to simply remove files from upstream source)

2012-08-24 Thread Andreas Tille
Hi, when working on patches for uscan to implement the removal of files I stumbled upon one problem: What to do with dirty tarballs (which are unpacking all their files straight to the unpack directory and do not create a subdirectory). When I write get-orig-source tarballs I always create a

Re: Enabling uscan to simply remove files from upstream source

2012-08-24 Thread Jonas Smedegaard
On 12-08-24 at 11:28am, Andreas Tille wrote: On Fri, Aug 24, 2012 at 10:59:10AM +0200, Jonas Smedegaard wrote: Anyway, I thought I wanted a separate file, but then I remembered that uscan already uses 'debian/watch' for configuration. The syntax of a watch file is pretty awkward,

Re: How to handle dirty tarballs (Was: Enabling uscan to simply remove files from upstream source)

2012-08-24 Thread Henrique de Moraes Holschuh
On Fri, 24 Aug 2012, Andreas Tille wrote: do not create a subdirectory). When I write get-orig-source tarballs I always create a pkg-version directory and unpack the content to this. Should this be implemented as well or do you think it is better to change as less as possible? You can

Re: Enabling uscan to simply remove files from upstream source

2012-08-24 Thread Jonas Smedegaard
On 12-08-24 at 11:16am, Andreas Tille wrote: Hi Paul, On Wed, Aug 22, 2012 at 09:39:00AM +0800, Paul Wise wrote: On Tue, Aug 21, 2012 at 6:21 PM, Andreas Tille wrote: Any further hints / remarks? In comparison to the current method for repacking (debian/rules get-orig-source),

Re: How to handle dirty tarballs (Was: Enabling uscan to simply remove files from upstream source)

2012-08-24 Thread Jonas Smedegaard
On 12-08-24 at 11:31am, Andreas Tille wrote: when working on patches for uscan to implement the removal of files I stumbled upon one problem: What to do with dirty tarballs (which are unpacking all their files straight to the unpack directory and do not create a subdirectory). When I write

Re: Enabling uscan to simply remove files from upstream source

2012-08-24 Thread Stefano Zacchiroli
On Fri, Aug 24, 2012 at 12:33:09PM +0200, Jonas Smedegaard wrote: Files-Excluded: # ignore copy of lua lua_5.1.4/ […] Above means inventing a *new* syntax for files, instead of reusing the existing one from Files: paragraphs. debian/control, which is 822-like, already supports

Re: How to handle dirty tarballs (Was: Enabling uscan to simply remove files from upstream source)

2012-08-24 Thread Vincent Zweije
On Fri, Aug 24, 2012 at 12:42:43PM +0200, Jonas Smedegaard wrote: || On 12-08-24 at 11:31am, Andreas Tille wrote: || when working on patches for uscan to implement the removal of files I || stumbled upon one problem: What to do with dirty tarballs (which are || unpacking all their files

Re: Enabling uscan to simply remove files from upstream source

2012-08-24 Thread Andreas Tille
On Fri, Aug 24, 2012 at 01:06:14PM +0200, Stefano Zacchiroli wrote: Above means inventing a *new* syntax for files, instead of reusing the existing one from Files: paragraphs. debian/control, which is 822-like, already supports #-comments. So, strictly speaking, we will just reusing a

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

2012-08-24 Thread Andreas Tille
Package: devscripts Version: 2.10.69+squeeze2 Severity: wishlist Tags: patch Hi, in a (bit longish) thread on debian-devel@l.d.o[1] there was some discussion about enabling uscan to remove files from upstream archives according to some information given in some control file. There was no real

Re: Enabling uscan to simply remove files from upstream source

2012-08-24 Thread Charles Plessy
On 12-08-22 at 09:39am, Paul Wise wrote: In comparison to the current method for repacking (debian/rules get-orig-source), this doesn't allow per-file-set comments about why the file-set is being removed. I often use this to document in more detail why I am removing files. So I view

Re: Enabling uscan to simply remove files from upstream source

2012-08-24 Thread Andreas Tille
On Sat, Aug 25, 2012 at 01:03:03PM +0900, Charles Plessy wrote: So would be nice to check that the implementation properly includes all of the following items: Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Source: http://susy.oddbird.net/ Repackaged,

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

2012-08-24 Thread Andreas Tille
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

Re: Enabling uscan to simply remove files from upstream source

2012-08-23 Thread Peter Samuelson
[Jonas Smedegaard] Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Source: http://susy.oddbird.net/ Repackaged, excluding non-DFSG licensed fonts and source-less JavaScript Files-Excluded: docs/source/javascripts/jquery-1.7.1.min.js

Re: Enabling uscan to simply remove files from upstream source

2012-08-23 Thread Peter Samuelson
[Peter Samuelson] And there is something to be said for the dpkg-source / debhelper style, in which each configuration parameter lives in its own tiny file (e.g., 'debian/source/format', 'debian/compat', 'debian/pyversions') rather than as fields of a larger file that is only tangentially

Re: Enabling uscan to simply remove files from upstream source

2012-08-23 Thread Jonas Smedegaard
On 12-08-23 at 12:27pm, Peter Samuelson wrote: [Jonas Smedegaard] Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Source: http://susy.oddbird.net/ Repackaged, excluding non-DFSG licensed fonts and source-less JavaScript Files-Excluded:

Re: Enabling uscan to simply remove files from upstream source

2012-08-23 Thread Jakub Wilk
* Jonas Smedegaard d...@jones.dk, 2012-08-23, 19:47: This is valid DEP-5 syntax as well: Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Source: http://susy.oddbird.net/ Repackaged, excluding non-DFSG licensed fonts and source-less JavaScript # Exlude source-less

Re: Enabling uscan to simply remove files from upstream source

2012-08-23 Thread Peter Samuelson
Automating get-orig-source is a fine idea, but tying it to DEP-5 would be unfortunate. [Jonas Smedegaard] You mean that you prefer a separate file for this info? What should be its name? What should be its syntax? ...and why start from scratch with this - or does something else

Re: Enabling uscan to simply remove files from upstream source

2012-08-22 Thread Jonas Smedegaard
On 12-08-22 at 09:39am, Paul Wise wrote: On Tue, Aug 21, 2012 at 6:21 PM, Andreas Tille wrote: Any further hints / remarks? In comparison to the current method for repacking (debian/rules get-orig-source), this doesn't allow per-file-set comments about why the file-set is being removed.

Re: Enabling uscan to simply remove files from upstream source

2012-08-22 Thread Jonas Smedegaard
On 12-08-21 at 12:21pm, Andreas Tille wrote: Regarding the implementation there was some uncertainity about the actual Perl module to use. In the attached example script I decided to stick to Dpkg::Control and left the code for Parse::DebControl as a comment which could pretty easily could

Re: Enabling uscan to simply remove files from upstream source

2012-08-21 Thread Andreas Tille
Hi, third summary of the proposal 1. The new field Files-Excluded in debian/copyright contains a space separated list of globs (as used by find and for specifying file lists in machine readable debian/control files). The deletion process will loop over every expression rm -rf

Re: Enabling uscan to simply remove files from upstream source

2012-08-21 Thread Jakub Wilk
* Andreas Tille andr...@an3as.eu, 2012-08-21, 12:21: The new field Files-Excluded in debian/copyright contains a space separated list of globs (as used by find and for specifying file lists in machine readable debian/control files). The deletion process will loop over every expression

Re: Enabling uscan to simply remove files from upstream source

2012-08-21 Thread Andreas Tille
On Tue, Aug 21, 2012 at 12:32:18PM +0200, Jakub Wilk wrote: * Andreas Tille andr...@an3as.eu, 2012-08-21, 12:21: The new field Files-Excluded in debian/copyright contains a space separated list of globs (as used by find and for specifying file lists in machine readable debian/control files).

Re: Enabling uscan to simply remove files from upstream source

2012-08-21 Thread Simon Josefsson
Andreas Tille andr...@an3as.eu writes: Files-Excluded: docs/source/fonts/* docs/source/javascripts/jquery-1.7.1.min.js docs/source/javascripts/modernizr-2.5.3.min.js ... Regarding the implementation there was some uncertainity about the actual Perl module to use. In the attached

Re: Enabling uscan to simply remove files from upstream source

2012-08-21 Thread Andreas Tille
On Tue, Aug 21, 2012 at 01:25:26PM +0200, Simon Josefsson wrote: How about resolving the empty directory problem by permitting the Files-Excluded to match directories? Thus, if you want to remove the docs/source/fonts/ hierarchy, you would instead write: Files-Excluded:

Re: Enabling uscan to simply remove files from upstream source

2012-08-21 Thread Charles Plessy
Le Tue, Aug 21, 2012 at 12:21:21PM +0200, Andreas Tille a écrit : 1. The new field Files-Excluded in debian/copyright contains a space separated list of globs (as used by find and for specifying file lists in machine readable debian/control files). The deletion process will loop

Re: Enabling uscan to simply remove files from upstream source

2012-08-21 Thread Andreas Tille
Hi Charles, On Tue, Aug 21, 2012 at 09:11:47PM +0900, Charles Plessy wrote: As suggested in http://lists.debian.org/2012081822.gt5...@jones.dk, something similar to the following two commands would do be compatible with the syntax of the Files field (although I am still unsure if a

Re: Enabling uscan to simply remove files from upstream source

2012-08-21 Thread Simon Josefsson
Andreas Tille andr...@an3as.eu writes: On Tue, Aug 21, 2012 at 01:25:26PM +0200, Simon Josefsson wrote: How about resolving the empty directory problem by permitting the Files-Excluded to match directories? Thus, if you want to remove the docs/source/fonts/ hierarchy, you would instead

Re: Enabling uscan to simply remove files from upstream source

2012-08-21 Thread olivier sallou
2012/8/21 Andreas Tille andr...@an3as.eu Hi, third summary of the proposal 1. The new field Files-Excluded in debian/copyright contains a space separated list of globs (as used by find and for specifying file lists in machine readable debian/control files). The deletion

Re: Enabling uscan to simply remove files from upstream source

2012-08-21 Thread Andrew Shadura
Hello, On Tue, 21 Aug 2012 12:21:21 +0200 Andreas Tille andr...@an3as.eu wrote: 2. If files matching are contained in the source tarball this will be repackaged except if the option --no-exclusion is given at uscan command line or if USCAN_NO_EXCLUSION is set in

Re: Enabling uscan to simply remove files from upstream source

2012-08-21 Thread Andreas Tille
On Tue, Aug 21, 2012 at 03:48:33PM +0200, Andrew Shadura wrote: By the way, how about adding something under debian/source/... to allow automatic repacking regardless of Files-Excluded? (Or please tell me how to repack upstream's zipball to targz automatically without having to specify

Re: Enabling uscan to simply remove files from upstream source

2012-08-21 Thread Stefano Zacchiroli
On Tue, Aug 21, 2012 at 12:21:21PM +0200, Andreas Tille wrote: Any further hints / remarks? ... just a big THANKS for helping the discussion in this thread and for the draft code! I totally agree with Jakub that the main issue here is that repackaging is a PITA, fixing the tools is the way to

Re: Enabling uscan to simply remove files from upstream source

2012-08-21 Thread Andreas Tille
On Tue, Aug 21, 2012 at 03:40:41PM +0200, olivier sallou wrote: Just a remark, it would be nice in this case to get a warning/log that some/all glob do not match to track changes in upstream tarballs (exclusion in previous release, then not needed anymore). Yes. Uscan does print several

Re: Enabling uscan to simply remove files from upstream source

2012-08-21 Thread Charles Plessy
Le Tue, Aug 21, 2012 at 03:48:33PM +0200, Andrew Shadura a écrit : By the way, how about adding something under debian/source/... to allow automatic repacking regardless of Files-Excluded? (Or please tell me how to repack upstream's zipball to targz automatically without having to specify

Re: Enabling uscan to simply remove files from upstream source

2012-08-21 Thread Russ Allbery
Charles Plessy ple...@debian.org writes: Le Tue, Aug 21, 2012 at 03:48:33PM +0200, Andrew Shadura a écrit : By the way, how about adding something under debian/source/... to allow automatic repacking regardless of Files-Excluded? (Or please tell me how to repack upstream's zipball to targz

Re: Enabling uscan to simply remove files from upstream source

2012-08-21 Thread Paul Wise
On Tue, Aug 21, 2012 at 6:21 PM, Andreas Tille wrote: Any further hints / remarks? In comparison to the current method for repacking (debian/rules get-orig-source), this doesn't allow per-file-set comments about why the file-set is being removed. I often use this to document in more detail why