From 431680541395fd1b6074576fd0b459accc91b232 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Thu, 28 Jun 2018 13:46:44 +0200 Subject: [PATCH] Debian dependencies --- lam-packaging/debian/changelog | 9 +++++++++ lam-packaging/debian/control | 1 + lam-packaging/debian/rules | 7 ++++++- lam/VERSION | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/lam-packaging/debian/changelog b/lam-packaging/debian/changelog index c1445653..2a62b89f 100644 --- a/lam-packaging/debian/changelog +++ b/lam-packaging/debian/changelog @@ -1,3 +1,12 @@ +ldap-account-manager (6.5.DEV-1) unstable; urgency=medium + + * new upstream release + * Fix "Embedded code copies" by adding dependency to phpseclib + (phpLDAPadmin code is customized and cannot be reused) + (Closes: #781419) + + -- Roland Gruber Thu, 28 Jun 2018 13:35:58 +0200 + ldap-account-manager (6.4-1) unstable; urgency=medium * new upstream release diff --git a/lam-packaging/debian/control b/lam-packaging/debian/control index 5a2f0536..e14a892c 100644 --- a/lam-packaging/debian/control +++ b/lam-packaging/debian/control @@ -12,6 +12,7 @@ Depends: php5 (>= 5.4.26) | php (>= 7), php5-ldap | php-ldap, php5-gd | php-gd, php5-json | php-json, php5-imagick | php-imagick, php5-curl | php-curl, php5 | php-zip, php5 | php-xml, php5-imagick | php-imagick, libapache2-mod-php5 | libapache2-mod-php | php5-fpm | php-fpm, + php-tcpdf, php-phpseclib (>= 2.0), apache2 | httpd, fonts-dejavu, debconf (>= 0.2.26) | debconf-2.0, ${misc:Depends} Recommends: php-apc | php-opcache Suggests: ldap-server, php5-mcrypt | php-mcrypt, ldap-account-manager-lamdaemon, perl diff --git a/lam-packaging/debian/rules b/lam-packaging/debian/rules index 9d61377c..2315f604 100755 --- a/lam-packaging/debian/rules +++ b/lam-packaging/debian/rules @@ -43,7 +43,12 @@ install: cp -r lib/modules debian/ldap-account-manager/usr/share/ldap-account-manager/lib/ cp -r lib/types debian/ldap-account-manager/usr/share/ldap-account-manager/lib/ cp -r lib/tools debian/ldap-account-manager/usr/share/ldap-account-manager/lib/ - cp -r lib/3rdParty debian/ldap-account-manager/usr/share/ldap-account-manager/lib/ + + # link 3rd party libs + install -d --mode=755 debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty + ln -s /usr/share/php/phpseclib debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty/ + ln -s /usr/share/php/tcpdf debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty/ + cp -r locale debian/ldap-account-manager/usr/share/ldap-account-manager/ 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/ diff --git a/lam/VERSION b/lam/VERSION index c596943a..a124b8f0 100644 --- a/lam/VERSION +++ b/lam/VERSION @@ -1 +1 @@ -6.4 +6.5.DEV