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

[Thijs Kinkhorst]

Author: thijs
Date: 2006-10-04 08:47:52 +0000 (Wed, 04 Oct 2006)
New Revision: 412

Removed:
   trunk/debian/mailman-doc.dirs
   trunk/debian/mailman.install
Modified:
   trunk/debian/mailman.dirs
   trunk/debian/mailman.docs
   trunk/debian/rules
Log:
correct some details in package split revert


Deleted: trunk/debian/mailman-doc.dirs
===================================================================
--- trunk/debian/mailman-doc.dirs	2006-10-04 08:30:29 UTC (rev 411)
+++ trunk/debian/mailman-doc.dirs	2006-10-04 08:47:52 UTC (rev 412)
@@ -1 +0,0 @@
-usr/share/doc/mailman/html

Modified: trunk/debian/mailman.dirs
===================================================================
--- trunk/debian/mailman.dirs	2006-10-04 08:30:29 UTC (rev 411)
+++ trunk/debian/mailman.dirs	2006-10-04 08:47:52 UTC (rev 412)
@@ -1,9 +1,12 @@
 usr/lib/mailman
 usr/sbin
+usr/share/doc/mailman/examples/stock
 usr/share/lintian/overrides
 usr/share/mailman
+usr/share/images/mailman
 usr/lib/cgi-bin
 var/log/mailman
 var/lib/mailman/templates
 var/lock
 var/run/mailman
+etc/logrotate.d

Modified: trunk/debian/mailman.docs
===================================================================
--- trunk/debian/mailman.docs	2006-10-04 08:30:29 UTC (rev 411)
+++ trunk/debian/mailman.docs	2006-10-04 08:47:52 UTC (rev 412)
@@ -1 +1 @@
-README.Exim4.Debian
+debian/README.Exim4.Debian

Deleted: trunk/debian/mailman.install
===================================================================
--- trunk/debian/mailman.install	2006-10-04 08:30:29 UTC (rev 411)
+++ trunk/debian/mailman.install	2006-10-04 08:47:52 UTC (rev 412)
@@ -1,4 +0,0 @@
-admin/www/*	/usr/share/doc/mailman/html
-templates/*	/usr/share/doc/mailman/examples
-debian/mm_cfg.py	/usr/share/doc/mailman/examples
-Mailman/Defaults.py	/usr/share/doc/mailman/examples

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2006-10-04 08:30:29 UTC (rev 411)
+++ trunk/debian/rules	2006-10-04 08:47:52 UTC (rev 412)
@@ -120,13 +120,15 @@
 	rm debian/$(package)/usr/lib/$(package)/Mailman/mm_cfg.py
 	dh_link etc/$(package)/mm_cfg.py \
 		usr/lib/$(package)/Mailman/mm_cfg.py
-
+	cp -a admin/www debian/mailman/usr/share/doc/$(package)/html
 	for bin in $(binaries); \
 		do dh_link usr/lib/$(package)/bin/$$bin usr/sbin/$$bin; done
 	mv debian/mailman/usr/sbin/arch debian/mailman/usr/sbin/mmarch
 	dh_installman
-	dh_installinit --name=mailman
+	dh_installinit
 	dh_installdebconf
+	dh_installexamples templates/* debian/mm_cfg.py \
+		debian/mailman/usr/lib/$(package)/Mailman/Defaults.py
 	dh_strip
 	dh_compress
 	dh_fixperms