[Pkg-mailman-hackers] Pkg-mailman commit - rev 86 - branches/pkg-split/core/debian
Bernd S. Brentrup
bsb@haydn.debian.org
Sat, 24 Apr 2004 11:38:01 -0600
Author: bsb
Date: 2004-04-24 11:37:58 -0600 (Sat, 24 Apr 2004)
New Revision: 86
Added:
branches/pkg-split/core/debian/mailman-en.dirs
branches/pkg-split/core/debian/mailman-en.install
branches/pkg-split/core/debian/mailman-en.postinst
branches/pkg-split/core/debian/mailman-en.prerm
Modified:
branches/pkg-split/core/debian/changelog
branches/pkg-split/core/debian/control
branches/pkg-split/core/debian/dirs
branches/pkg-split/core/debian/install
branches/pkg-split/core/debian/links
branches/pkg-split/core/debian/mailman-i18n.dirs
branches/pkg-split/core/debian/rules
Log:
Add mailman-en package as a stripped down alternative
to mailman-i18n. mailman can now depend on these
conflicting packages which contain the templates.
Modified: branches/pkg-split/core/debian/changelog
===================================================================
--- branches/pkg-split/core/debian/changelog 2004-04-23 18:47:09 UTC (rev 85)
+++ branches/pkg-split/core/debian/changelog 2004-04-24 17:37:58 UTC (rev 86)
@@ -1,12 +1,13 @@
-mailman (2.1.4-4split) UNRELEASED; urgency=low
+mailman (2.1.4-4split0) UNRELEASED; urgency=low
* NOT YET RELEASED.
- * Splitting package into mailman, mailman-bin, mailman-i18n,
- mailman-doc (bsb, closes: #176439, #238377, #233410, #237772).
+ * Splitting package into mailman, mailman-bin, mailman-doc,
+ mailman-i18n, mailman-en (bsb,
+ closes: #176439, #238377, #233410, #237772).
* Outlining glue packages mailman-spamassassin, mailman-spamprobe,
mailman-savannah and mailman-clamav (bsb, cf debian/TODO).
- -- Siggy Brentrup <bsb@debian.org> Wed, 21 Apr 2004 09:16:31 +0200
+ -- Siggy Brentrup <bsb@debian.org> Sat, 24 Apr 2004 19:20:28 +0200
mailman (2.1.4-4) unstable; urgency=medium
Modified: branches/pkg-split/core/debian/control
===================================================================
--- branches/pkg-split/core/debian/control 2004-04-23 18:47:09 UTC (rev 85)
+++ branches/pkg-split/core/debian/control 2004-04-24 17:37:58 UTC (rev 86)
@@ -8,11 +8,11 @@
Package: mailman
Architecture: all
-Depends: mailman-bin (= ${Source-Version}), python (>= 2.3), logrotate, cron (>= 3.0pl1-42), exim4 | mail-transport-agent, apache | httpd, debconf (>= 1.4.16), ucf (>= 1.0.0), pwgen
+Depends: mailman-bin (= ${Source-Version}), mailman-i18n (= ${Source-Version}) | mailman-en (= ${Source-Version}), python (>= 2.3), logrotate, cron (>= 3.0pl1-42), exim4 | mail-transport-agent, apache | httpd, debconf (>= 1.4.16), ucf (>= 1.05), pwgen
Conflicts: suidmanager (<< 0.50), sendmail (<< 8.12.6)
-Recommends: mailman-i18n (= ${Source-Version}), base-passwd (>= 1.3.0)
+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
+Description: powerful, web-based mailing list manager
The GNU Mailing List Manager, which manages email discussion lists
much like Majordomo and Smartmail. Unlike most similar products,
Mailman gives each mailing list a web page, and allows users to
@@ -34,22 +34,35 @@
Depends: ${shlibs:Depends}, mailman (= ${Source-Version})
Conflicts: mailman (<= 2.1.4-4)
Replaces: mailman (<= 2.1.4-4)
-Description: Setgid wrappers for mailman.
- Architecture dependent setgid-wrappers required for running mailman.
- because is implemented in Python.
+Description: setgid wrappers required for running mailman
+ The kernel allowing only native compiled code to be installed setgid,
+ theses wrappers invoke workers implemented in Python after validating
+ arguments.
Package: mailman-i18n
Architecture: all
-Depends: mailman (= ${Source-Version}), ucf (>= 1.0.0), debconf (>= 1.4.16)
-Conflicts: mailman (<= 2.1.4-4)
-Replaces: mailman (<= 2.1.4-4)
+Depends: mailman (= ${Source-Version}), ucf (>= 1.05), debconf (>= 1.4.16)
+Conflicts: mailman (<= 2.1.4-4), mailman-en
+Replaces: mailman (<= 2.1.4-4), mailman-en
Suggests: python2.3-korean-codecs, python-japanese-codecs
-Description: Powerful, web-based mailing list manager (internationalization)
- Message translations plus language specific templates for mailman.
+Description: language specific parts of mailman (international)
+ Message translations plus international templates for web pages and
+ automatically generated emails.
+Package: mailman-en
+Architecture: all
+Depends: mailman (= ${Source-Version}), ucf (>= 1.05), debconf (>= 1.4.16)
+Conflicts: mailman (<= 2.1.4-4), mailman-i18n
+Replaces: mailman (<= 2.1.4-4), mailman-i18n
+Description: language specific parts of mailman (english only)
+ English templates for web-pages and automatically generated emails.
+ .
+ This package is provided for the benefit of sites that don't need
+ internationalization.
+
Package: mailman-doc
Architecture: all
Conflicts: mailman (<= 2.1.4-4)
-Description: Powerful, web-based mailing list manager (Documentation)
+Description: powerful, web-based mailing list manager (Documentation)
Documentation and examples for mailman.
Modified: branches/pkg-split/core/debian/dirs
===================================================================
--- branches/pkg-split/core/debian/dirs 2004-04-23 18:47:09 UTC (rev 85)
+++ branches/pkg-split/core/debian/dirs 2004-04-24 17:37:58 UTC (rev 86)
@@ -1,5 +1,4 @@
etc/logrotate.d
-etc/mailman/templates
usr/lib/cgi-bin/mailman
usr/sbin
usr/share/images/mailman
@@ -14,6 +13,7 @@
var/lib/mailman/data
var/lib/mailman/lists
var/lib/mailman/mail
+var/lib/mailman/pythonlib
var/lib/mailman/qfiles
var/lib/mailman/qfiles/archive
var/lib/mailman/qfiles/bad
Modified: branches/pkg-split/core/debian/install
===================================================================
--- branches/pkg-split/core/debian/install 2004-04-23 18:47:09 UTC (rev 85)
+++ branches/pkg-split/core/debian/install 2004-04-24 17:37:58 UTC (rev 86)
@@ -4,7 +4,7 @@
debian/tmp/usr/lib/mailman/icons/* usr/share/images/mailman
debian/tmp/usr/lib/mailman/mail usr/share/mailman
debian/tmp/usr/lib/mailman/scripts usr/share/mailman
-debian/tmp/usr/lib/mailman/templates/en usr/share/mailman/templates
-debian/manpages/* usr/share/man/man8
+debian/manpages/* usr/share/man/man8
+debian/Debian usr/share/mailman/Mailman
Modified: branches/pkg-split/core/debian/links
===================================================================
--- branches/pkg-split/core/debian/links 2004-04-23 18:47:09 UTC (rev 85)
+++ branches/pkg-split/core/debian/links 2004-04-24 17:37:58 UTC (rev 86)
@@ -208,6 +208,8 @@
var/lib/mailman/.INST/Mailman/htmlformat.py var/lib/mailman/Mailman/htmlformat.py
var/lib/mailman/.INST/Mailman/i18n.py var/lib/mailman/Mailman/i18n.py
var/lib/mailman/.INST/Mailman/versions.py var/lib/mailman/Mailman/versions.py
+var/lib/mailman/.INST/Mailman/Debian/__init__.py var/lib/mailman/Mailman/Debian/__init__.py
+var/lib/mailman/.INST/Mailman/Debian/helpers.py var/lib/mailman/Mailman/Debian/helpers.py
var/lib/mailman/.INST/cron/crontab.in var/lib/mailman/cron/crontab.in
var/lib/mailman/.INST/cron/checkdbs var/lib/mailman/cron/checkdbs
var/lib/mailman/.INST/cron/mailpasswds var/lib/mailman/cron/mailpasswds
Added: branches/pkg-split/core/debian/mailman-en.dirs
===================================================================
--- branches/pkg-split/core/debian/mailman-en.dirs 2004-04-23 18:47:09 UTC (rev 85)
+++ branches/pkg-split/core/debian/mailman-en.dirs 2004-04-24 17:37:58 UTC (rev 86)
@@ -0,0 +1,3 @@
+etc/mailman/templates
+etc/mailman/templates/en
+
Added: branches/pkg-split/core/debian/mailman-en.install
===================================================================
--- branches/pkg-split/core/debian/mailman-en.install 2004-04-23 18:47:09 UTC (rev 85)
+++ branches/pkg-split/core/debian/mailman-en.install 2004-04-24 17:37:58 UTC (rev 86)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/mailman/templates/en usr/share/mailman/templates
Added: branches/pkg-split/core/debian/mailman-en.postinst
===================================================================
--- branches/pkg-split/core/debian/mailman-en.postinst 2004-04-23 18:47:09 UTC (rev 85)
+++ branches/pkg-split/core/debian/mailman-en.postinst 2004-04-24 17:37:58 UTC (rev 86)
@@ -0,0 +1,5 @@
+#! /bin/sh -e
+# $URL$
+# $Id$
+
+#DEBHELPER#
Property changes on: branches/pkg-split/core/debian/mailman-en.postinst
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id URL
Added: branches/pkg-split/core/debian/mailman-en.prerm
===================================================================
--- branches/pkg-split/core/debian/mailman-en.prerm 2004-04-23 18:47:09 UTC (rev 85)
+++ branches/pkg-split/core/debian/mailman-en.prerm 2004-04-24 17:37:58 UTC (rev 86)
@@ -0,0 +1,5 @@
+#! /bin/sh -e
+# $URL$
+# $Id$
+
+#DEBHELPER#
Property changes on: branches/pkg-split/core/debian/mailman-en.prerm
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id URL
Modified: branches/pkg-split/core/debian/mailman-i18n.dirs
===================================================================
--- branches/pkg-split/core/debian/mailman-i18n.dirs 2004-04-23 18:47:09 UTC (rev 85)
+++ branches/pkg-split/core/debian/mailman-i18n.dirs 2004-04-24 17:37:58 UTC (rev 86)
@@ -0,0 +1,30 @@
+etc/mailman/templates
+etc/mailman/templates/big5
+etc/mailman/templates/ca
+etc/mailman/templates/cs
+etc/mailman/templates/da
+etc/mailman/templates/de
+etc/mailman/templates/en
+etc/mailman/templates/es
+etc/mailman/templates/et
+etc/mailman/templates/eu
+etc/mailman/templates/fi
+etc/mailman/templates/fr
+etc/mailman/templates/gb
+etc/mailman/templates/hr
+etc/mailman/templates/hu
+etc/mailman/templates/it
+etc/mailman/templates/ja
+etc/mailman/templates/ko
+etc/mailman/templates/lt
+etc/mailman/templates/nl
+etc/mailman/templates/no
+etc/mailman/templates/pl
+etc/mailman/templates/pt
+etc/mailman/templates/pt_BR
+etc/mailman/templates/ro
+etc/mailman/templates/ru
+etc/mailman/templates/sl
+etc/mailman/templates/sr
+etc/mailman/templates/sv
+etc/mailman/templates/uk
Modified: branches/pkg-split/core/debian/rules
===================================================================
--- branches/pkg-split/core/debian/rules 2004-04-23 18:47:09 UTC (rev 85)
+++ branches/pkg-split/core/debian/rules 2004-04-24 17:37:58 UTC (rev 86)
@@ -70,6 +70,7 @@
find debian/mailman-bin/usr/lib -type f | xargs chmod g+s
dh_compress --same-arch
+ dh_installdeb --same-arch
dh_gencontrol --same-arch
dh_md5sums --same-arch
dh_builddeb --same-arch
@@ -80,19 +81,21 @@
dh_installdocs --indep
dh_installchangelogs --indep
dh_install --indep
+ dh_installlogrotate --indep
+ dh_fixperms --indep
+
# remove that wrapper, it's in mailman-bin
rm debian/mailman/usr/share/mailman/mail/mailman
- # remove 'en' templates, they are in mailman
- rm -rf debian/mailman-i18n/usr/share/mailman/templates/en
# remove .po files
rm -f $$(find debian/mailman-i18n/usr/share/locale -name mailman.po)
# 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
- dh_installlogrotate --indep
- dh_fixperms --indep
+
dh_link --indep
dh_compress --indep
+ dh_installdebconf --indep
+ dh_installdeb --indep
dh_gencontrol --indep
dh_md5sums --indep
dh_builddeb --indep