[minion-cvs] New upstream release.

[weasel@seul.org (Peter Palfrader)]

Update of /home/minion/cvsroot/src/minion/debian/patches
In directory moria.mit.edu:/tmp/cvs-serv27583/patches

Modified Files:
	00list 
Added Files:
	502_manpages_in_share.dpatch 
	503_mention_daemon_is_ignored.dpatch 
Log Message:
New upstream release.
Mention that Daemon is ignored in mixminiond.conf if the user uses our init script (it passes --daemon to mixminion).
Move manpages to usr/share/man, upstream has them in usr/man.

--- NEW FILE: 502_manpages_in_share.dpatch ---
#! /bin/sh -e
## 502_manpages_in_share.dpatch by  <weasel@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

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 /home/weasel/projects/debian/debian/mixminion/Mixminion-0.0.7/setup.py Mixminion-0.0.7/setup.py
--- /home/weasel/projects/debian/debian/mixminion/Mixminion-0.0.7/setup.py	2004-04-04 19:58:28.000000000 +0200
+++ Mixminion-0.0.7/setup.py	2004-04-04 22:08:30.000000000 +0200
@@ -526,10 +526,10 @@
         }
 elif sys.platform != 'win32':
     EXTRA = {
-        'data_files' : [("man/man1", ["etc/mixminion.1"]),
-                        ("man/man5", ["etc/mixminionrc.5",
-                                      "etc/mixminiond.conf.5"]),
-                        ("man/man8", ["etc/mixminiond.8"])]
+        'data_files' : [("share/man/man1", ["etc/mixminion.1"]),
+                        ("share/man/man5", ["etc/mixminionrc.5",
+                                            "etc/mixminiond.conf.5"]),
+                        ("share/man/man8", ["etc/mixminiond.8"])]
         }
 else:
     EXTRA = {}

--- NEW FILE: 503_mention_daemon_is_ignored.dpatch ---
#! /bin/sh -e
## 503_mention_daemon_is_ignored.dpatch by  <weasel@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

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 /home/weasel/projects/debian/debian/mixminion/Mixminion-0.0.7/etc/mixminiond.conf Mixminion-0.0.7/etc/mixminiond.conf
--- /home/weasel/projects/debian/debian/mixminion/Mixminion-0.0.7/etc/mixminiond.conf	2004-04-04 22:09:47.000000000 +0200
+++ Mixminion-0.0.7/etc/mixminiond.conf	2004-04-04 22:10:25.000000000 +0200
@@ -185,6 +185,8 @@
 
 #   Should we start the server in the background?  (Not supported on Win32.)
 #
+# Note that if you use the Debian init script this setting is irrelevant,
+#  as we pass --daemon to mixminion on the command line.
 Daemon: no
 
 #   How much data are we willing to upload or download in a single second?

Index: 00list
===================================================================
RCS file: /home/minion/cvsroot/src/minion/debian/patches/00list,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 00list	14 Dec 2003 02:30:46 -0000	1.1
+++ 00list	4 Apr 2004 20:18:21 -0000	1.2
@@ -1 +1,3 @@
 501_set_fhs_paths_in_mixminiond.conf.dpatch
+502_manpages_in_share.dpatch
+503_mention_daemon_is_ignored.dpatch