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

[chrism at alioth.debian.org]

Author: chrism
Date: 2008-06-19 15:16:37 +0000 (Thu, 19 Jun 2008)
New Revision: 175

Modified:
   sks/trunk/sks/debian/changelog
   sks/trunk/sks/debian/patches/500_debian_fhs
Log:
[project @ 177]
Forward port rest of 500_debian_fhs

Original author: weasel
Date: 2005-08-24 16:31:49.131987+00:00

Modified: sks/trunk/sks/debian/changelog
===================================================================
--- sks/trunk/sks/debian/changelog	2008-06-19 15:16:28 UTC (rev 174)
+++ sks/trunk/sks/debian/changelog	2008-06-19 15:16:37 UTC (rev 175)
@@ -8,8 +8,9 @@
   * Update 500_debian_fhs for new log filenames.
   * Remove 510_sane_logfile_names.
   * Rename logfiles in postinst.
+  * Forward port rest of 500_debian_fhs.
 
- -- Peter Palfrader <weasel at debian.org>  Wed, 24 Aug 2005 18:21:30 +0200
+ -- Peter Palfrader <weasel at debian.org>  Wed, 24 Aug 2005 18:31:35 +0200
 
 sks (1.0.9-0.6) UNRELEASED; urgency=low
 

Modified: sks/trunk/sks/debian/patches/500_debian_fhs
===================================================================
--- sks/trunk/sks/debian/patches/500_debian_fhs	2008-06-19 15:16:28 UTC (rev 174)
+++ sks/trunk/sks/debian/patches/500_debian_fhs	2008-06-19 15:16:37 UTC (rev 175)
@@ -78,42 +78,36 @@
  let set_sendmail_cmd value = sendmail_cmd := value
  
  let membership_reload_time = ref (60. *. 60. *. 6.)
-@@ -197,13 +197,13 @@
+@@ -197,15 +197,15 @@
  	from_addr := Some addr;
  	addr
  
--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 "/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 "/var/spool/sks/messages"
-+let failed_msgdir = ref "/var/spool/sks/failed_messages"
- 
- let update_dir basedir dirref =
-   dirref := Filename.concat basedir !dirref
-@@ -218,7 +218,7 @@
-   update_dir basedir failed_msgdir;
-   ()
- 
 -let basedir = ref "."
 +let basedir = ref ""
- let set_basedir value = 
-   basedir := value;
-   prepare_options !basedir
+ 
+-let dbdir = "KDB"
+-let ptree_dbdir = "PTree"
+-let membership_file = "membership"
+-let mailsync_file = "mailsync"
+-let dumpdir = "dump"
+-let msgdir = "messages"
+-let failed_msgdir = "failed_messages"
++let dbdir = "/var/lib/sks/DB"
++let ptree_dbdir = "/var/lib/sks/PTree"
++let membership_file = "/etc/sks/membership"
++let mailsync_file = "/etc/sks/mailsync"
++let dumpdir = "/var/lib/sks/dump"
++let msgdir = "/var/spool/sks/messages"
++let failed_msgdir = "/var/spool/sks/failed_messages"
+ 
+ let dbdir = lazy (Filename.concat !basedir base_dbdir)
+ let ptree_dbdir = lazy (Filename.concat !basedir base_ptree_dbdir)
 @@ -260,7 +260,7 @@
      ("-hkp_address",Arg.String set_hkp_address, " Set hkp binding address"); 
      ("-use_port_80",Arg.Set use_port_80, 
       " Have the HKP interface listen on port 80, as well as the hkp_port"); 
--    ("-basedir", Arg.String set_basedir, " Set base directory");
-+    ("-basedir", Arg.String set_basedir, " Set base directory (Take special care if running the Debian package!)");
+-    ("-basedir", Arg.Set_string basedir, " Base directory");
++    ("-basedir", Arg.Set_string basedir, " Base directory (Take special care if running the Debian package!)");
      ("-stdoutlog", Arg.Clear filelog, 
       " Send log messages to stdout instead of log file");
      ("-diskptree", Arg.Set disk_ptree, " Use a disk-based ptree " ^