WebSVN - prayer - Path Comparison - /branches/lenny/debian/patches/ Rev 54 and /branches/lenny/debian/patches/ Rev 55

Ignore whitespace Rev 54 → Rev 55

 /branches/lenny/debian/patches/welcome_is_template.patch
 ,3 → 29,13
  # Location of icon files
  icon_dir            = "$prefix/icons"
+--- a/shared/config.c
++++ b/shared/config.c
+@@ -2139,7 +2139,6 @@ BOOL config_check(struct config * config
+     struct config_http_port *chp;
+     char hostname[MAX_ADDRESS+1], domainname[MAX_ADDRESS+1];
+-    TEST_STRING(config->help_dir, "help_dir");
+     TEST_STRING(config->icon_dir, "icon_dir");
+     TEST_STRING(config->socket_dir, "socket_dir");
+     TEST_STRING(config->init_socket_name, "init_socket_name");

 /branches/lenny/debian/patches/makefile_install_config.patch
 ,10 → 125,10
  # Various directories used by the running system
  # Logs stored in $log_dir
 -log_dir             = "$var_prefix/logs"
-+log_dir             = "/var/log/prayer"
 -
 -# $lock_dir used for interlocking between prayer processes
 -lock_dir            = "$var_prefix/locks"
++log_dir             = "/var/log/prayer"
  # $socket_dir is location for unix domain sockets which connect frontend
  # to backend in proxy mode of operation.
 ,3 → 172,13
  # Size of small and large compose windows
  small_cols          = 80
+--- a/shared/config.c
++++ b/shared/config.c
+@@ -2144,7 +2144,6 @@ BOOL config_check(struct config * config
+     TEST_STRING(config->socket_dir, "socket_dir");
+     TEST_STRING(config->init_socket_name, "init_socket_name");
+     TEST_STRING(config->ssl_session_dir, "ssl_session_dir");
+-    TEST_STRING(config->lock_dir, "lock_dir");
+     TEST_STRING(config->log_dir, "log_dir");
+     TEST_STRING(config->tmp_dir, "tmp_dir");
+     TEST_STRING(config->pid_dir, "pid_dir");