[Pkg-mailman-hackers] Pkg-mailman commit - rev 616 - trunk/debian

[Thijs Kinkhorst]

Author: thijs
Date: 2009-03-14 14:52:57 +0000 (Sat, 14 Mar 2009)
New Revision: 616

Modified:
   trunk/debian/changelog
   trunk/debian/lintian-overrides
   trunk/debian/mailman.dirs
   trunk/debian/rules
Log:
forgot to remove shipped var/{run,lock} dirs


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-03-14 13:13:47 UTC (rev 615)
+++ trunk/debian/changelog	2009-03-14 14:52:57 UTC (rev 616)
@@ -16,9 +16,10 @@
     + Fixes bounce handling NotAMemberError (closes: #517997).
   * Various packaging cleanups, upgrade debhelper to level 7.
   * Removes embedded copy of pythonlib/email module.
-  * Checked for policy 3.8.1, no changes.
+  * Checked for policy 3.8.1, remove shipped var/{run,lock}
+    dirs, they are already created correctly by the init script.
 
- -- Thijs Kinkhorst <thijs at debian.org>  Sat, 14 Mar 2009 14:14:19 +0100
+ -- Thijs Kinkhorst <thijs at debian.org>  Sat, 14 Mar 2009 14:18:16 +0100
 
 mailman (1:2.1.11-11) unstable; urgency=high
 

Modified: trunk/debian/lintian-overrides
===================================================================
--- trunk/debian/lintian-overrides	2009-03-14 13:13:47 UTC (rev 615)
+++ trunk/debian/lintian-overrides	2009-03-14 14:52:57 UTC (rev 616)
@@ -19,9 +19,9 @@
 non-standard-dir-perm var/lib/mailman/data/ 2775 != 0755
 non-standard-dir-perm var/lib/mailman/spam/ 2775 != 0755
 non-standard-dir-perm var/lib/mailman/qfiles/ 2775 != 0755
+non-standard-dir-perm var/lib/mailman/locks/ 2775 != 0755
 non-standard-dir-perm var/lib/mailman/tests/ 2775 != 0755
 non-standard-dir-perm var/lib/mailman/tests/bounces/ 2775 != 0755
 non-standard-dir-perm var/lib/mailman/tests/msgs/ 2775 != 0755
-non-standard-dir-perm var/lock/mailman/ 2775 != 0755
 symlink-should-be-relative var/lib/mailman/locks /var/lock/mailman
 symlink-should-be-relative var/lib/mailman/logs /var/log/mailman

Modified: trunk/debian/mailman.dirs
===================================================================
--- trunk/debian/mailman.dirs	2009-03-14 13:13:47 UTC (rev 615)
+++ trunk/debian/mailman.dirs	2009-03-14 14:52:57 UTC (rev 616)
@@ -6,6 +6,4 @@
 usr/lib/cgi-bin
 var/log/mailman
 var/lib/mailman/templates
-var/lock
-var/run/mailman
 etc/logrotate.d

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2009-03-14 13:13:47 UTC (rev 615)
+++ trunk/debian/rules	2009-03-14 14:52:57 UTC (rev 616)
@@ -128,7 +128,7 @@
 	chown -R root:root debian/mailman
 	chown -R root:list \
 		debian/mailman/{etc/$(package),var/lib/$(package),usr/lib/{$(package),cgi-bin/$(package)}}
-	chown list:list debian/mailman/var/{lib/mailman/qfiles,run/mailman}
+	chown list:list debian/mailman/var/lib/mailman/qfiles
 	chown root:list debian/mailman/var/log/mailman
 	# set 2755 except messages/
 	find debian/mailman/var/lib/$(package) -path debian/mailman/var/lib/$(package)/messages -prune -o -type d -exec chmod 2775 {} \;
@@ -187,17 +187,13 @@
 	# e.g. when /var/log is symlinked to somewhere else. They need to be last because
 	# otherwise dh_link will revert them back to relative ones.
 	#
-	# move the locks to /var/lock
-	mv debian/mailman/var/lib/$(package)/locks debian/mailman/var/lock/mailman
 	# link it back to /var/lib/mailman/locks
 	ln -s /var/lock/mailman debian/mailman/var/lib/$(package)/locks
 	# remove the log directory and link it to /var/log/mailman
 	rmdir debian/mailman/var/lib/$(package)/logs 
 	ln -s /var/log/mailman debian/mailman/var/lib/$(package)/logs
-	chown list:list debian/mailman/var/lock/mailman
 	chown root:list debian/mailman/var/log/mailman
 	chmod 2770 debian/mailman/var/log/mailman
-	chmod g+w debian/mailman/var/lock/mailman
 
 	dh_installdeb
 	dh_shlibdeps