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

Thijs Kinkhorst thijs at costa.debian.org
Mon Aug 21 23:55:50 UTC 2006 

Author: thijs
Date: 2006-08-21 23:55:48 +0000 (Mon, 21 Aug 2006)
New Revision: 336

Added:
   trunk/debian/mailman-doc.dirs
   trunk/debian/mailman-doc.install
   trunk/debian/mailman.dirs
   trunk/debian/mailman.install
   trunk/debian/mailman.logrotate
Removed:
   trunk/debian/dirs
   trunk/debian/logrotate
Modified:
   trunk/debian/README.Debian
   trunk/debian/control
   trunk/debian/rules
Log:
first iteration of package split: split out mailman-doc to its own
package. Related changes:
* Move {logrotate,dirs} to mailman.{logrotate,dirs} for clarity;
* Update debian/rules to use more of the debhelper tools instead
  of doing stuff itself;
* Remove some small bits of cruft


Modified: trunk/debian/README.Debian
===================================================================
--- trunk/debian/README.Debian	2006-08-16 13:12:36 UTC (rev 335)
+++ trunk/debian/README.Debian	2006-08-21 23:55:48 UTC (rev 336)
@@ -1,6 +1,12 @@
 Notes for the debian mailman package.
 =====================================
 
+Full documentation is available when the mailman-doc package is installed.
+
+
+Getting started
+---------------
+
 You can access the web interface of mailman on
 http://<hostname>/cgi-bin/mailman/listinfo
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2006-08-16 13:12:36 UTC (rev 335)
+++ trunk/debian/control	2006-08-21 23:55:48 UTC (rev 336)
@@ -10,6 +10,7 @@
 Architecture: any
 Pre-Depends: debconf (>= 1.4.16) | debconf-2.0
 Depends: ${shlibs:Depends}, python (>= 2.2.2.91-1), logrotate, cron (>= 3.0pl1-42), exim4 | mail-transport-agent, apache2 | httpd, ucf (>= 0.28), pwgen, adduser, lsb-base
+Recommends: mailman-doc
 Conflicts: suidmanager (<< 0.50), sendmail (<< 8.12.6)
 Suggests: spamassassin, lynx, python2.3-korean-codecs | python2.2-korean-codecs, python-japanese-codecs, listadmin
 Description: Powerful, web-based mailing list manager
@@ -26,3 +27,13 @@
  automated bounce handling and integrated spam prevention.
  .
  Homepage: http://www.list.org/
+
+Package: mailman-doc
+Suggests: mailman (>= 1:2.1.8-3)
+Replaces: mailman (<< 1:2.1.8-3)
+Architecture: all
+Description: Documentation for Mailman, web-based mailing list manager
+ Examples and documentation for the mailman package: the GNU Mailing List
+ Manager.
+
+

Deleted: trunk/debian/dirs
===================================================================
--- trunk/debian/dirs	2006-08-16 13:12:36 UTC (rev 335)
+++ trunk/debian/dirs	2006-08-21 23:55:48 UTC (rev 336)
@@ -1,13 +0,0 @@
-usr/lib/mailman
-usr/sbin
-usr/share/doc/mailman/examples/stock
-usr/share/doc/mailman/src
-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

Deleted: trunk/debian/logrotate
===================================================================
--- trunk/debian/logrotate	2006-08-16 13:12:36 UTC (rev 335)
+++ trunk/debian/logrotate	2006-08-21 23:55:48 UTC (rev 336)
@@ -1,51 +0,0 @@
-/var/log/mailman/vette /var/log/mailman/error /var/log/mailman/bounce {
-	weekly
-	missingok
-	create 0664 list list
-	rotate 4
-	compress
-	delaycompress
-        sharedscripts
-        postrotate
-            [ -f '/var/run/mailman/mailman.pid' ] && kill -HUP $(cat /var/run/mailman/mailman.pid) || exit 0
-        endscript
-}
-
-/var/log/mailman/digest {
-	monthly
-	missingok
-	create 0664 list list
-	rotate 4
-	compress
-	delaycompress
-        sharedscripts
-        postrotate
-            [ -f '/var/run/mailman/mailman.pid' ] && kill -HUP $(cat /var/run/mailman/mailman.pid) || exit 0
-        endscript
-}
-
-/var/log/mailman/subscribe /var/log/mailman/post {
-	monthly
-	missingok
-	create 0664 list list
-	rotate 12
-	compress
-	delaycompress
-        sharedscripts
-        postrotate
-            [ -f '/var/run/mailman/mailman.pid' ] && kill -HUP $(cat /var/run/mailman/mailman.pid) || exit 0
-        endscript
-}
-
-/var/log/mailman/qrunner /var/log/mailman/fromusenet /var/log/mailman/locks /var/log/mailman/smtp /var/log/mailman/smtp-failure {
-	daily
-	missingok
-	create 0664 list list
-	rotate 7
-	compress
-	delaycompress
-        sharedscripts
-        postrotate
-            [ -f '/var/run/mailman/mailman.pid' ] && kill -HUP $(cat /var/run/mailman/mailman.pid) || exit 0
-        endscript
-}

