[SCM] Debian branch, master, updated. debian/1.2.2-2-15-g7313963

[Xavier Guimard]

The following commit has been merged in the master branch:
commit 896700ae2481f6c1f1a662b8cbcd4850812c6c6f
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Tue Dec 11 21:49:45 2012 +0100

    Store override_dh_fixperms in comments (to be used later ?)

diff --git a/debian/rules b/debian/rules
index 26ffe37..f605967 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,15 @@
 #export DH_VERBOSE=1
 
 LMSHAREDIR=/usr/share/lemonldap-ng
-LMVARDIR=/var/lib/lemonldap-ng
+LMVARDIR  =/var/lib/lemonldap-ng
+TMP       = $(CURDIR)/debian/tmp
+
+CONFDIR=/etc/lemonldap-ng
+SESSIONSDIR=$(LMVARDIR)/sessions
+CONFSTORAGEDIR=$(LMVARDIR)/conf
+FIRSTCONFFILE=$(CONFSTORAGEDIR)/lmConf-1
+LMINIFILE=$(CONFDIR)/lemonldap-ng.ini
+CAPTCHADIR=$(LMVARDIR)/portal/captcha_output
 
 %:
 	dh $@
@@ -36,7 +44,24 @@ override_dh_auto_install:
 	test -n "$$LOCALBUILD" || ./scripts/minifierjs $$(find debian/tmp/ -name '*.js')
 	test -n "$$LOCALBUILD" || ./scripts/minifiercss $$(find debian/tmp/ -name '*.css')
 
-	mkdir debian/tmp/usr/share/lemonldap-ng/manager debian/tmp/usr/share/lemonldap-ng/portal
-	mv debian/tmp/var/lib/lemonldap-ng/portal/*.pl debian/tmp/usr/share/lemonldap-ng/portal/
-	mv debian/tmp/var/lib/lemonldap-ng/manager/*pl debian/tmp/usr/share/lemonldap-ng/manager/
+	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
 
+# TO BE TESTED : lintian-overrides is it the only thing needed to hide perms warnings ?
+#override_dh_fixperms:
+#	dh_fixperms
+#	chown www-data:www-data \
+#		debian/*/$(SESSIONSDIR) \
+#		debian/*/$(SESSIONSDIR)/lock \
+#		debian/liblemonldap-ng-conf-perl/$(CONFSTORAGEDIR) \
+#		debian/liblemonldap-ng-portal-perl/$(CAPTCHADIR)
+#	chgrp www-data debian/liblemonldap-ng-conf-perl/$(LMINIFILE) \
+#		debian/liblemonldap-ng-conf-perl/$(FIRSTCONFFILE)
+#	chmod 770 debian/*/$(SESSIONSDIR) debian/*/$(SESSIONSDIR)/lock
+#	chmod 750 debian/liblemonldap-ng-conf-perl/$(CONFSTORAGEDIR)
+#	chmod 640 debian/liblemonldap-ng-conf-perl/$(FIRSTCONFFILE) \
+#		debian/liblemonldap-ng-conf-perl/$(LMINIFILE)

-- 
Debian