aboutsummaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
authorYasuhito FUTATSUKI at POEM <futatuki@poem.co.jp>2016-09-30 06:11:42 +0900
committerYasuhito FUTATSUKI at POEM <futatuki@poem.co.jp>2016-09-30 06:11:42 +0900
commiteda2cc91d4e0332df8ee2ecae8aa9fdbc7e68809 (patch)
treec176ebc26d99e34b314610f3fec89b776dc9beb0 /misc
parent1dac81b59ef0e6eeff85ec8665a2be2dbab38d44 (diff)
parentf436fcb0c2e73fcc0e52b609f8464999759ac261 (diff)
downloadmailman2-eda2cc91d4e0332df8ee2ecae8aa9fdbc7e68809.tar.gz
mailman2-eda2cc91d4e0332df8ee2ecae8aa9fdbc7e68809.tar.xz
mailman2-eda2cc91d4e0332df8ee2ecae8aa9fdbc7e68809.zip
Merge lp:mailman/2.1 rev 1677
Diffstat (limited to 'misc')
-rw-r--r--misc/mailman.in14
-rw-r--r--misc/paths.py.in7
2 files changed, 19 insertions, 2 deletions
diff --git a/misc/mailman.in b/misc/mailman.in
index bfaac3cc..af9d0e92 100644
--- a/misc/mailman.in
+++ b/misc/mailman.in
@@ -2,7 +2,7 @@
#
# mailman This shell script starts and stops GNU Mailman.
#
-# Copyright (C) 2001-2013 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2016 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -32,6 +32,18 @@
# processname: mailmanctl
# config: @prefix@/Mailman/mm_cfg.py
# pidfile: @VAR_PREFIX@/data/master-qrunner.pid
+#
+### BEGIN INIT INFO
+# Provides: mailman
+# Required-Start: $remote_fs $network
+# Required-Stop: $remote_fs $network
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: GNU Mailman
+# Description: Mailman is the GNU Mailing List Manager, a program that
+# manages electronic mail discussion groups. For more
+# on GNU Mailman see http://www.list.org
+### END INIT INFO
PYTHON=@PYTHON@
MAILMANHOME=@prefix@
diff --git a/misc/paths.py.in b/misc/paths.py.in
index c5e56177..b4aae14e 100644
--- a/misc/paths.py.in
+++ b/misc/paths.py.in
@@ -1,6 +1,6 @@
# -*- python -*-
-# Copyright (C) 1998-2009 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2016 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -62,6 +62,11 @@ sitedir = os.path.join(sys.prefix, 'lib', 'python'+sys.version[:3],
'site-packages')
sys.path.append(sitedir)
+# Include Python's dist-packages directory.
+distdir = os.path.join(sys.prefix, 'lib', 'python'+sys.version[:3],
+ 'dist-packages')
+sys.path.append(distdir)
+
# In a normal interactive Python environment, the japanese.pth and korean.pth
# files would be imported automatically. But because we inhibit the importing