8.8

LDAPAccountManager · Jun 7, 2024 · d64cdc3 · d64cdc3
1 parent 2173e89
commit d64cdc3
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 11 deletions.
diff --git a/lam-packaging/debian/control b/lam-packaging/debian/control
@@ -17,7 +17,7 @@ Depends: php (>= 8.1), php-ldap,
  apache2 (>= 2.4.0) | httpd,
  gettext, fonts-dejavu,
  libjs-jquery-jstree (>= 3.3.0),
- php-phpseclib3, php-psr-log, php-monolog (<< 3.0),
+ php-phpseclib3, php-monolog (<< 3.0),
  php-voku-portable-ascii (<< 3.0), libphp-phpmailer (<< 7.0),
  debconf (>= 0.2.26) | debconf-2.0, ${misc:Depends}
 Recommends: php-opcache

diff --git a/lam-packaging/debian/postinst b/lam-packaging/debian/postinst
@@ -22,9 +22,6 @@ fi
 if [ ! -L /usr/share/ldap-account-manager/lib/3rdParty/composer/monolog/monolog/src/Monolog ] ; then
 	ln -s /usr/share/php/Monolog /usr/share/ldap-account-manager/lib/3rdParty/composer/monolog/monolog/src/Monolog
 fi
-if [ ! -L /usr/share/ldap-account-manager/lib/3rdParty/composer/psr/log ] ; then
-	ln -s /usr/share/php/Psr/Log /usr/share/ldap-account-manager/lib/3rdParty/composer/psr/log
-fi
 if [ ! -L /usr/share/ldap-account-manager/lib/3rdParty/composer/voku/portable-ascii/src/voku ] ; then
 	ln -s /usr/share/php/voku /usr/share/ldap-account-manager/lib/3rdParty/composer/voku/portable-ascii/src/voku
 fi

diff --git a/lam-packaging/debian/postrm b/lam-packaging/debian/postrm
@@ -66,9 +66,6 @@ if [ -f /usr/share/debconf/confmodule ]; then
   if [ -L /usr/share/ldap-account-manager/lib/3rdParty/composer/psr/log/Psr ] ; then
 	  rm /usr/share/ldap-account-manager/lib/3rdParty/composer/psr/log/Psr
   fi
-  if [ -L /usr/share/ldap-account-manager/lib/3rdParty/composer/psr/log ] ; then
-	  rm /usr/share/ldap-account-manager/lib/3rdParty/composer/psr/log
-  fi
   if [ -L /usr/share/ldap-account-manager/lib/3rdParty/composer/voku/portable-ascii/src/voku ] ; then
 	  rm /usr/share/ldap-account-manager/lib/3rdParty/composer/voku/portable-ascii/src/voku
   fi

diff --git a/lam-packaging/debian/preinst b/lam-packaging/debian/preinst
@@ -22,9 +22,6 @@ fi
 if [ -L /usr/share/ldap-account-manager/lib/3rdParty/composer/psr/log/Psr ] ; then
   rm /usr/share/ldap-account-manager/lib/3rdParty/composer/psr/log/Psr
 fi
-if [ -L /usr/share/ldap-account-manager/lib/3rdParty/composer/psr/log ] ; then
-  rm /usr/share/ldap-account-manager/lib/3rdParty/composer/psr/log
-fi
 if [ -L /usr/share/ldap-account-manager/lib/3rdParty/composer/voku/portable-ascii/src/voku ] ; then
   rm /usr/share/ldap-account-manager/lib/3rdParty/composer/voku/portable-ascii/src/voku
 fi

diff --git a/lam-packaging/debian/rules b/lam-packaging/debian/rules
@@ -51,7 +51,6 @@ install:
 	cp -r lib/3rdParty/composer debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty/
 	rm -r debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib/phpseclib
 	rm -r debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty/composer/monolog/monolog/src/Monolog
-	rm -r debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty/composer/psr/log
 	rm -r debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty/composer/voku/portable-ascii/src/voku
 	rm -r debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty/composer/phpmailer/phpmailer
 	cp -r lib/3rdParty/yubico debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty/