Bart Martens wrote: > On Thu, Jul 26, 2012 at 05:45:51PM +0200, Benoît Knecht wrote: > > Bart Martens wrote: > > > minidlna-1.0.25+dfsg/debian/copyright : > > > > > > | Source: http://sourceforge.net/projects/minidlna/files/ > > > | The icons.c file in the original tarball contained binary blobs of > > > possibly > > > | unfree images. It has hence been replaced in the DFSG tarball by a > > > file > > > | containing the free Debian logo instead. It can be generated from > > > the SVG logo > > > | using the debian/make_icons.sh script (see the header of that file > > > for > > > | instructions). > > > > > > http://www.debian.org/doc/manuals/developers-reference/best-pkging-practices.html#bpp-origtargz > > > > > > | A repackaged .orig.tar.{gz,bz2,xz} should not contain any file that > > > does not > > > | come from the upstream author(s), or whose contents has been changed > > > by you. > > > > > > So removing files is OK, adding/replacing files not. > > > > You're right, except that in this case, the source would fail to build > > if I simply removed icons.c, so I think it falls under the exception > > laid out in the footnote [1]: > > > > | As a special exception, if the omission of non-free files would lead > > | to the source failing to build without assistance from the Debian > > | diff, it might be appropriate to instead edit the files, omitting only > > | the non-free parts of them, and/or explain the situation in a > > | README.source file in the root of the source tree. But in that case > > | please also urge the upstream author to make the non-free components > > | easier separable from the rest of the source. > > > > [1] > > http://www.debian.org/doc/manuals/developers-reference/best-pkging-practices.html#ftn.idp20146152 > > That is about editing the to omit non-free parts, not about adding/replacing > files.
I'm not sure what you're proposing I should do. The upstream icons.c contained four binary blobs, each corresponding to a possibly unfree logo. I can't remove the entire file (or it won't compile) and I can't replace the binary blobs with empty strings (or it won't run). So I changed the file as little as possible while ensuring that it leads to a DFSG-compliant and running program; it just happens to be more or less the same thing as replacing the entire file, since it contained unfree data only. Cheers, -- Benoît Knecht -- To UNSUBSCRIBE, email to debian-mentors-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20120727131001.ga2...@marvin.lan