From 7643edc69ea4f4fc80c630c3dfb887658bd722b9 Mon Sep 17 00:00:00 2001
From: Mark Sapiro <mark@msapiro.net>
Date: Sun, 4 Sep 2016 13:58:20 -0700
Subject: Added INIT INFO to the sample init.d script.

---
 misc/mailman.in | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'misc')

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@
-- 
cgit v1.2.3


From 2a85996a5aa441f4e0a9ceec48e2137508158595 Mon Sep 17 00:00:00 2001
From: Mark Sapiro <mark@msapiro.net>
Date: Wed, 7 Sep 2016 17:00:09 -0700
Subject: paths.py now adds dist-packages as well as site-packages to sys.path.

---
 misc/paths.py.in | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'misc')

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
-- 
cgit v1.2.3