diff --git a/lam-packaging/debian/changelog b/lam-packaging/debian/changelog index 6155b3ee..24cc9528 100644 --- a/lam-packaging/debian/changelog +++ b/lam-packaging/debian/changelog @@ -2,6 +2,7 @@ ldap-account-manager (3.5.0.RC1-1) unstable; urgency=low * new upstream release * updated to Debian policy 3.9.2 + * reincluded JQuery libs into package because LAM is very version specific -- Roland Gruber Sun, 22 May 2011 15:52:46 +0200 diff --git a/lam-packaging/debian/control b/lam-packaging/debian/control index e7e25f38..2c150359 100644 --- a/lam-packaging/debian/control +++ b/lam-packaging/debian/control @@ -8,7 +8,7 @@ Homepage: http://www.ldap-account-manager.org/ Package: ldap-account-manager Architecture: all -Depends: php5 (>= 5.2.4), php5-ldap, php5-gd, apache2 | httpd, php-fpdf (>= 1.6), libjs-jquery (>= 1.4.2), libjs-jquery-ui (>= 1.8), debconf (>= 0.2.26) | debconf-2.0, ${misc:Depends} +Depends: php5 (>= 5.2.4), php5-ldap, php5-gd, apache2 | httpd, php-fpdf (>= 1.6), debconf (>= 0.2.26) | debconf-2.0, ${misc:Depends} Suggests: ldap-server, php5-mcrypt, ldap-account-manager-lamdaemon, perl Description: webfrontend for managing accounts in an LDAP directory LDAP Account Manager (LAM) runs on an existing webserver. diff --git a/lam-packaging/debian/postinst b/lam-packaging/debian/postinst index bcee7bcf..5066c8b0 100755 --- a/lam-packaging/debian/postinst +++ b/lam-packaging/debian/postinst @@ -33,14 +33,6 @@ for file in $files; do done if [ ! -h /usr/share/ldap-account-manager/lib/fpdf.php ]; then\ ln -s /usr/share/fpdf/fpdf.php /usr/share/ldap-account-manager/lib/fpdf.php; fi -if [ -h /usr/share/ldap-account-manager/templates/lib/jquery.js ]; then\ - mv /usr/share/ldap-account-manager/templates/lib/jquery.js /usr/share/ldap-account-manager/templates/lib/jquery-core.js -else - if [ ! -h /usr/share/ldap-account-manager/templates/lib/jquery-core.js ]; then\ - ln -s /usr/share/javascript/jquery/jquery.min.js /usr/share/ldap-account-manager/templates/lib/jquery-core.js; fi -fi -if [ ! -h /usr/share/ldap-account-manager/templates/lib/jquery-ui.js ]; then\ - ln -s /usr/share/javascript/jquery-ui/jquery-ui.min.js /usr/share/ldap-account-manager/templates/lib/jquery-ui.js; fi if [ ! -h /usr/share/ldap-account-manager/config ]; then\ ln -s /var/lib/ldap-account-manager/config /usr/share/ldap-account-manager/config; fi if [ ! -h /usr/share/ldap-account-manager/sess ]; then\ diff --git a/lam-packaging/debian/postrm b/lam-packaging/debian/postrm index 6e624f5d..4769fda7 100755 --- a/lam-packaging/debian/postrm +++ b/lam-packaging/debian/postrm @@ -6,7 +6,6 @@ if [ -f /usr/share/debconf/confmodule ]; then . /usr/share/debconf/confmodule db_version 2.0 || [ $? -lt 30 ] - rm -f /usr/share/ldap-account-manager/templates/lib/jquery-*.js; rm -f /usr/share/ldap-account-manager/lib/fpdf.php rm -f /usr/share/ldap-account-manager/sess rm -f /usr/share/ldap-account-manager/tmp diff --git a/lam-packaging/debian/rules b/lam-packaging/debian/rules index 01cd3e39..8a631665 100755 --- a/lam-packaging/debian/rules +++ b/lam-packaging/debian/rules @@ -43,8 +43,6 @@ install: install -D --mode=644 sess/.htaccess debian/ldap-account-manager/var/lib/ldap-account-manager/sess/.htaccess cp -r style debian/ldap-account-manager/usr/share/ldap-account-manager/ cp -r templates debian/ldap-account-manager/usr/share/ldap-account-manager/ - rm debian/ldap-account-manager/usr/share/ldap-account-manager/templates/lib/jquery-1* - rm debian/ldap-account-manager/usr/share/ldap-account-manager/templates/lib/jquery-ui-1* install -D --mode=755 lib/lamdaemon.pl debian/ldap-account-manager-lamdaemon/usr/share/ldap-account-manager/lib/lamdaemon.pl install -D --mode=755 debian/README-lamdaemon.Debian debian/ldap-account-manager-lamdaemon/usr/share/doc/ldap-account-manager-lamdaemon/README.Debian