-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Le 2014-01-27 11:09, Antoine Beaupré a écrit : >> diff --git a/debian/photofloat.triggers >> b/debian/photofloat.triggers new file mode 100644 index >> 0000000..db0ecc7 --- /dev/null +++ b/debian/photofloat.triggers >> @@ -0,0 +1,2 @@ +interest /usr/share/javascript/jquery/jquery.js >> +interest >> /usr/share/javascript/jquery-mousewheel/jquery.mousewheel.js > > That seems absurdly easy. Did you actually try this out and it > works? :)
Yes. >> 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. >> diff --git a/web/Makefile b/web/Makefile index 72aea0d..8224ac5 >> 100644 --- a/web/Makefile +++ b/web/Makefile @@ -7,7 +7,7 @@ >> CSS_MIN = $(CSS_DIR)/styles.min.css JS_MIN_FILES := $(sort >> $(patsubst %.js, %.min.js, $(filter-out %.min.js, $(wildcard >> $(JS_DIR)/*.js)))) CSS_MIN_FILES := $(sort $(patsubst %.css, >> %.min.css, $(filter-out %.min.css, $(wildcard >> $(CSS_DIR)/*.css)))) >> >> -JS_COMPILER = yui-compressor --type js +JS_COMPILER = uglifyjs >> CSS_COMPILER = yui-compressor --type css >> >> .PHONY: all clean > > Another patch with upstream, but nothing in debian/patches. I think > we should instead use: > > JS_COMPILER ?= yui-compressor --type js > > ... to respect upstream's default yet allow ourselves an override. > Then we just call make with: > > cd /usr/share/photofloat/web && make JS_COMPILER=uglifyjs > > We should also add a ?= to the CSS_COMPILER while we're there to > make sure we can replace that one as well per #721568. 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 - -- Jerome -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Using GnuPG with Icedove - http://www.enigmail.net/ iQEcBAEBCAAGBQJS5od4AAoJEK/ZGpI6kvtMRMIH/jYeB9Tgdsp4ZRTHLfJ1SvsK xLWDph6KxWYJd0+GawNQYMMJXh/MTluzKKvNSL4OJymo5k53MW7aH2EETukBjZMU Eq5+7GSjsq88oGikJ1oTWxKYlJ5ji1hFnAwSl4Hz4uSHwcFTd09rSuXKTyPr7Jhp 96M+FczT1vBN4Fc4a5Ywu7qn4RCxkwxcSGvTgnH9lxgJt1mP1eMgsGwTwQpD3zBZ G/3AJ6AkfeQmsvBnnpcNe1qzRcZuq8C3WYbondCejODPn1zd+uz9dcXJR4lSO9Qw iGZvCiWV12Z1VPn8hMt3cd8KWIo5IsGhuZkrfa4fY7Oe+k2LC9IwsBTdGR/o5jY= =wgmF -----END PGP SIGNATURE----- -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