Added: trunk/debian/mailman-doc.dirs
===================================================================
--- trunk/debian/mailman-doc.dirs	2006-08-16 13:12:36 UTC (rev 335)
+++ trunk/debian/mailman-doc.dirs	2006-08-21 23:55:48 UTC (rev 336)
@@ -0,0 +1,2 @@
+usr/share/doc/mailman/src
+usr/share/doc/mailman/html

Added: trunk/debian/mailman-doc.install
===================================================================
--- trunk/debian/mailman-doc.install	2006-08-16 13:12:36 UTC (rev 335)
+++ trunk/debian/mailman-doc.install	2006-08-21 23:55:48 UTC (rev 336)
@@ -0,0 +1,6 @@
+admin/www/*	/usr/share/doc/mailman/html
+src/*.c		/usr/share/doc/mailman/src
+src/*.h		/usr/share/doc/mailman/src
+templates/*	/usr/share/doc/mailman/examples
+debian/mm_cfg.py	/usr/share/doc/mailman/examples
+Mailman/Defaults.py	/usr/share/doc/mailman/examples

Copied: trunk/debian/mailman.dirs (from rev 335, trunk/debian/dirs)
===================================================================
--- trunk/debian/dirs	2006-08-16 13:12:36 UTC (rev 335)
+++ trunk/debian/mailman.dirs	2006-08-21 23:55:48 UTC (rev 336)
@@ -0,0 +1,11 @@
+usr/lib/mailman
+usr/sbin
+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

Added: trunk/debian/mailman.install
===================================================================

Copied: trunk/debian/mailman.logrotate (from rev 335, trunk/debian/logrotate)

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2006-08-16 13:12:36 UTC (rev 335)
+++ trunk/debian/rules	2006-08-21 23:55:48 UTC (rev 336)
@@ -11,8 +11,6 @@
 	add_members list_members remove_members arch clone_member	\
 	sync_members check_db check_perms list_admins withlist
 
-#manpages=move_list.8 list_lists.8 find_member.8 config_list.8 digest_arch.8 mmsitepass.8 newlist.8 rmlist.8 add_members.8 list_members.8 remove_members.8 mmarch.8 clone_member.8 sync_members.8 check_db.8 check_perms.8
-manpages = debian/*.8
 #export DH_VERBOSE=1
 
 SHELL=/bin/bash
@@ -45,7 +43,7 @@
 		--with-urlhost=localhost
 
 clean: unpatch
-	$(checkdir)
+	dh_testdir
 	-$(MAKE) distclean
 	rm -rf build-stamp Makefile debian/ucffiles debian/mailman.postinst.ucf
 	rm -f debian/mailman.postrm.ucf
@@ -54,18 +52,18 @@
 	chmod +x debian/{prerm,postinst}
 
 binary-indep:	checkroot build
-	$(checkdir)
+	dh_testdir
 # There are no architecture-independent files to be uploaded
 # generated by this package.  If there were any they would be
 # made here.
 
 
 binary-arch:	checkroot build
-	$(checkdir)
-#	rm -rf debian/mailman && install -d debian/mailman
+	dh_testdir
+	dh_install
 	dh_installdirs
-	dh_installdocs ACKNOWLEDGMENTS README* TODO BUGS NEWS FAQ
-	dh_installchangelogs
+	dh_installdocs ACKNOWLEDGMENTS README* TODO FAQ
+	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 \
@@ -124,18 +122,12 @@
 	dh_link etc/$(package)/mm_cfg.py \
 		usr/lib/$(package)/Mailman/mm_cfg.py
 
-	cp -a src/*.c src/*.h debian/mailman/usr/share/doc/$(package)/src
-#	cp -a misc/*jpg misc/*.png debian/mailman/usr/share/doc/$(package)/images
-	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
 	dh_installdebconf
-	dh_installexamples templates/* debian/mm_cfg.py \
-		debian/mailman/usr/lib/$(package)/Mailman/Defaults.py
-#	dh_installcron
 	dh_strip
 	dh_compress
 	dh_fixperms
@@ -216,19 +208,15 @@
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
-	dpkg --build debian/mailman ..
+	dh_builddeb
 
 
-define checkdir
-	test -f debian/rules
-endef
-
 # Below here is fairly generic really
 
 binary:		binary-indep binary-arch
 
 checkroot:
-	$(checkdir)
+	dh_testdir
 	dh_testroot
 
 .PHONY: binary binary-arch binary-indep clean checkroot

More information about the Pkg-mailman-hackers mailing list