[Pkg-mailman-hackers] Pkg-mailman commit - rev 154 - branches/pkg-split/core/debian
Bernd S. Brentrup
bsb@haydn.debian.org
Sun, 23 May 2004 10:54:16 -0600
Author: bsb
Date: 2004-05-23 10:54:14 -0600 (Sun, 23 May 2004)
New Revision: 154
Added:
branches/pkg-split/core/debian/mailman-cfdb.dirs
branches/pkg-split/core/debian/mailman-cfdb.install
branches/pkg-split/core/debian/mailman-cfdb.postinst
branches/pkg-split/core/debian/mailman-cfdb.postrm
branches/pkg-split/core/debian/mailman-cfdb.prerm
Removed:
branches/pkg-split/core/debian/mailman-trans.dirs
branches/pkg-split/core/debian/mailman-trans.install
branches/pkg-split/core/debian/mailman-trans.postinst
branches/pkg-split/core/debian/mailman-trans.postrm
branches/pkg-split/core/debian/mailman-trans.prerm
Modified:
branches/pkg-split/core/debian/changelog
branches/pkg-split/core/debian/control
branches/pkg-split/core/debian/rules
Log:
Renaming mailman-trans package to mailman-cfdb.
Modified: branches/pkg-split/core/debian/changelog
===================================================================
--- branches/pkg-split/core/debian/changelog 2004-05-23 12:35:22 UTC (rev 153)
+++ branches/pkg-split/core/debian/changelog 2004-05-23 16:54:14 UTC (rev 154)
@@ -3,7 +3,7 @@
* NOT YET RELEASED.
* New upstream release (fixing CAN-2004-0421) (closes: #249959).
* Splitting package into mailman, mailman-bin, mailman-doc,
- mailman-i18n, mailman-en, mailman-trans (closes: #176439, #238377,
+ mailman-i18n, mailman-en, mailman-cfdb (closes: #176439, #238377,
#233410, #237772).
* Outlining glue packages mailman-spamassassin, mailman-spamprobe,
mailman-savannah and mailman-clamav (bsb, cf debian/TODO). Tollef
@@ -14,7 +14,7 @@
is a list instead of an integer (closes: #246681).
* Move template directories to /etc/mailman/templates (closes: #199039).
- -- Siggy Brentrup <bsb@debian.org> Thu, 20 May 2004 06:36:30 +0200
+ -- Siggy Brentrup <bsb@debian.org> Sun, 23 May 2004 18:04:45 +0200
mailman (2.1.4-4) unstable; urgency=medium
Modified: branches/pkg-split/core/debian/control
===================================================================
--- branches/pkg-split/core/debian/control 2004-05-23 12:35:22 UTC (rev 153)
+++ branches/pkg-split/core/debian/control 2004-05-23 16:54:14 UTC (rev 154)
@@ -8,9 +8,8 @@
Package: mailman
Architecture: all
Pre-Depends: python (>= 2.3)
-Depends: mailman-trans (= ${Source-Version}), mailman-bin (= ${Source-Version}), mailman-i18n (= ${Source-Version}) | mailman-en (= ${Source-Version}), logrotate, cron (>= 3.0pl1-42), exim4 | mail-transport-agent, apache | httpd, debconf (>= 1.4.16), pwgen
-Conflicts: mailman (<= 2.1.4-4), suidmanager (<< 0.50), sendmail (<< 8.12.6), ssmtp, nullmailer
-Replaces: mailman (<= 2.1.4-4)
+Depends: mailman-cfdb (= ${Source-Version}), mailman-bin (= ${Source-Version}), mailman-i18n (= ${Source-Version}) | mailman-en (= ${Source-Version}), logrotate, cron (>= 3.0pl1-42), exim4 | mail-transport-agent, apache | httpd, debconf (>= 1.4.16), pwgen
+Conflicts: suidmanager (<< 0.50), sendmail (<< 8.12.6), ssmtp, nullmailer
Recommends: base-passwd (>= 1.3.0)
Suggests: mailman-doc (= ${Source-Version}), mailman-spamassassin | mailman-spamprobe, mailman-savannah, mailman-clamav
Description: powerful, web-based mailing list manager
@@ -30,7 +29,7 @@
.
For more information see http://www.list.org/.
-Package: mailman-trans
+Package: mailman-cfdb
Architecture: all
Pre-Depends: python (>= 2.3)
Depends: ucf (>= 1.05)
@@ -51,7 +50,7 @@
Package: mailman-i18n
Architecture: all
Pre-Depends: python (>= 2.3)
-Depends: mailman-trans (= ${Source-Version}), debconf (>= 1.4.16)
+Depends: mailman-cfdb (= ${Source-Version}), debconf (>= 1.4.16)
Conflicts: mailman (<= 2.1.4-4), mailman-en
Replaces: mailman-en (= ${Source-Version})
Suggests: python2.3-korean-codecs, python-japanese-codecs
@@ -62,7 +61,7 @@
Package: mailman-en
Architecture: all
Pre-Depends: python (>= 2.3)
-Depends: mailman-trans (= ${Source-Version}), debconf (>= 1.4.16)
+Depends: mailman-cfdb (= ${Source-Version}), debconf (>= 1.4.16)
Conflicts: mailman (<= 2.1.4-4), mailman-i18n
Replaces: mailman-i18n (= ${Source-Version})
Description: language specific parts of mailman (english only)
Copied: branches/pkg-split/core/debian/mailman-cfdb.dirs (from rev 153, branches/pkg-split/core/debian/mailman-trans.dirs)
Copied: branches/pkg-split/core/debian/mailman-cfdb.install (from rev 130, branches/pkg-split/core/debian/mailman-trans.install)
Copied: branches/pkg-split/core/debian/mailman-cfdb.postinst (from rev 130, branches/pkg-split/core/debian/mailman-trans.postinst)
Copied: branches/pkg-split/core/debian/mailman-cfdb.postrm (from rev 153, branches/pkg-split/core/debian/mailman-trans.postrm)
Copied: branches/pkg-split/core/debian/mailman-cfdb.prerm (from rev 153, branches/pkg-split/core/debian/mailman-trans.prerm)
Deleted: branches/pkg-split/core/debian/mailman-trans.dirs
===================================================================
--- branches/pkg-split/core/debian/mailman-trans.dirs 2004-05-23 12:35:22 UTC (rev 153)
+++ branches/pkg-split/core/debian/mailman-trans.dirs 2004-05-23 16:54:14 UTC (rev 154)
@@ -1 +0,0 @@
-var/lib/mailman/data
Deleted: branches/pkg-split/core/debian/mailman-trans.install
===================================================================
--- branches/pkg-split/core/debian/mailman-trans.install 2004-05-23 12:35:22 UTC (rev 153)
+++ branches/pkg-split/core/debian/mailman-trans.install 2004-05-23 16:54:14 UTC (rev 154)
@@ -1 +0,0 @@
-debian/Debian usr/lib/mailman/Mailman
Deleted: branches/pkg-split/core/debian/mailman-trans.postinst
===================================================================
--- branches/pkg-split/core/debian/mailman-trans.postinst 2004-05-23 12:35:22 UTC (rev 153)
+++ branches/pkg-split/core/debian/mailman-trans.postinst 2004-05-23 16:54:14 UTC (rev 154)
@@ -1,118 +0,0 @@
-#! /usr/bin/python -O
-# $URL$
-# $Id$
-
-"""
-
-Fooling lintian that complains about not sourcing confmodule:
-. /usr/share/debconf/confmodule
-"""
-
-
-import sys
-import os
-import bsddb
-from errno import ENOENT
-
-
-## # Argl, if the debconf Python interface were well designed, sth like
-## # from debconf import instance as db
-## # should be sufficient here. As it is, must work around it's flaws.
-## def get_debconf_interface(title=''):
-## """Get an debconf interface instance, starting a frontend if
-## none is available.
-## """#
-## from debconf import Debconf, _frontEndProgram
-## try: junk = os.environ['DEBIAN_HAS_FRONTEND']
-## except KeyError: os.execv(_frontEndProgram, [_frontEndProgram]+sys.argv)
-## return Debconf(title)
-## db = get_debconf_interface() ; del get_debconf_interface
-## # Exception class and convenience constants
-## from debconf import DebconfError, LOW, MEDIUM, HIGH, CRITICAL
-
-
-MM_INST = '/usr/lib/mailman'
-MM_HOME = '/var/lib/mailman'
-MM_BIN = os.path.join(MM_INST, 'bin')
-
-# mailman (and thus the Mailman py package) may not be installed yet.
-sys.path.insert(0, os.path.join(MM_INST, 'Mailman'))
-from Debian import DebuggingLogger, mm_languages, cfdb
-
-
-def ucf_to_cfdb():
- """Import templates under ucf control.
-
- All Debian releases up to now that used ucf have only registered
- files under /etc/mailman/LANG and /etc/mailman/qmail-to-mailman.py
- with ucf, allowing this simplistic approach at moving to our own
- conffile database.
- """#
-
- UCF_CACHE = '/var/lib/ucf/cache'
- ETC_DIR = '/etc/mailman/'
- ETC_LEN = len(ETC_DIR)
-
- prev_lang = None
-
- ucf_list = [ fn for fn in os.listdir(UCF_CACHE)
- if fn.startswith(':etc:mailman:') ]
- if not ucf_list: return
-
- log('Moving files out of ucf control ', nl='')
-
- for cached in ucf_list:
- path = '/'.join(cached.split(':'))
- ucf_cached = os.path.join(UCF_CACHE, cached)
- tmpl = open(ucf_cached).read()
- try:
- reg_key = path[ETC_LEN:]
- lang, tmpl = reg_key.split('/')
- if lang in mm_languages:
- if lang != prev_lang:
- if prev_lang: cfdb.sync()
- prev_lang = lang
- cfdb.register(reg_key, tmpl)
- except ValueError:
- cfdb.register(path, tmpl)
-
- os.system('ucf --purge --three-way %(path)s' % locals())
- os.remove(ucf_cached)
- log('.', nl='')
-
- cfdb.sync()
- log(' done.')
-
-
-def run_debhelper_additions():
-
- from popen2 import Popen4
- runner = Popen4('/bin/sh -e')
- runner.tochild.write("""\
-#DEBHELPER#""")
- runner.tochild.close()
- while True:
- rc = runner.poll()
- if rc != -1: break
- log(runner.fromchild.readline(), nl='')
- log(runner.fromchild.read(), nl='')
- if rc != 0:
- log('DebHelper added script failed with rc=%(rc)r.' % locals())
- raise SystemExit(1)
-
-
-if __name__ == '__main__':
- log = DebuggingLogger('MM_MAINT')
- try:
- op = sys.argv[1]
- if op == 'configure':
- ucf_to_cfdb()
- if op in ('configure','abort-upgrade','abort-remove','abort-deconfigure'):
- run_debhelper_additions()
- else:
- log("postinst called with unknown argument %r." % op)
- raise SystemExit(1)
- finally:
- # When things break, this information might be useful
- log.sys_info()
-
Deleted: branches/pkg-split/core/debian/mailman-trans.postrm
===================================================================
--- branches/pkg-split/core/debian/mailman-trans.postrm 2004-05-23 12:35:22 UTC (rev 153)
+++ branches/pkg-split/core/debian/mailman-trans.postrm 2004-05-23 16:54:14 UTC (rev 154)
@@ -1,13 +0,0 @@
-#! /bin/sh -e
-# $URL$
-# $Id$
-
-echo ">>> $0 $*" >&2
-
-#DEBHELPER#
-
-if [ "$1" = purge ]; then
- rm -f /var/lib/mailman/data/debcf.db
-fi
-
-exit 0
Deleted: branches/pkg-split/core/debian/mailman-trans.prerm
===================================================================
--- branches/pkg-split/core/debian/mailman-trans.prerm 2004-05-23 12:35:22 UTC (rev 153)
+++ branches/pkg-split/core/debian/mailman-trans.prerm 2004-05-23 16:54:14 UTC (rev 154)
@@ -1,20 +0,0 @@
-#! /bin/sh -e
-#
-# prerm script for Debian python packages.
-# Written 1998 by Gregor Hoffleit <flight@debian.org>.
-#
-# $URL: svn+alioth://svn.alioth.debian.org/svn/pkg-mailman/branches/pkg-split/core/debian/mailman.prerm $
-# $Id: mailman.prerm 121 2004-05-07 18:18:03Z bsb $
-echo ">>> $0 $*" >&2
-
-#DEBHELPER#
-
-PACKAGE=mailman-trans
-
-# dh_python doesn't do TRT[tm], do it manually
-# We have created compiled .py files in the postinst, undo now.
-dpkg --listfiles $PACKAGE |
- awk '$0~/\.py$/ {print $0"c\n" $0"o"}' |
- xargs rm -f >&2
-
-exit 0
Modified: branches/pkg-split/core/debian/rules
===================================================================
--- branches/pkg-split/core/debian/rules 2004-05-23 12:35:22 UTC (rev 153)
+++ branches/pkg-split/core/debian/rules 2004-05-23 16:54:14 UTC (rev 154)
@@ -56,7 +56,7 @@
rm -rf build-indep build-arch Makefile
dh_clean
rm -rf $$(find . -name "*~")
- rm -rf debian/tmp debian/mailman debian/mailman-{bin,i18n,doc,trans}
+ rm -rf debian/tmp debian/mailman debian/mailman-{bin,i18n,doc,cfdb}
@@ -101,7 +101,7 @@
# remove .po files
rm -f $$(find debian/mailman-i18n/usr/share/locale -name mailman.po)
# remove templates.py which belongs into mailman
- rm -f debian/mailman-trans/usr/lib/mailman/Mailman/Debian/templates.py
+ rm -f debian/mailman-cfdb/usr/lib/mailman/Mailman/Debian/templates.py
# move language README.lang to doc directory
mv $$(find debian/mailman-i18n/usr/share/locale -name README.\*) \
debian/mailman-i18n/usr/share/doc/mailman-i18n