[Pkg-mailman-hackers] Pkg-mailman commit - rev 83 - in branches/pkg-split/core/debian: . patches

[Bernd S. Brentrup]

Author: bsb
Date: 2004-04-23 06:04:16 -0600 (Fri, 23 Apr 2004)
New Revision: 83

Added:
   branches/pkg-split/core/debian/patches/40_FHS_dirs.dpatch
Modified:
   branches/pkg-split/core/debian/TODO
   branches/pkg-split/core/debian/links
   branches/pkg-split/core/debian/patches/00list
Log:
FHS compliant directories.


Modified: branches/pkg-split/core/debian/TODO
===================================================================
--- branches/pkg-split/core/debian/TODO	2004-04-23 11:43:39 UTC (rev 82)
+++ branches/pkg-split/core/debian/TODO	2004-04-23 12:04:16 UTC (rev 83)
@@ -59,6 +59,7 @@
 - Instead of symlinking directories VAR_PREFIX/logs, VAR_PREFIX/locks and
   VAR_PREFIX/templates redefine mm_cfg.LOG_DIR, mm_cfg.LOCK_DIR and
   mm_cfg.TEMPLATE_DIR (in fixed section of Defaults.py).
+* done in Rev 83
 
 - Think about a Mailman.Debian (python-)package for postinst helpers.
 

Modified: branches/pkg-split/core/debian/links
===================================================================
--- branches/pkg-split/core/debian/links	2004-04-23 11:43:39 UTC (rev 82)
+++ branches/pkg-split/core/debian/links	2004-04-23 12:04:16 UTC (rev 83)
@@ -1,8 +1,4 @@
-etc/mailman/templates                   var/lib/mailman/templates
-usr/share/locale                        var/lib/mailman/messages
-var/lock/mailman                        var/lib/mailman/locks
-var/log/mailman                         var/lib/mailman/logs
-etc/mailman/mm_cfg.py                   var/lib/mailman/mm_cfg.py
+etc/mailman/mm_cfg.py                   var/lib/mailman/Mailman/mm_cfg.py
 usr/share/mailman                       var/lib/mailman/.INST
 var/lib/mailman/bin/list_lists          usr/sbin/list_lists
 var/lib/mailman/bin/find_member         usr/sbin/find_member

Modified: branches/pkg-split/core/debian/patches/00list
===================================================================
--- branches/pkg-split/core/debian/patches/00list	2004-04-23 11:43:39 UTC (rev 82)
+++ branches/pkg-split/core/debian/patches/00list	2004-04-23 12:04:16 UTC (rev 83)
@@ -11,6 +11,7 @@
 30_pipermail_threads
 31_buggy_queuefiles
 32_MIME_fixup
+40_FHS_dirs
 50_README.EXIM.paths
 50_README.POSTFIX
 51_nocompile.pyc

Added: branches/pkg-split/core/debian/patches/40_FHS_dirs.dpatch
===================================================================
--- branches/pkg-split/core/debian/patches/40_FHS_dirs.dpatch	2004-04-23 11:43:39 UTC (rev 82)
+++ branches/pkg-split/core/debian/patches/40_FHS_dirs.dpatch	2004-04-23 12:04:16 UTC (rev 83)
@@ -0,0 +1,49 @@
+#! /bin/sh -e
+## 40_FHS_dirs.dpatch by  Siggy Brentrup <bsb@debian.org>
+##
+## DP: FHS compliant directories for logs, locks, messages and templates.
+## $URL$
+## $Id$
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /debuild/mine/mailman/build-area/mailman-2.1.4/Mailman/Defaults.py.in mailman-2.1.4/Mailman/Defaults.py.in
+--- /debuild/mine/mailman/build-area/mailman-2.1.4/Mailman/Defaults.py.in	2004-04-23 13:52:20.000000000 +0200
++++ mailman-2.1.4/Mailman/Defaults.py.in	2004-04-23 13:54:46.000000000 +0200
+@@ -1220,15 +1220,15 @@
+ 
+ # Useful directories
+ LIST_DATA_DIR   = os.path.join(VAR_PREFIX, 'lists')
+-LOG_DIR         = os.path.join(VAR_PREFIX, 'logs')
+-LOCK_DIR        = os.path.join(VAR_PREFIX, 'locks')
++LOG_DIR         = '/var/log/mailman'
++LOCK_DIR        = '/var/lock/mailman'
+ DATA_DIR        = os.path.join(VAR_PREFIX, 'data')
+ SPAM_DIR        = os.path.join(VAR_PREFIX, 'spam')
+ WRAPPER_DIR     = os.path.join(EXEC_PREFIX, 'mail')
+ BIN_DIR         = os.path.join(PREFIX, 'bin')
+ SCRIPTS_DIR     = os.path.join(PREFIX, 'scripts')
+-TEMPLATE_DIR    = os.path.join(PREFIX, 'templates')
+-MESSAGES_DIR    = os.path.join(PREFIX, 'messages')
++TEMPLATE_DIR    = '/etc/mailman/templates'
++MESSAGES_DIR    = '/usr/share/locale'
+ PUBLIC_ARCHIVE_FILE_DIR  = os.path.join(VAR_PREFIX, 'archives', 'public')
+ PRIVATE_ARCHIVE_FILE_DIR = os.path.join(VAR_PREFIX, 'archives', 'private')
+ 


Property changes on: branches/pkg-split/core/debian/patches/40_FHS_dirs.dpatch
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Id URL