-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Le 2014-01-27 11:28, Antoine Beaupré a écrit : > On 2014-01-27 11:21:19, Jerome Charaoui wrote: >>>> diff --git a/debian/rules b/debian/rules index >>>> 118de9d..49f0824 100755 --- a/debian/rules +++ b/debian/rules >>>> @@ -20,11 +20,5 @@ export DH_OPTIONS %: dh $@ >>>> --with=python2 >>>> >>>> -override_dh_auto_build: - dh_auto_build - ln -s >>>> /usr/share/javascript/jquery/jquery.js >>>> $(CURDIR)/web/js/000-jquery-1.7.2.js - ln -s >>>> /usr/share/javascript/jquery-mousewheel/jquery.mousewheel.js >>>> $(CURDIR)/web/js/003-mousewheel.js - cd $(CURDIR)/web && >>>> $(MAKE) - override_dh_install: - dh_install -X.gitignore >>>> -XMakefile -Xutils/ + dh_install -X.gitignore -X*.min.js >>>> -Xutils/ >>> >>> Does that mean we still build the minified versions during >>> build, but then don't ship them? Shouldn't just skip that? >> >> I removed the whole override_dh_auto_build code block, so the >> build-time minify doesn't happen anymore. > > Hum.. I would have thought that without the override, > dh_auto_build would still get called and hit the makefile and so > on...
I've tested with dpkg-buildpackage and it doesn't seem to hit it, probably because the file is in web/ instead of the root of the package source. >> Sounds pretty reasonable to me! However upstream uses >> google-compiler, so the change would look like : >> >> - -JS_COMPILER = utils/google-compiler --warning_level QUIET >> +JS_COMPILER =? utils/google-compiler --warning_level QUIET > > Understood. Can you take care of posting the patch upstream as > well? Done! - -- Jerome -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Using GnuPG with Icedove - http://www.enigmail.net/ iQEcBAEBCAAGBQJS50xsAAoJEK/ZGpI6kvtMlNQH/iecsC4YuPgZsG0kc9ECOmR9 bk4z5qKi8E8lebdJxV+PiZmsfZAoEDRNnNR+jO2vZpYWJWoFq7Uw1l0b9eXwLchM lR8kFPepPf8QV2Tc03uWXjJsSVCcwcgJ/2uzjfXYZgzj+doNxBXGY+TL9PCUfeDr BvkaJE4K9DW8uWTP5jqPEMl+gs7sgpZxZMbQHUIuEj50hCuKP54M2+fVlMDQgvLR Kzs5q4BvVXD3L5ksB5FPiGqUFv6VxpGRmjs0eyQJLt3MRxmXsp6WEe78AaTgp2VK OUiNF/G0cD/DRx45My3MIPOFTCANIDJnsO1ohHm5WLayRPtawpwS+o0LVBm6I+g= =H3NS -----END PGP SIGNATURE----- -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
