Control: tag -1 + patch

On Sun, 16 Nov 2014 22:32:44 +0100, Bastien ROUCARIES wrote:

> Your package seems to include some files that lack sources
> in prefered forms of modification:
> 
> * trac/htdocs/js/jquery.js
> * trac/htdocs/js/jquery-ui.js
> * trac/htdocs/js/jquery-ui-addons.js
> * trac/htdocs/js/excanvas.js

[..]
 
> In order to solve this problem, you could:
> 1. repack the origin tarball adding the missing source to it.
> 2  add the source files to "debian/missing-sources" directory

Here's a patch implementing option 1, stripped down by deleting the
contents of the removed file.

If the maintainers lack the time to handle this issue one way or
another, I'm happy to upload an NMU.

Cheers,
gregor

-- 
 .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer  -  http://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: Treibhaus: Maceo Parker
diff -Nru trac-1.0.2/debian/changelog trac-1.0.2+dfsg/debian/changelog
--- trac-1.0.2/debian/changelog	2014-10-25 01:16:39.000000000 +0200
+++ trac-1.0.2+dfsg/debian/changelog	2014-11-25 23:33:43.000000000 +0100
@@ -1,3 +1,17 @@
+trac (1.0.2+dfsg-0.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "[trac] Some sources are not included in your package":
+    repack to drop minified javascript files from source package:
+    - debian/copyright:
+      + add Files-Excluded
+      + update Comment about them
+    - drop debian/source/lintian-overrides
+    - add dversionmangle to debian/watch
+    (Closes: #769833)
+
+ -- gregor herrmann <[email protected]>  Tue, 25 Nov 2014 23:25:18 +0100
+
 trac (1.0.2-1) unstable; urgency=low
 
   * new upstream (Closes: #766681).
diff -Nru trac-1.0.2/debian/copyright trac-1.0.2+dfsg/debian/copyright
--- trac-1.0.2/debian/copyright	2014-10-25 01:16:39.000000000 +0200
+++ trac-1.0.2+dfsg/debian/copyright	2014-11-25 23:19:49.000000000 +0100
@@ -2,12 +2,12 @@
 Upstream-Name: Trac
 Source: http://trac.edgewall.org/
 Upstream-Contact: Edgewall Software <[email protected]>
+Files-Excluded: trac/htdocs/js/excanvas.js
+ trac/htdocs/js/jquery-ui-addons.js
+ trac/htdocs/js/jquery-ui.js
+ trac/htdocs/js/jquery.js
 Comment: upstream source ships with minified versions of several
- javascript libraries, all of which have distinct copyright holders
- and their own free licensing terms and are not shipped in the debian
- trac binary package.  Please see those packages for copyright and
- licensing details: libjs-excanvas, libjs-jquery, libjs-jquery-ui,
- libjs-jquery-timepicker
+ javascript libraries, which are removed from the Debian source package.
 
 Files: *
 Copyright: 2003-2013 Edgewall Software <[email protected]>,
diff -Nru trac-1.0.2/debian/source/lintian-overrides trac-1.0.2+dfsg/debian/source/lintian-overrides
--- trac-1.0.2/debian/source/lintian-overrides	2014-10-25 01:16:39.000000000 +0200
+++ trac-1.0.2+dfsg/debian/source/lintian-overrides	1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-# upstream includes these minified .js files, but rather we do not
-# ship them in debian.  rather, we link to the corresponding files
-# from the appropriate debian packages.
-trac: source-is-missing trac/htdocs/js/excanvas.js
-trac: source-is-missing trac/htdocs/js/jquery-ui-addons.js
-trac: source-is-missing trac/htdocs/js/jquery-ui.js
-trac: source-is-missing trac/htdocs/js/jquery.js
diff -Nru trac-1.0.2/debian/watch trac-1.0.2+dfsg/debian/watch
--- trac-1.0.2/debian/watch	2014-10-25 01:16:39.000000000 +0200
+++ trac-1.0.2+dfsg/debian/watch	2014-11-25 23:33:13.000000000 +0100
@@ -1,2 +1,3 @@
 version=3
+opts=dversionmangle=s/\+dfsg// \
 http://ftp.edgewall.com/pub/trac/Trac-([\d\.]*).tar.gz debian uupdate
diff -Nru trac-1.0.2/trac/htdocs/js/excanvas.js trac-1.0.2+dfsg/trac/htdocs/js/excanvas.js
--- trac-1.0.2/trac/htdocs/js/excanvas.js	2014-10-24 05:19:16.000000000 +0200
+++ trac-1.0.2+dfsg/trac/htdocs/js/excanvas.js	1970-01-01 01:00:00.000000000 +0100
@@ -1,48 +0,0 @@
[...]
\ No newline at end of file
diff -Nru trac-1.0.2/trac/htdocs/js/jquery-ui-addons.js trac-1.0.2+dfsg/trac/htdocs/js/jquery-ui-addons.js
--- trac-1.0.2/trac/htdocs/js/jquery-ui-addons.js	2014-10-24 05:19:16.000000000 +0200
+++ trac-1.0.2+dfsg/trac/htdocs/js/jquery-ui-addons.js	1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
[...]
\ No newline at end of file
diff -Nru trac-1.0.2/trac/htdocs/js/jquery-ui.js trac-1.0.2+dfsg/trac/htdocs/js/jquery-ui.js
--- trac-1.0.2/trac/htdocs/js/jquery-ui.js	2014-10-24 05:19:16.000000000 +0200
+++ trac-1.0.2+dfsg/trac/htdocs/js/jquery-ui.js	1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
[...]
\ No newline at end of file
diff -Nru trac-1.0.2/trac/htdocs/js/jquery.js trac-1.0.2+dfsg/trac/htdocs/js/jquery.js
--- trac-1.0.2/trac/htdocs/js/jquery.js	2014-10-24 05:19:16.000000000 +0200
+++ trac-1.0.2+dfsg/trac/htdocs/js/jquery.js	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
[...]
\ No newline at end of file

Attachment: signature.asc
Description: Digital Signature

Reply via email to