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

[Thijs Kinkhorst]

Author: thijs
Date: 2007-12-01 23:22:02 +0000 (Sat, 01 Dec 2007)
New Revision: 517

Modified:
   trunk/debian/changelog
   trunk/debian/rules
Log:
* Make symlinks to /var/lo{g,ck}/mailman absolute, because the relative
  ones cause trouble on systems where people move these things around
  (Closes: #408855, #413604).


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-12-01 19:07:13 UTC (rev 516)
+++ trunk/debian/changelog	2007-12-01 23:22:02 UTC (rev 517)
@@ -11,8 +11,11 @@
     since that is the supported way of rotating logs (Closes: #424620).
   * Fix pidfile location in mailman.init, thanks Peter Rabbitson
     (Closes: #439325).
+  * Make symlinks to /var/lo{g,ck}/mailman absolute, because the relative
+    ones cause trouble on systems where people move these things around
+    (Closes: #408855, #413604).
 
- -- Thijs Kinkhorst <thijs at debian.org>  Sat,  1 Dec 2007 17:23:53 +0100
+ -- Thijs Kinkhorst <thijs at debian.org>  Sun,  2 Dec 2007 00:19:43 +0100
 
 mailman (1:2.1.9-8) unstable; urgency=low
 

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2007-12-01 19:07:13 UTC (rev 516)
+++ trunk/debian/rules	2007-12-01 23:22:02 UTC (rev 517)
@@ -101,19 +101,11 @@
 	# link it back to /var/lib/mailman/templates
 	dh_link etc/mailman var/lib/$(package)/templates
 
-	# remove the log directory and link it to /var/log/mailman
-	rmdir debian/mailman/var/lib/$(package)/logs 
-	dh_link var/log/mailman var/lib/$(package)/logs
 
 	# move the pending subscriptions database so it doesnt overwrite the
 	# old one when installing
 
-        # 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
-	dh_link var/lock/mailman var/lib/$(package)/locks
-
 	dh_installlogrotate
 
 	install -m 0644 debian/mm_cfg.py debian/mailman/usr/lib/mailman/Mailman/mm_cfg.py.dist
@@ -136,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/{lock/mailman,lib/mailman/qfiles,run/mailman}
+	chown list:list debian/mailman/var/{lib/mailman/qfiles,run/mailman}
 	chown root:list debian/mailman/var/log/mailman
 	find debian/mailman/var/lib/$(package) -type d -exec chmod 2775 {} \;
 	find debian/mailman/var/lib/$(package)/messages -type d -exec chmod 755 {} \;
@@ -178,8 +170,6 @@
 	chmod o-x debian/mailman/var/lib/$(package)/archives/private
 	chmod 0755 debian/mailman/usr/lib/$(package)/cron/*
 	chmod 0644 debian/mailman/usr/lib/$(package)/cron/{crontab.in,paths.py}
-	chmod 2770 debian/mailman/var/log/mailman
-	chmod g+w debian/mailman/var/lock/mailman
 
 #	Python Policy
 	dh_pysupport -a `find debian/mailman/usr/lib/mailman/Mailman/ debian/mailman/usr/lib/mailman/pythonlib/ -type d`
@@ -191,6 +181,23 @@
 	egrep -rlZ '^#!(.*)python' debian/mailman/usr/lib/mailman | xargs -0 chmod a+x --
 	find debian/mailman/usr/share/doc/mailman -name "*.html" -exec chmod -x {} \;
 	find debian/mailman/usr/share/doc/mailman -name "*.txt" -exec chmod -x {} \;
+       
+        # Create the /var/lo{g,ck} links last, and wih ln -s, because they need to be
+	# absolute links. Relative links cause trouble for people making multiple levels,
+	# 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