[SCM] Debian branch, master, updated. debian/1.2.2-3-14-gd165364

[Xavier Guimard]

The following commit has been merged in the master branch:
commit d165364dec8e11804d81545f3954f655a6c86fcc
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Sun Apr 7 13:25:45 2013 +0200

    Fix permissions in debian/rules instead of in postinst scripts and add lintian-overrides files to hide lintian permissions warnings

diff --git a/debian/changelog b/debian/changelog
index 54b90dc..7bb1c0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,6 @@
 lemonldap-ng (1.2.3-1) UNRELEASED; urgency=low
 
   TODO:
-  - debian/liblemonldap-ng-conf-perl.postinst and
-    debian/liblemonldap-ng-portal-perl.postinst contain commands to change
-    ownership and permissions. You have removed the unsafe "chown -R", but I
-    think all of that should be done at build time (from debian/rules), which
-    would also help to preserve local changes to those ownerships and
-    permissions, e.g. those which the admin configured using
-    dpkg-statoverride.
-    => Can you give me an example ? I've tried to use override_dh_fixperms
-       but I don't know if a lintian-overrides is recommended here to hide
-       warnings
-
   - the webapps policy is still a draft document, but in its current state it
     seems to mandate that what lemonldap-ng puts under /var/lib/lemonldap-ng be
     put into /usr/share/<package> subdirectories, where some scripts already
@@ -31,6 +20,8 @@ lemonldap-ng (1.2.3-1) UNRELEASED; urgency=low
     + update years
   * Update dependencies (many changes in upstream)
   * Remove verify-saml-signatures.patch now included in upstream
+  * Fix permissions in debian/rules instead of in postinst scripts and add
+    lintian-overrides files to hide lintian permissions warnings
 
  -- Xavier Guimard <x.guimard at free.fr>  Fri, 08 Feb 2013 21:17:48 +0100
 
diff --git a/debian/liblemonldap-ng-conf-perl.lintian-overrides b/debian/liblemonldap-ng-conf-perl.lintian-overrides
new file mode 100644
index 0000000..bc0bd70
--- /dev/null
+++ b/debian/liblemonldap-ng-conf-perl.lintian-overrides
@@ -0,0 +1,5 @@
+liblemonldap-ng-conf-perl: non-standard-file-perm etc/lemonldap-ng/lemonldap-ng.ini 0640 != 0644
+liblemonldap-ng-conf-perl: non-standard-dir-perm var/lib/lemonldap-ng/conf/ 0750 != 0755
+liblemonldap-ng-conf-perl: non-standard-file-perm var/lib/lemonldap-ng/conf/lmConf-1 0640 != 0644
+liblemonldap-ng-conf-perl: non-standard-dir-perm var/lib/lemonldap-ng/sessions/ 0770 != 0755
+liblemonldap-ng-conf-perl: non-standard-dir-perm var/lib/lemonldap-ng/sessions/lock/ 0770 != 0755
diff --git a/debian/liblemonldap-ng-handler-perl.lintian-overrides b/debian/liblemonldap-ng-handler-perl.lintian-overrides
new file mode 100644
index 0000000..c242971
--- /dev/null
+++ b/debian/liblemonldap-ng-handler-perl.lintian-overrides
@@ -0,0 +1,2 @@
+liblemonldap-ng-handler-perl: non-standard-dir-perm var/lib/lemonldap-ng/sessions/ 0770 != 0755
+liblemonldap-ng-handler-perl: non-standard-dir-perm var/lib/lemonldap-ng/sessions/lock/ 0770 != 0755
diff --git a/debian/liblemonldap-ng-portal-perl.lintian-overrides b/debian/liblemonldap-ng-portal-perl.lintian-overrides
new file mode 100644
index 0000000..ac4ee6f
--- /dev/null
+++ b/debian/liblemonldap-ng-portal-perl.lintian-overrides
@@ -0,0 +1,3 @@
+liblemonldap-ng-portal-perl: non-standard-dir-perm var/lib/lemonldap-ng/sessions/lock/ 0770 != 0755
+liblemonldap-ng-portal-perl: non-standard-dir-perm var/lib/lemonldap-ng/sessions/ 0770 != 0755
+
diff --git a/debian/rules b/debian/rules
index 0a6be63..b2cb1a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,16 +52,16 @@ 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)
+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