[Pkg-mailman-hackers] Pkg-mailman commit - rev 411 - in
trunk/debian: . patches
Thijs Kinkhorst
thijs at costa.debian.org
Wed Oct 4 08:30:30 UTC 2006
Author: thijs
Date: 2006-10-04 08:30:29 +0000 (Wed, 04 Oct 2006)
New Revision: 411
Added:
trunk/debian/lintian-overrides
trunk/debian/mailman.docs
trunk/debian/mailman.init
trunk/debian/mailman.install
trunk/debian/mailman.logrotate
trunk/debian/mailman.manpages
Removed:
trunk/debian/lintian/
trunk/debian/mailman-common.dirs
trunk/debian/mailman-common.install
trunk/debian/mailman-common.links
trunk/debian/mailman-common.mailman.init
trunk/debian/mailman-common.mailman.logrotate
trunk/debian/mailman-common.manpages
trunk/debian/mailman-doc.install
trunk/debian/mailman.install
trunk/debian/patches/81_build_arch_indep.patch
Modified:
trunk/debian/README.Debian
trunk/debian/changelog
trunk/debian/control
trunk/debian/mailman.dirs
trunk/debian/patches/series
trunk/debian/rules
Log:
revert package split before etch
Modified: trunk/debian/README.Debian
===================================================================
--- trunk/debian/README.Debian 2006-10-04 08:14:00 UTC (rev 410)
+++ trunk/debian/README.Debian 2006-10-04 08:30:29 UTC (rev 411)
@@ -1,9 +1,7 @@
Notes for the debian mailman package.
=====================================
-Full documentation is available when the mailman-doc package is installed.
-
Getting started
---------------
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-10-04 08:14:00 UTC (rev 410)
+++ trunk/debian/changelog 2006-10-04 08:30:29 UTC (rev 411)
@@ -1,8 +1,6 @@
mailman (1:2.1.8-5) UNRELEASED; urgency=low
[ Thijs Kinkhorst ]
- * Split the mailman package into mailman (architecture dependent files),
- mailman-common (architecture independent), mailman-doc (documentation).
* Tweak debconf templates according to best practices.
* Update debconf templates, eliminates two, changes some, introduces
new line numbering from debconf-updatepo.
@@ -23,7 +21,7 @@
* Updated it.po: Translated by Luca Monducci. (Closes: #388657)
* Updated cs.po: Translated by Miroslav Kure. (Closes: #388663)
- -- Thijs Kinkhorst <thijs at debian.org> Fri, 29 Sep 2006 17:52:09 +0200
+ -- Thijs Kinkhorst <thijs at debian.org> Wed, 4 Oct 2006 10:22:35 +0200
mailman (1:2.1.8-4) unstable; urgency=high
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2006-10-04 08:14:00 UTC (rev 410)
+++ trunk/debian/control 2006-10-04 08:30:29 UTC (rev 411)
@@ -3,15 +3,14 @@
Priority: optional
Maintainer: Mailman for Debian <pkg-mailman-hackers at lists.alioth.debian.org>
Uploaders: Tollef Fog Heen <tfheen at debian.org>, Lionel Elie Mamane <lmamane at debian.org>, Thijs Kinkhorst <thijs at debian.org>, Hector Garcia <hector at debian.org>
-Build-Depends: debhelper (>= 5), autoconf, python-dev, quilt (>= 0.40), dpkg-dev (>= 1.13.19)
+Build-Depends: debhelper (>= 5), autoconf, python-dev, quilt (>= 0.40)
Standards-Version: 3.7.2
XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-mailman
Package: mailman
Architecture: any
Pre-Depends: debconf (>= 1.4.16) | debconf-2.0
-Depends: mailman-common (= ${source:Version}), ${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 (>= 3.0-6)
-Recommends: mailman-doc
+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 (>= 3.0-6)
Conflicts: suidmanager (<< 0.50), sendmail (<< 8.12.6)
Suggests: spamassassin, lynx, python-korean-codecs, python-japanese-codecs, listadmin
Description: Powerful, web-based mailing list manager
@@ -29,21 +28,3 @@
.
Homepage: http://www.list.org/
-Package: mailman-common
-Recommends: mailman (>= 1:2.1.8-3)
-Replaces: mailman (<< 1:2.1.8-3)
-Architecture: all
-Description: Architecture-independent files for Mailman mailing list manager
- Support files necessary to run Mailman, the GNU Mailing list manager.
- This is only useful when installed with the 'mailman' package, which depends
- on this package.
-
-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.
-
-
Added: trunk/debian/lintian-overrides
===================================================================
--- trunk/debian/lintian-overrides (rev 0)
+++ trunk/debian/lintian-overrides 2006-10-04 08:30:29 UTC (rev 411)
@@ -0,0 +1,48 @@
+setgid-binary usr/lib/mailman/mail/mailman 2755 root/list
+setgid-binary usr/lib/cgi-bin/mailman/admindb 2755 root/list
+setgid-binary usr/lib/cgi-bin/mailman/admin 2755 root/list
+setgid-binary usr/lib/cgi-bin/mailman/confirm 2755 root/list
+setgid-binary usr/lib/cgi-bin/mailman/create 2755 root/list
+setgid-binary usr/lib/cgi-bin/mailman/edithtml 2755 root/list
+setgid-binary usr/lib/cgi-bin/mailman/listinfo 2755 root/list
+setgid-binary usr/lib/cgi-bin/mailman/options 2755 root/list
+setgid-binary usr/lib/cgi-bin/mailman/private 2755 root/list
+setgid-binary usr/lib/cgi-bin/mailman/rmlist 2755 root/list
+setgid-binary usr/lib/cgi-bin/mailman/roster 2755 root/list
+setgid-binary usr/lib/cgi-bin/mailman/subscribe 2755 root/list
+setgid-binary usr/lib/cgi-bin/mailman/savannah 2755 root/list
+non-standard-dir-perm var/log/mailman/ 2775 != 0755
+non-standard-dir-perm var/lib/mailman/ 2775 != 0755
+non-standard-dir-perm var/lib/mailman/archives/ 2775 != 0755
+non-standard-dir-perm var/lib/mailman/archives/private/ 2774 != 0755
+non-standard-dir-perm var/lib/mailman/archives/public/ 2775 != 0755
+non-standard-dir-perm var/lib/mailman/lists/ 2775 != 0755
+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/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/ 0775 != 0755
+non-standard-dir-perm var/lib/mailman/pythonlib/ 2775 != 0755
+non-standard-dir-perm var/lib/mailman/pythonlib/email/ 2775 != 0755
+
+# We override this because we use the default field translation
+# in accordance with developer's reference 6.5.4.4
+select-with-translated-default-field mailman/site_languages hu.utf-8
+select-with-translated-default-field mailman/site_languages ja.utf-8
+select-with-translated-default-field mailman/site_languages ru.utf-8
+select-with-translated-default-field mailman/site_languages sv.utf-8
+select-with-translated-default-field mailman/site_languages vi.utf-8
+select-with-translated-default-field mailman/site_languages cs.utf-8
+select-with-translated-default-field mailman/site_languages fr.utf-8
+select-with-translated-default-field mailman/site_languages it.utf-8
+select-with-translated-default-field mailman/default_server_language hu.utf-8
+select-with-translated-default-field mailman/default_server_language ja.utf-8
+select-with-translated-default-field mailman/default_server_language ru.utf-8
+select-with-translated-default-field mailman/default_server_language sv.utf-8
+select-with-translated-default-field mailman/default_server_language vi.utf-8
+select-with-translated-default-field mailman/default_server_language cs.utf-8
+select-with-translated-default-field mailman/default_server_language fr.utf-8
+select-with-translated-default-field mailman/default_server_language it.utf-8
+
Deleted: trunk/debian/mailman-common.dirs
===================================================================
--- trunk/debian/mailman-common.dirs 2006-10-04 08:14:00 UTC (rev 410)
+++ trunk/debian/mailman-common.dirs 2006-10-04 08:30:29 UTC (rev 411)
@@ -1,30 +0,0 @@
-etc/mailman
-usr/lib/mailman/bin
-usr/lib/mailman/mail
-
-usr/sbin
-
-usr/share/doc/mailman
-usr/share/images/mailman
-
-var/lib/mailman/archives/private
-var/lib/mailman/archives/public
-var/lib/mailman/data
-var/lib/mailman/lists
-var/lib/mailman/qfiles
-var/lib/mailman/qfiles/archive
-var/lib/mailman/qfiles/bad
-var/lib/mailman/qfiles/bounces
-var/lib/mailman/qfiles/commands
-var/lib/mailman/qfiles/in
-var/lib/mailman/qfiles/maildir
-var/lib/mailman/qfiles/news
-var/lib/mailman/qfiles/out
-var/lib/mailman/qfiles/retry
-var/lib/mailman/qfiles/shunt
-var/lib/mailman/qfiles/virgin
-var/lib/mailman/spam
-
-var/lock/mailman
-var/log/mailman
-var/run/mailman
Deleted: trunk/debian/mailman-common.install
===================================================================
--- trunk/debian/mailman-common.install 2006-10-04 08:14:00 UTC (rev 410)
+++ trunk/debian/mailman-common.install 2006-10-04 08:30:29 UTC (rev 411)
@@ -1,17 +0,0 @@
-debian/mm_cfg.py /usr/lib/mailman/Mailman
-debian/contrib/apache.conf /etc/mailman
-debian/README.Exim4.Debian /usr/share/doc/mailman
-
-build/contrib/qmail-to-mailman.py /usr/share/mailman
-debian/contrib/postfix-to-mailman.py /usr/share/mailman
-
-debian/contrib/savannah /usr/lib/mailman/Mailman/Cgi
-debian/contrib/SpamAssassin.py /usr/lib/mailman/Mailman/Handlers
-debian/contrib/spamd.py /usr/lib/mailman/Mailman/Handlers
-
-misc/sitelist.cfg /var/lib/mailman/data
-
-misc/paths.py /usr/lib/mailman/bin
-misc/paths.py /usr/lib/mailman/cron
-
-debian/lintian/mailman-common /usr/share/lintian/overrides/
Deleted: trunk/debian/mailman-common.links
===================================================================
--- trunk/debian/mailman-common.links 2006-10-04 08:14:00 UTC (rev 410)
+++ trunk/debian/mailman-common.links 2006-10-04 08:30:29 UTC (rev 411)
@@ -1,38 +0,0 @@
-/usr/share/images/mailman usr/share/doc/mailman/images
-/usr/share/images/mailman var/lib/mailman/icons
-
-/etc/mailman/mm_cfg.py usr/lib/mailman/Mailman/mm_cfg.py
-/etc/mailman/postfix-to-mailman.py usr/lib/mailman/bin/postfix-to-mailman.py
-/etc/mailman/qmail-to-mailman.py usr/lib/mailman/bin/qmail-to-mailman.py
-
-/usr/lib/mailman/mail/mailman usr/lib/mailman/mail/wrapper
-
-/usr/lib/mailman/bin/list_lists usr/sbin/list_lists
-/usr/lib/mailman/bin/find_member usr/sbin/find_member
-/usr/lib/mailman/bin/config_list usr/sbin/config_list
-/usr/lib/mailman/bin/mmsitepass usr/sbin/mmsitepass
-/usr/lib/mailman/bin/newlist usr/sbin/newlist
-/usr/lib/mailman/bin/rmlist usr/sbin/rmlist
-/usr/lib/mailman/bin/add_members usr/sbin/add_members
-/usr/lib/mailman/bin/list_members usr/sbin/list_members
-/usr/lib/mailman/bin/remove_members usr/sbin/remove_members
-/usr/lib/mailman/bin/clone_member usr/sbin/clone_member
-/usr/lib/mailman/bin/sync_members usr/sbin/sync_members
-/usr/lib/mailman/bin/check_db usr/sbin/check_db
-/usr/lib/mailman/bin/check_perms usr/sbin/check_perms
-/usr/lib/mailman/bin/list_admins usr/sbin/list_admins
-/usr/lib/mailman/bin/withlist usr/sbin/withlist
-/usr/lib/mailman/bin/arch usr/sbin/mmarch
-
-/usr/lib/mailman/scripts var/lib/mailman/scripts
-
-/usr/lib/mailman/bin var/lib/mailman/bin
-/usr/lib/mailman/cron var/lib/mailman/cron
-/usr/lib/mailman/mail var/lib/mailman/mail
-/usr/lib/mailman/Mailman var/lib/mailman/Mailman
-/usr/lib/cgi-bin/mailman var/lib/mailman/cgi-bin
-
-/etc/mailman var/lib/mailman/templates
-
-/var/log/mailman var/lib/mailman/logs
-/var/lock/mailman var/lib/mailman/locks
Deleted: trunk/debian/mailman-common.mailman.init
===================================================================
--- trunk/debian/mailman-common.mailman.init 2006-10-04 08:14:00 UTC (rev 410)
+++ trunk/debian/mailman-common.mailman.init 2006-10-04 08:30:29 UTC (rev 411)
@@ -1,98 +0,0 @@
-#! /bin/sh
-#
-# mailman starts up the master queue runner for mailman
-#
-# Based on skeleton originally by Miquel van Smoorenburg and Ian Murdock,
-# customisations by Tollef Fog Heen and Thijs Kinkhorst for Debian.
-#
-### BEGIN INIT INFO
-# Provides: mailman-qrunner
-# Required-Start: $syslog mail-transport-agent $local_fs $remote_fs $named $network
-# Required-Stop: $syslog mail-transport-agent $local_fs $remote_fs $named $network
-# Should-Start:
-# Should-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Mailman Master Queue Runner
-# Description: Starts and stops the Mailman queue runners, used to
-# manage the various message queues within the Mailman
-# mailing list manager.
-### END INIT INFO
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/lib/mailman/bin/mailmanctl
-PIDFILE=/var/lib/mailman/data/master-qrunner.pid
-
-test -x $DAEMON || exit 0
-
-set -e
-
-if ! [ -d /var/run/mailman ]; then
- install -d -o list -g list /var/run/mailman
-fi
-
-if ! [ -d /var/lock/mailman ]; then
- install -d -o root -g list -m 2775 /var/lock/mailman
-fi
-
-. /lib/lsb/init-functions
-
-case "$1" in
- start)
- if [ "$(/var/lib/mailman/bin/list_lists -b | grep ^mailman$ )" = "" ]; then
- log_warning_msg "Site list for mailman (usually named mailman) missing."
- log_warning_msg "Please create it; until then, mailman will refuse to start."
- exit 0;
- fi
- log_daemon_msg "Starting Mailman master qrunner" "mailmanctl"
- if $DAEMON -s -q start; then
- log_end_msg 0
- else
- log_end_msg 1
- fi
- ;;
- stop)
- log_daemon_msg "Stopping Mailman master qrunner" "mailmanctl"
- if $DAEMON -q stop; then
- log_end_msg 0
- else
- log_end_msg 1
- fi
- ;;
- reload)
- log_begin_msg "Reloading Mailman master qrunner configuration"
- if $DAEMON -q restart; then
- log_end_msg 0
- else
- log_end_msg 1
- fi
- ;;
- restart|force-reload)
- PID=`cat $PIDFILE 2>/dev/null` || true
- log_daemon_msg "Restarting Mailman master qrunner" "mailmanctl"
- $DAEMON -q stop
- if test -n "$PID" && kill -0 $PID 2>/dev/null ; then
- log_action_begin_msg "Waiting"
- for cnt in `seq 1 5`; do
- sleep 1
- kill -0 $PID 2>/dev/null || break
- done;
- if kill -0 $PID 2>/dev/null ; then
- log_action_end_msg 1
- else
- log_action_end_msg 0
- fi
- fi
- if $DAEMON -q start; then
- log_end_msg 0
- else
- log_end_msg 1
- fi
- ;;
- *)
- echo "Usage: /etc/init.d/mailman {start|stop|restart|reload|force-reload}" >&2
- exit 1
- ;;
-esac
-
-exit 0
Deleted: trunk/debian/mailman-common.mailman.logrotate
===================================================================
--- trunk/debian/mailman-common.mailman.logrotate 2006-10-04 08:14:00 UTC (rev 410)
+++ trunk/debian/mailman-common.mailman.logrotate 2006-10-04 08:30:29 UTC (rev 411)
@@ -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
-}
Deleted: trunk/debian/mailman-common.manpages
===================================================================
--- trunk/debian/mailman-common.manpages 2006-10-04 08:14:00 UTC (rev 410)
+++ trunk/debian/mailman-common.manpages 2006-10-04 08:30:29 UTC (rev 411)
@@ -1,16 +0,0 @@
-debian/manpages/add_members.8
-debian/manpages/clone_member.8
-debian/manpages/list_lists.8
-debian/manpages/mmsitepass.8
-debian/manpages/rmlist.8
-debian/manpages/check_db.8
-debian/manpages/config_list.8
-debian/manpages/list_admins.8
-debian/manpages/list_members.8
-debian/manpages/newlist.8
-debian/manpages/sync_members.8
-debian/manpages/check_perms.8
-debian/manpages/find_member.8
-debian/manpages/mmarch.8
-debian/manpages/remove_members.8
-debian/manpages/withlist.8
Deleted: trunk/debian/mailman-doc.install
===================================================================
--- trunk/debian/mailman-doc.install 2006-10-04 08:14:00 UTC (rev 410)
+++ trunk/debian/mailman-doc.install 2006-10-04 08:30:29 UTC (rev 411)
@@ -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/mailman.dirs
===================================================================
--- trunk/debian/mailman.dirs 2006-10-04 08:14:00 UTC (rev 410)
+++ trunk/debian/mailman.dirs 2006-10-04 08:30:29 UTC (rev 411)
@@ -1,3 +1,9 @@
-usr/lib/mailman/mail
+usr/lib/mailman
+usr/sbin
usr/share/lintian/overrides
+usr/share/mailman
usr/lib/cgi-bin
+var/log/mailman
+var/lib/mailman/templates
+var/lock
+var/run/mailman
Added: trunk/debian/mailman.docs
===================================================================
--- trunk/debian/mailman.docs (rev 0)
+++ trunk/debian/mailman.docs 2006-10-04 08:30:29 UTC (rev 411)
@@ -0,0 +1 @@
+README.Exim4.Debian
Copied: trunk/debian/mailman.init (from rev 409, trunk/debian/mailman-common.mailman.init)
===================================================================
--- trunk/debian/mailman.init (rev 0)
+++ trunk/debian/mailman.init 2006-10-04 08:30:29 UTC (rev 411)
@@ -0,0 +1,98 @@
+#! /bin/sh
+#
+# mailman starts up the master queue runner for mailman
+#
+# Based on skeleton originally by Miquel van Smoorenburg and Ian Murdock,
+# customisations by Tollef Fog Heen and Thijs Kinkhorst for Debian.
+#
+### BEGIN INIT INFO
+# Provides: mailman-qrunner
+# Required-Start: $syslog mail-transport-agent $local_fs $remote_fs $named $network
+# Required-Stop: $syslog mail-transport-agent $local_fs $remote_fs $named $network
+# Should-Start:
+# Should-Stop:
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Mailman Master Queue Runner
+# Description: Starts and stops the Mailman queue runners, used to
+# manage the various message queues within the Mailman
+# mailing list manager.
+### END INIT INFO
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/lib/mailman/bin/mailmanctl
+PIDFILE=/var/lib/mailman/data/master-qrunner.pid
+
+test -x $DAEMON || exit 0
+
+set -e
+
+if ! [ -d /var/run/mailman ]; then
+ install -d -o list -g list /var/run/mailman
+fi
+
+if ! [ -d /var/lock/mailman ]; then
+ install -d -o root -g list -m 2775 /var/lock/mailman
+fi
+
+. /lib/lsb/init-functions
+
+case "$1" in
+ start)
+ if [ "$(/var/lib/mailman/bin/list_lists -b | grep ^mailman$ )" = "" ]; then
+ log_warning_msg "Site list for mailman (usually named mailman) missing."
+ log_warning_msg "Please create it; until then, mailman will refuse to start."
+ exit 0;
+ fi
+ log_daemon_msg "Starting Mailman master qrunner" "mailmanctl"
+ if $DAEMON -s -q start; then
+ log_end_msg 0
+ else
+ log_end_msg 1
+ fi
+ ;;
+ stop)
+ log_daemon_msg "Stopping Mailman master qrunner" "mailmanctl"
+ if $DAEMON -q stop; then
+ log_end_msg 0
+ else
+ log_end_msg 1
+ fi
+ ;;
+ reload)
+ log_begin_msg "Reloading Mailman master qrunner configuration"
+ if $DAEMON -q restart; then
+ log_end_msg 0
+ else
+ log_end_msg 1
+ fi
+ ;;
+ restart|force-reload)
+ PID=`cat $PIDFILE 2>/dev/null` || true
+ log_daemon_msg "Restarting Mailman master qrunner" "mailmanctl"
+ $DAEMON -q stop
+ if test -n "$PID" && kill -0 $PID 2>/dev/null ; then
+ log_action_begin_msg "Waiting"
+ for cnt in `seq 1 5`; do
+ sleep 1
+ kill -0 $PID 2>/dev/null || break
+ done;
+ if kill -0 $PID 2>/dev/null ; then
+ log_action_end_msg 1
+ else
+ log_action_end_msg 0
+ fi
+ fi
+ if $DAEMON -q start; then
+ log_end_msg 0
+ else
+ log_end_msg 1
+ fi
+ ;;
+ *)
+ echo "Usage: /etc/init.d/mailman {start|stop|restart|reload|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
Deleted: trunk/debian/mailman.install
===================================================================
--- trunk/debian/mailman.install 2006-10-04 08:14:00 UTC (rev 410)
+++ trunk/debian/mailman.install 2006-10-04 08:30:29 UTC (rev 411)
@@ -1 +0,0 @@
-debian/lintian/mailman /usr/share/lintian/overrides/
Copied: trunk/debian/mailman.install (from rev 409, trunk/debian/mailman-doc.install)
===================================================================
--- trunk/debian/mailman.install (rev 0)
+++ trunk/debian/mailman.install 2006-10-04 08:30:29 UTC (rev 411)
@@ -0,0 +1,4 @@
+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
Added: trunk/debian/mailman.logrotate
===================================================================
--- trunk/debian/mailman.logrotate (rev 0)
+++ trunk/debian/mailman.logrotate 2006-10-04 08:30:29 UTC (rev 411)
@@ -0,0 +1,51 @@
+/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.manpages
===================================================================
--- trunk/debian/mailman.manpages (rev 0)
+++ trunk/debian/mailman.manpages 2006-10-04 08:30:29 UTC (rev 411)
@@ -0,0 +1,16 @@
+debian/manpages/add_members.8
+debian/manpages/clone_member.8
+debian/manpages/list_lists.8
+debian/manpages/mmsitepass.8
+debian/manpages/rmlist.8
+debian/manpages/check_db.8
+debian/manpages/config_list.8
+debian/manpages/list_admins.8
+debian/manpages/list_members.8
+debian/manpages/newlist.8
+debian/manpages/sync_members.8
+debian/manpages/check_perms.8
+debian/manpages/find_member.8
+debian/manpages/mmarch.8
+debian/manpages/remove_members.8
+debian/manpages/withlist.8
Deleted: trunk/debian/patches/81_build_arch_indep.patch
===================================================================
--- trunk/debian/patches/81_build_arch_indep.patch 2006-10-04 08:14:00 UTC (rev 410)
+++ trunk/debian/patches/81_build_arch_indep.patch 2006-10-04 08:30:29 UTC (rev 411)
@@ -1,106 +0,0 @@
-Patch: build_arch_indep.patch
-Author: Thijs Kinkhorst <thijs at debian.org>, based on work from Siggy Bentrup.
-Split the Makefile targets into arch-dep and arch-indep so we can install
-them into different packages.
-Index: Makefile.in
-===================================================================
---- Makefile.in.orig 2006-09-24 15:11:22.000000000 +0200
-+++ Makefile.in 2006-09-24 15:17:49.000000000 +0200
-@@ -55,8 +55,9 @@
- ARCH_DEP_DIRS= cgi-bin mail
-
- # Directories make should decend into
--SUBDIRS= bin cron misc Mailman scripts src templates messages tests
--
-+ARCH_SUBDIRS = src
-+INDEP_SUBDIRS = bin cron misc Mailman scripts templates messages tests
-+SUBDIRS = $(ARCH_SUBDIRS) $(INDEP_SUBDIRS)
-
- # Modes for directories and executables created by the install
- # process. Default to group-writable directories but
-@@ -73,21 +74,29 @@
-
- # Rules
-
--all: subdirs
-+all: arch-subdirs indep-subdirs
-
--subdirs: $(SUBDIRS)
-- for d in $(SUBDIRS); \
-+arch-subdirs: $(ARCH_SUBDIRS)
-+ for d in $(ARCH_SUBDIRS); \
- do \
- (cd $$d; $(MAKE)); \
- done
-
--install: doinstall update
-+indep-subdirs: $(INDEP_SUBDIRS)
-+ for d in $(INDEP_SUBDIRS); \
-+ do \
-+ (cd $$d; $(MAKE)); \
-+ done
-
--doinstall: $(SUBDIRS)
-- @echo "Creating architecture independent directories..."
-- @for d in $(VAR_DIRS); \
-+install: do-arch-install do-indep-install update
-+# Backwards-compatibility:
-+doinstall: do-arch-install do-indep-install
-+
-+do-arch-install: $(ARCH_SUBDIRS)
-+ @echo "Creating architecture dependent directories..."
-+ @for d in $(ARCH_DEP_DIRS); \
- do \
-- dir=$(DESTDIR)$(var_prefix)/$$d; \
-+ dir=$(DESTDIR)$(exec_prefix)/$$d; \
- if test ! -d $$dir; then \
- echo "Creating directory hierarchy $$dir"; \
- $(srcdir)/mkinstalldirs $$dir; \
-@@ -96,10 +105,16 @@
- else true; \
- fi; \
- done
-- chmod o-r $(DESTDIR)$(var_prefix)/archives/private
-- @for d in $(ARCH_INDEP_DIRS); \
-+ @for d in $(ARCH_SUBDIRS); \
- do \
-- dir=$(DESTDIR)$(prefix)/$$d; \
-+ (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
-+ done
-+
-+do-indep-install: $(INDEP_SUBDIRS)
-+ @echo "Creating architecture independent directories..."
-+ @for d in $(VAR_DIRS); \
-+ do \
-+ dir=$(DESTDIR)$(var_prefix)/$$d; \
- if test ! -d $$dir; then \
- echo "Creating directory hierarchy $$dir"; \
- $(srcdir)/mkinstalldirs $$dir; \
-@@ -108,10 +123,10 @@
- else true; \
- fi; \
- done
-- @echo "Creating architecture dependent directories..."
-- @for d in $(ARCH_DEP_DIRS); \
-+ chmod o-r $(DESTDIR)$(var_prefix)/archives/private
-+ @for d in $(ARCH_INDEP_DIRS); \
- do \
-- dir=$(DESTDIR)$(exec_prefix)/$$d; \
-+ dir=$(DESTDIR)$(prefix)/$$d; \
- if test ! -d $$dir; then \
- echo "Creating directory hierarchy $$dir"; \
- $(srcdir)/mkinstalldirs $$dir; \
-@@ -120,11 +135,11 @@
- else true; \
- fi; \
- done
-- @for d in $(SUBDIRS); \
-+ @for d in $(INDEP_SUBDIRS); \
- do \
- (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
- done
-- #$(PYTHON) -c 'from compileall import *; compile_dir("$(DESTDIR)$(prefix)/Mailman")'
-+ $(PYTHON) -c 'from compileall import *; compile_dir("$(DESTDIR)$(prefix)/Mailman")'
-
- # Only run bin/update if we aren't installing in DESTDIR, as this
- # means there are probably no lists to deal with, and it wouldn't
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2006-10-04 08:14:00 UTC (rev 410)
+++ trunk/debian/patches/series 2006-10-04 08:30:29 UTC (rev 411)
@@ -35,5 +35,4 @@
78_DeprecationWarning.patch -p0
79_archiver_slash.patch -p0
80_fix_string_search.patch -p0
-81_build_arch_indep.patch -p0
99_js_templates.patch -p0
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2006-10-04 08:14:00 UTC (rev 410)
+++ trunk/debian/rules 2006-10-04 08:30:29 UTC (rev 411)
@@ -21,27 +21,23 @@
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
-ifeq (,$(findstring archonly,$(DEB_BUILD_OPTIONS)))
-build: build-arch build-indep
-else
-build: build-arch
-endif
-build-arch: patch Makefile
- $(MAKE) arch-subdirs
- touch build-arch
-build-indep: patch Makefile debian/po/templates.pot
- $(MAKE) indep-subdirs
- touch build-indep
+build: patch build-stamp
+build-stamp: Makefile debian/po/templates.pot
+ $(MAKE)
+ touch build-stamp
debian/po/templates.pot: debian/templates
@debconf-updatepo
Makefile:
- autoconf
- ./configure --prefix=/usr/lib/$(package) \
- --with-var-prefix=/var/lib/$(package) \
- --with-username=list --with-groupname=list \
+ if [ -x /usr/bin/autoconf2.50 ]; then \
+ autoconf2.50; \
+ else \
+ autoconf; \
+ fi
+ ./configure --prefix=/var/lib/$(package) --with-username=list \
+ --with-groupname=list \
--with-mail-gid=daemon --with-cgi-gid=www-data \
--without-permcheck --with-mailhost=localhost \
--with-urlhost=localhost
@@ -49,71 +45,173 @@
clean: unpatch
dh_testdir
-$(MAKE) distclean
- rm -rf build-indep build-arch Makefile debian/ucffiles debian/mailman.postinst.ucf
+ rm -rf build-stamp Makefile debian/ucffiles debian/mailman.postinst.ucf
rm -f debian/mailman.postrm.ucf
dh_clean
+ chmod +x debian/{prerm,postinst}
-binary-indep: checkroot build-indep
- # install files
- $(MAKE) do-indep-install DESTDIR=$$(pwd)/debian/mailman-common
- dh_installdirs -i
- dh_install -i
- dh_installdocs -i
- dh_installchangelogs -i
- dh_installlogrotate -i --name=mailman
- dh_installman -i
- dh_installinit -i --name=mailman
- mv debian/mailman-common/usr/lib/mailman/messages debian/mailman-common/var/lib/mailman
- mv debian/mailman-common/usr/lib/mailman/icons/* debian/mailman-common/usr/share/images/mailman
- rmdir debian/mailman-common/var/lib/mailman/{locks,logs} debian/mailman-common/usr/lib/mailman/icons
- mv `find debian/mailman-common/usr/lib/mailman/templates/ -mindepth 1 -maxdepth 1 -type d` debian/mailman-common/usr/share/mailman
- rmdir debian/mailman-common/usr/lib/mailman/templates
- mv debian/mailman-common/usr/lib/mailman/tests debian/mailman-common/var/lib/mailman
- dh_link -i
- dh_compress -i
- # Fix permissions
- dh_fixperms -i
- chown -R list:list debian/mailman-common/var/{lock/mailman,lib/mailman/qfiles,run/mailman,lib/mailman/spam}
- chown root:list debian/mailman-common/var/log/mailman
- find debian/mailman-common/var/lib/mailman -type d | xargs chmod 2775
- find debian/mailman-common/var/lib/mailman/messages -type d | xargs chmod 755
- chmod 2775 debian/mailman-common/var/log/mailman
- chmod g+w debian/mailman-common/var/lock/mailman
- chmod +x debian/mailman-common/usr/lib/mailman/Mailman/Cgi/*
- chmod +x debian/mailman-common/usr/lib/mailman/Mailman/Archiver/pipermail.py
- chmod o-x debian/mailman-common/var/lib/mailman/archives/private
- chmod 0755 debian/mailman-common/usr/lib/mailman/cron/*
- chmod 0644 debian/mailman-common/usr/lib/mailman/cron/crontab.in
- # create ucffiles dynamically
- find debian/mailman-common/usr/share/mailman -type f -printf '/etc/mailman/%P\n' > debian/ucffiles
- # create the resulting debs
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
+binary-indep: checkroot build
+ 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-arch
- $(MAKE) do-arch-install DESTDIR=$$(pwd)/debian/mailman
- dh_installdirs -a
- dh_install -a
- dh_installdocs -a ACKNOWLEDGMENTS README* TODO FAQ
- dh_installchangelogs -a NEWS
- dh_installdebconf -a
- mv debian/mailman/usr/lib/mailman/cgi-bin debian/mailman/usr/lib/cgi-bin/mailman
- dh_strip -a
- dh_compress -a
- dh_fixperms -a
- chown -R root:list debian/mailman/usr/lib/{mailman,cgi-bin/mailman}
+
+binary-arch: checkroot build
+ dh_testdir
+ dh_install
+ dh_installdirs
+ 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 \
+ ICONDIR=$$(pwd)/debian/mailman/usr/share/images/mailman
+
+ #rmdir debian/$(package)/var/lib/mailman/pythonlib
+
+# move the nonchanging directories to /usr/lib/mailman, except for
+# cgi-bin, which goes to /usr/lib/cgi-bin/mailman
+
+ cd debian/mailman/var/lib/$(package) ; \
+ mv cgi-bin ../../../usr/lib/cgi-bin/mailman ; \
+ for i in Mailman bin cron mail scripts; do \
+ mv $$i ../../../usr/lib/$(package); \
+ done
+
+
+ # link them back to /var/lib/mailman
+ for i in debian/mailman/usr/lib/$(package)/*; do \
+ dh_link usr/lib/$(package)/`basename $$i` var/lib/$(package)/`basename $$i`; \
+ done
+
+ # Link cgi-bin as well
+ dh_link usr/lib/cgi-bin/$(package) var/lib/$(package)/cgi-bin
+
+ # 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
+
+ # 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
+
+ rm debian/$(package)/usr/lib/$(package)/Mailman/mm_cfg.py
+ dh_link etc/$(package)/mm_cfg.py \
+ usr/lib/$(package)/Mailman/mm_cfg.py
+
+ 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_installdebconf
+ dh_strip
+ dh_compress
+ dh_fixperms
+ 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 root:list debian/mailman/var/log/mailman
+ find debian/mailman/var/lib/$(package) -type d | xargs chmod 2775
+ find debian/mailman/var/lib/$(package)/messages -type d | xargs chmod 755
+
+ # make lintian happy
+ install -m 0644 debian/lintian-overrides debian/mailman/usr/share/lintian/overrides/mailman
+
+# Install savannah plugin
+ install -m 0644 debian/contrib/savannah debian/mailman/usr/lib/$(package)/Mailman/Cgi
+
+# Spamassassin plugin
+ install -m 0644 debian/contrib/SpamAssassin.py debian/mailman/usr/lib/$(package)/Mailman/Handlers
+ install -m 0644 debian/contrib/spamd.py debian/mailman/usr/lib/$(package)/Mailman/Handlers
+
+# postfix-to-mailman.py
+ install -m 0755 debian/contrib/postfix-to-mailman.py debian/mailman/usr/share/mailman
+ dh_link etc/mailman/postfix-to-mailman.py usr/lib/mailman/bin/postfix-to-mailman.py
+
+# apache default config
+ install -m 0644 debian/contrib/apache.conf debian/mailman/etc/mailman
+
+# Move templates
+ mv `find debian/mailman/etc/mailman -mindepth 1 -maxdepth 1 -type d` debian/mailman/usr/share/mailman
+ cp build/contrib/qmail-to-mailman.py debian/mailman/usr/share/mailman
+
+ find debian/mailman/usr/share/mailman -type f -printf '/etc/mailman/%P\n' > debian/ucffiles
+
+ dh_link etc/mailman/qmail-to-mailman.py usr/lib/mailman/bin/qmail-to-mailman.py
+
+
+# Fix permissions
+ chmod +x debian/mailman/usr/lib/$(package)/Mailman/Cgi/*
+# chmod +x debian/mailman/usr/lib/$(package)/scripts/*
+ chmod +x debian/mailman/usr/lib/$(package)/Mailman/Archiver/pipermail.py
+
chmod g+s debian/mailman/usr/lib/cgi-bin/mailman/* \
debian/mailman/usr/lib/mailman/mail/mailman
- # create the resulting deb
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
+ chmod -x debian/mailman/usr/lib/$(package)/scripts/paths.py \
+ debian/mailman/usr/lib/$(package)/Mailman/Cgi/*
+ 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 2775 debian/mailman/var/log/mailman
+ chmod g+w debian/mailman/var/lock/mailman
+
+ dh_installdeb
+
+# echo 'if [ "$$1" = purge ]; then' >> debian/mailman.postrm.ucf
+# for f in `cat debian/ucffiles`; do \
+# echo -e "\techo Removing $$f" >> debian/mailman.postrm.ucf; \
+# echo -e "\tucf --debconf-ok --purge $$f" >> debian/mailman.postrm.ucf ; \
+# done
+# echo 'fi' >> debian/mailman.postrm.ucf
+
+# echo 'if [ "$$1" = "configure" ]; then'>> debian/mailman.postinst.ucf
+# for dir in $$(for f in $$(cat debian/ucffiles); do dirname "$$f" ; done | sort | uniq); do echo -e "\tmkdir -p $$dir" >> debian/mailman.postinst.ucf ; done
+
+# echo -e "\techo -n 'Checking/installing config files (this takes time)': " >> debian/mailman.postinst.ucf
+# for f in `cat debian/ucffiles`; do \
+# echo -e "\techo -n ." >> debian/mailman.postinst.ucf ; \
+# echo -e "\tucf `echo $$f | sed s,/etc/mailman,/usr/share/mailman,` $$f < /dev/tty > /dev/tty" >> debian/mailman.postinst.ucf ; \
+# done
+# echo 'fi' >> debian/mailman.postinst.ucf
+# echo -e "\techo \" done!\"" >> debian/mailman.postinst.ucf
+
+# perl -pi -e '/#UCF#/ and do { open F, "debian/mailman.postinst.ucf"; local $$/ ; $$_ = <F> };' debian/mailman/DEBIAN/postinst
+# perl -pi -e '/#UCF#/ and do { open F, "debian/mailman.postrm.ucf"; local $$/ ; $$_ = <F> };' debian/mailman/DEBIAN/postrm
+
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+
+# Below here is fairly generic really
+
binary: binary-indep binary-arch
checkroot:
More information about the Pkg-mailman-hackers
mailing list