worteks
/
lemonldap-ng
mirror of https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix installation process to not stop because of new Manager code (#820)

Browse Source
environments/ppa-mbqj77/deployments/1
Clément Oudot 10 years ago
parent a917de718f
commit 8332785cde
6 changed files with 4 additions and 26 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 14
      Makefile
  2. 1
      debian/liblemonldap-ng-manager-perl.examples
  3. 2
      debian/liblemonldap-ng-manager-perl.install
  4. 3
      debian/liblemonldap-ng-manager-perl.links
  5. 9
      debian/liblemonldap-ng-manager-perl.preinst
  6. 1
      debian/rules

14
Makefile
Unescape View File

@ -657,11 +657,8 @@ debian-diff:
@# Manager
@$(DIFF) lemonldap-ng-manager/lib/Lemonldap/NG/Manager $(DIFFPREFIX)/usr/share/perl5/Lemonldap/NG/Manager ||true
@$(DIFF) lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm $(DIFFPREFIX)/usr/share/perl5/Lemonldap/NG/Manager.pm ||true
@$(DIFF) lemonldap-ng-manager/example/index.pl $(DIFFPREFIX)/var/lib/lemonldap-ng/manager/index.pl ||true
@$(DIFF) lemonldap-ng-manager/example/sessions.pl $(DIFFPREFIX)/var/lib/lemonldap-ng/manager/sessions.pl ||true
@$(DIFF) lemonldap-ng-manager/example/notifications.pl $(DIFFPREFIX)/var/lib/lemonldap-ng/manager/notifications.pl ||true
@$(DIFF) --ignore-matching-lines='set.*get.*\[2\]' lemonldap-ng-manager/example/scripts/lmConfigEditor $(DIFFPREFIX)/usr/share/lemonldap-ng/bin/lmConfigEditor ||true
@$(DIFF) --ignore-matching-lines='giveUpPrivileges' lemonldap-ng-manager/example/scripts/lemonldap-ng-cli $(DIFFPREFIX)/usr/share/lemonldap-ng/bin/lemonldap-ng-cli ||true
@$(DIFF) --ignore-matching-lines='set.*get.*\[2\]' lemonldap-ng-manager/scripts/lmConfigEditor $(DIFFPREFIX)/usr/share/lemonldap-ng/bin/lmConfigEditor ||true
@$(DIFF) --ignore-matching-lines='giveUpPrivileges' lemonldap-ng-manager/scripts/lemonldap-ng-cli $(DIFFPREFIX)/usr/share/lemonldap-ng/bin/lemonldap-ng-cli ||true
default-diff:
@# Portal
@ -687,11 +684,8 @@ default-diff:
@$(DIFF) lemonldap-ng-manager/lib/Lemonldap/NG/Manager /usr/local/share/perl/$(PERLVERSION)/Lemonldap/NG/Manager ||true
@$(DIFF) lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm /usr/local/share/perl/$(PERLVERSION)/Lemonldap/NG/Manager.pm ||true
@$(DIFF) lemonldap-ng-manager/example/skins $(LMPREFIX)/htdocs/manager/skins ||true
@$(DIFF) lemonldap-ng-manager/example/index.pl $(LMPREFIX)/htdocs/manager/index.pl ||true
@$(DIFF) lemonldap-ng-manager/example/sessions.pl $(LMPREFIX)/htdocs/manager/sessions.pl ||true
@$(DIFF) lemonldap-ng-manager/example/notifications.pl $(LMPREFIX)/htdocs/manager/notifications.pl ||true
@$(DIFF) --ignore-matching-lines='set.*get.*\[2\]' lemonldap-ng-manager/example/scripts/lmConfigEditor $(LMPREFIX)/bin/lmConfigEditor ||true
@$(DIFF) --ignore-matching-lines='giveUpPrivileges' lemonldap-ng-manager/example/scripts/lemonldap-ng-cli $(LMPREFIX)/bin/lemonldap-ng-cli ||true
@$(DIFF) --ignore-matching-lines='set.*get.*\[2\]' lemonldap-ng-manager/scripts/lmConfigEditor $(LMPREFIX)/bin/lmConfigEditor ||true
@$(DIFF) --ignore-matching-lines='giveUpPrivileges' lemonldap-ng-manager/scripts/lemonldap-ng-cli $(LMPREFIX)/bin/lemonldap-ng-cli ||true
tidy: clean
find lemon*/ -type f \( -name '*.pm' -or -name '*.pl' -or -name '*.t' \) -print -exec perltidy -b {} \;

1
debian/liblemonldap-ng-manager-perl.examples vendored
Unescape View File

@ -1 +0,0 @@
debian/tmp/examples/manager/*.pl

2
debian/liblemonldap-ng-manager-perl.install vendored
Unescape View File

@ -1,7 +1,5 @@
/usr/share/perl5/Lemonldap/NG/Manager*
/usr/share/perl5/auto/Lemonldap/NG/Manager
/etc/lemonldap-ng/manager-apache2.conf
/usr/share/lemonldap-ng/manager-skins
/usr/share/lemonldap-ng/manager
/var/lib/lemonldap-ng/manager
/usr/share/lemonldap-ng/bin/lmConfigEditor

3
debian/liblemonldap-ng-manager-perl.links vendored
Unescape View File

@ -1,5 +1,2 @@
/etc/lemonldap-ng/manager-apache2.conf /etc/apache2/sites-available/manager-apache2.conf
/usr/share/lemonldap-ng/manager/index.pl /var/lib/lemonldap-ng/manager/index.pl
/usr/share/lemonldap-ng/manager/notifications.pl /var/lib/lemonldap-ng/manager/notifications.pl
/usr/share/lemonldap-ng/manager/sessions.pl /var/lib/lemonldap-ng/manager/sessions.pl

9
debian/liblemonldap-ng-manager-perl.preinst vendored
Unescape View File

@ -4,14 +4,5 @@ set -e
. /usr/share/debconf/confmodule
if [ "$1" == "configure" ]
then
if [ -f /var/lib/lemonldap-ng/manager/index.pl ]; then
diff /var/lib/lemonldap-ng/manager/index.pl \
/usr/share/doc/liblemonldap-ng-manager-perl/examples/index.pl && \
rm -rf /var/lib/lemonldap-ng/manager/index.pl
fi
fi
#DEBHELPER#
exit 0

1
debian/rules vendored
Unescape View File

@ -49,7 +49,6 @@ override_dh_auto_install:
mkdir $(TMP)/$(LMSHAREDIR)/manager $(TMP)/$(LMSHAREDIR)/portal
mv $(TMP)/$(LMVARDIR)/portal/*.pl $(TMP)/$(LMSHAREDIR)/portal/
mv $(TMP)/$(LMVARDIR)/manager/*pl $(TMP)/$(LMSHAREDIR)/manager/
override_dh_compress:
dh_compress -X favicon.ico

Write Preview
Loading…
Cancel
Save