Commit e0d9cc3a authored by Clément OUDOT's avatar Clément OUDOT
Browse files

Update Debian packaging to remove jquery dependencies (managed only for Debian...

Update Debian packaging to remove jquery dependencies (managed only for Debian official releases) and add Convert::PEM missing dependency
parent 1443b4ae
......@@ -56,6 +56,8 @@ Note that configuration files are now grouped in
V - Build DEB packages
-----------------------
Note: official packages build is now hosted on https://github.com/guimard/LemonLDAP--NG-Debian-packaging
Untar the archive and launch:
$ make debian-packages
......
......@@ -64,10 +64,9 @@ 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, 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
libjson-perl, libconvert-pem-perl
Pre-Depends: debconf
Recommends: libapache-session-perl, libsoap-lite-perl,
lemonldap-ng-doc (= ${binary:Version})
......@@ -81,11 +80,10 @@ Package: liblemonldap-ng-portal-perl
Architecture: all
Depends: ${misc:Depends},
liblemonldap-ng-conf-perl (= ${binary:Version}),
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,
libhtml-template-perl, javascript-common
libhtml-template-perl
Pre-Depends: debconf
Recommends: libemail-date-format-perl, libconvert-pem-perl,
libnet-openid-consumer-perl | libnet-openid-server-perl |
......
......@@ -77,31 +77,8 @@ install: build
APACHEGROUP=www-data \
DOCDIR=/usr/share/doc/lemonldap-ng-doc
# FOR OFFICIAL RELEASES
# ---------------------
# Since Lenny, jquery.js is provided by libjs-jquery
#find $(CURDIR)/debian/tmp -type f -regex '.*/jquery-[0-9].*\.js' -delete
#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; \
# 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)
#test -n "$$LOCALBUILD" || ./scripts/minifierjs $$(find debian/tmp/ -name '*.js')
#test -n "$$LOCALBUILD" || ./scripts/minifiercss $$(find debian/tmp/ -name '*.css')
test -n "$$LOCALBUILD" || ./scripts/minifierjs $$(find debian/tmp/ -name '*.js')
test -n "$$LOCALBUILD" || ./scripts/minifiercss $$(find debian/tmp/ -name '*.css')
# Move perl scripts in /usr/share, links are created by *.postinst scripts
mkdir debian/tmp/usr/share/lemonldap-ng/manager debian/tmp/usr/share/lemonldap-ng/portal
......
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