Commit dec15d00 authored by Yadd's avatar Yadd
Browse files

Use libjs-jquery-cookie instead of embedded js lib.

parent 9666a31a
......@@ -64,8 +64,8 @@ Architecture: all
Depends: ${misc:Depends},
liblemonldap-ng-conf-perl (= ${binary:Version}),
liblemonldap-ng-handler-perl (= ${binary:Version}),
libjs-jquery (>=1.4.2), libjs-jquery-ui, libhtml-template-perl,
libxml-libxml-perl, libxml-libxslt-perl,
libjs-jquery (>=1.4.2), libjs-jquery-ui, libjs-jquery-cookie,
libxml-libxml-perl, libxml-libxslt-perl, libhtml-template-perl,
libcrypt-openssl-rsa-perl, libcrypt-openssl-x509-perl, libxml-simple-perl,
libjson-perl, javascript-common
Pre-Depends: debconf
......@@ -81,11 +81,11 @@ Package: liblemonldap-ng-portal-perl
Architecture: all
Depends: ${misc:Depends},
liblemonldap-ng-conf-perl (= ${binary:Version}),
libjs-jquery (>=1.4.2), libjs-jquery-ui, libhtml-template-perl,
libjs-jquery (>=1.4.2), libjs-jquery-ui, libjs-jquery-cookie,
libapache-session-perl, libnet-ldap-perl, libmime-lite-perl,
libxml-libxml-perl, libxml-libxslt-perl, libstring-random-perl,
libsoap-lite-perl, libcrypt-openssl-x509-perl, libclone-perl,
javascript-common
libhtml-template-perl, javascript-common
Pre-Depends: debconf
Recommends: libemail-date-format-perl, libconvert-pem-perl,
libnet-openid-consumer-perl | libnet-openid-server-perl |
......
......@@ -8,18 +8,10 @@ Files: tree.js
Copyright: 2008, Peter Panov <panov@elcat.kg>, IKEEN Group http://www.ikeen.com
Licence: BSD
Files: jquery.cookie.js
Copyright: 2006 Klaus Hartl (stilbuero.de)
Licence: GPL-2
Files: jquery.base64.js
Copyright: Muhammad Hussein Fattahizadeh < muhammad [AT] semnanweb [DOT] com >
Licence: GPL-2
Files: jquery*.js
Copyright: 2010, The jQuery project and the jQuery UI team
Licence: GPL-2
Files: *.js
Licence: GPL-2
......
......@@ -82,13 +82,18 @@ install: build
find $(CURDIR)/debian/tmp -type f -name jquery.js -delete
rm -f $(CURDIR)/debian/tmp$(LMSHAREDIR)/*-skins/*/jquery.js
# Now, jquery.cookie.js is provided by libjs-jquery-cookie
find $(CURDIR)/debian/tmp -type f -name jquery.cookie.js -delete
rm -f $(CURDIR)/debian/tmp$(LMSHAREDIR)/*-skins/*/jquery.cookie.js
# TODO: uncomment this when Debian jquery-ui version will be upgraded to 1.8.6
#find $(CURDIR)/debian/tmp -type f -regex '.*/jquery-ui-[0-9].*\.js' -delete
#find $(CURDIR)/debian/tmp -type f -name jquery-ui.js -delete
#rm -f $(CURDIR)/debian/tmp$(LMSHAREDIR)/*-skins/*/jquery-ui.js
# TODO: restore this in Perl (with final \ )
# s#src=(["'"'"']).*?jquery-ui(-\d[\.\w\-]*?)?.js#src=$$1/javascript/jquery-ui/jquery-ui.min.js#i;'
perl -i -pe 's#src=(["'"'"']).*?jquery(-\d[\.\w\-]*?)?.js#src=$$1/javascript/jquery/jquery.min.js#i;' \
perl -i -pe 's#src=(["'"'"']).*?jquery(-\d[\.\w\-]*?)?.js#src=$$1/javascript/jquery/jquery.min.js#i; \
s#src=(["'"'"']).*?jquery\.cookie\.js#src=$$1/javascript/jquery-cookie/jquery.cookie.min.js#i;' \
$$(find $(CURDIR)/debian/tmp/examples/manager/ -name *.pl -type f) \
$$(find $(CURDIR)/debian/tmp$(LMSHAREDIR)/manager-skins/*/ \
$(CURDIR)/debian/tmp$(LMSHAREDIR)/portal-skins/*/ -type f -name *.tpl)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment