[Pkg-sks-commit] r16 - in sks/trunk/sks/debian: . patches

[chrism at alioth.debian.org]

Author: chrism
Date: 2008-06-19 14:33:03 +0000 (Thu, 19 Jun 2008)
New Revision: 16

Modified:
   sks/trunk/sks/debian/dirs
   sks/trunk/sks/debian/patches/500_debian_fhs
Log:
[project @ 17]
Update on the FHS patch

Original author: weasel
Date: 2003-11-29 13:03:36.695814+00:00

Modified: sks/trunk/sks/debian/dirs
===================================================================
--- sks/trunk/sks/debian/dirs	2008-06-19 14:32:56 UTC (rev 15)
+++ sks/trunk/sks/debian/dirs	2008-06-19 14:33:03 UTC (rev 16)
@@ -3,4 +3,7 @@
 usr/lib/sks
 usr/share/sks
 var/lib/sks/dump
-var/spool/sks/db
+var/lib/sks/DB
+var/lib/sks/PTree
+var/spool/sks/messages
+var/spool/sks/failed_messages

Modified: sks/trunk/sks/debian/patches/500_debian_fhs
===================================================================
--- sks/trunk/sks/debian/patches/500_debian_fhs	2008-06-19 14:32:56 UTC (rev 15)
+++ sks/trunk/sks/debian/patches/500_debian_fhs	2008-06-19 14:33:03 UTC (rev 16)
@@ -1,6 +1,6 @@
-diff -ruN sks-old/getfileopts.ml sks/getfileopts.ml
+diff -ur sks-old/getfileopts.ml sks/getfileopts.ml
 --- sks-old/getfileopts.ml	2003-11-04 04:11:58.000000000 +0100
-+++ sks/getfileopts.ml	2003-11-28 22:34:41.000000000 +0100
++++ sks/getfileopts.ml	2003-11-29 13:33:29.000000000 +0100
 @@ -106,7 +106,7 @@
  (**************************************************************)
  (**************************************************************)
@@ -10,9 +10,9 @@
  
  let parse args = 
    Arg.current := 0;
-diff -ruN sks-old/settings.ml sks/settings.ml
+diff -ur sks-old/settings.ml sks/settings.ml
 --- sks-old/settings.ml	2003-11-21 12:44:29.000000000 +0100
-+++ sks/settings.ml	2003-11-28 22:38:19.000000000 +0100
++++ sks/settings.ml	2003-11-29 13:38:50.000000000 +0100
 @@ -177,7 +177,7 @@
  let command_timeout = ref 60
  let set_command_timeout value = command_timeout := value
@@ -22,22 +22,30 @@
  let set_sendmail_cmd value = sendmail_cmd := value
  
  let membership_reload_time = ref (60. *. 60. *. 6.)
-@@ -197,9 +197,9 @@
+@@ -195,13 +195,13 @@
+ 	from_addr := Some addr;
+ 	addr
  
- let dbdir = ref "KDB"
- let ptree_dbdir = ref "PTree"
+-let dbdir = ref "KDB"
+-let ptree_dbdir = ref "PTree"
 -let membership_file = ref "membership"
 -let mailsync_file = ref "mailsync"
 -let dumpdir = ref "dump"
+-let msgdir = ref "messages"
+-let failed_msgdir = ref "failed_messages"
++let dbdir = ref "K/var/lib/sks/DB"
++let ptree_dbdir = ref "/var/lib/sks/PTree"
 +let membership_file = ref "/etc/sks/membership"
 +let mailsync_file = ref "/etc/sks/mailsync"
 +let dumpdir = ref "/var/lib/sks/dump"
- let msgdir = ref "messages"
- let failed_msgdir = ref "failed_messages"
++let msgdir = ref "/var/spool/sks/messages"
++let failed_msgdir = ref "/var/spool/sks/failed_messages"
  
-diff -ruN sks-old/sks_build.sh sks/sks_build.sh
+ let update_dir dirref =
+   dirref := Filename.concat !basedir !dirref
+diff -ur sks-old/sks_build.sh sks/sks_build.sh
 --- sks-old/sks_build.sh	2003-10-12 22:20:19.000000000 +0200
-+++ sks/sks_build.sh	2003-11-28 22:36:05.000000000 +0100
++++ sks/sks_build.sh	2003-11-29 13:33:29.000000000 +0100
 @@ -5,6 +5,7 @@
  # You might want to edit this file to reduce or increase memory usage 
  # depending on your system