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

[Thijs Kinkhorst]

Author: thijs
Date: 2006-09-19 20:16:50 +0000 (Tue, 19 Sep 2006)
New Revision: 378

Added:
   trunk/debian/mailman-common.links
Modified:
   trunk/debian/mailman-common.dirs
   trunk/debian/rules
Log:
move images to -common
(note that I'm taking small steps ; I've got quite some scattered
amounts of time available and will just commit any improvement over
the previous state)


Modified: trunk/debian/mailman-common.dirs
===================================================================
--- trunk/debian/mailman-common.dirs	2006-09-19 19:42:14 UTC (rev 377)
+++ trunk/debian/mailman-common.dirs	2006-09-19 20:16:50 UTC (rev 378)
@@ -1,2 +1,3 @@
 etc/mailman
 usr/lib/mailman/Mailman
+usr/share/images/mailman

Added: trunk/debian/mailman-common.links
===================================================================
--- trunk/debian/mailman-common.links	                        (rev 0)
+++ trunk/debian/mailman-common.links	2006-09-19 20:16:50 UTC (rev 378)
@@ -0,0 +1,2 @@
+/usr/share/images/mailman	usr/share/doc/mailman/images
+/usr/share/images/mailman	var/lib/mailman/icons

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2006-09-19 19:42:14 UTC (rev 377)
+++ trunk/debian/rules	2006-09-19 20:16:50 UTC (rev 378)
@@ -65,8 +65,8 @@
 	dh_installchangelogs NEWS
 	$(MAKE) doinstall prefix=$$(pwd)/debian/mailman/var/lib/$(package) \
 		var_prefix=$$(pwd)/debian/mailman/var/lib/$(package) \
-		icondir=$$(pwd)/debian/mailman/usr/share/images/mailman \
-		ICONDIR=$$(pwd)/debian/mailman/usr/share/images/mailman
+		icondir=$$(pwd)/debian/mailman-common/usr/share/images/mailman \
+		ICONDIR=$$(pwd)/debian/mailman-common/usr/share/images/mailman
 
 	#rmdir debian/$(package)/var/lib/mailman/pythonlib
 
@@ -90,9 +90,7 @@
 
 	# Backwards compatibility link
 	dh_link usr/lib/mailman/mail/mailman usr/lib/mailman/mail/wrapper
-	dh_link usr/share/images/mailman usr/share/doc/mailman/images
 	rmdir debian/$(package)/var/lib/mailman/icons
-	dh_link usr/share/images/mailman var/lib/mailman/icons
 
         # move the templates to /etc/mailman
 	mv debian/mailman/var/lib/$(package)/templates debian/mailman/etc/mailman