Subversion Repositories prayer

Compare Revisions

Ignore whitespace Rev 54 → Rev 55

/branches/lenny/debian/control
3,7 → 3,7
Priority: optional
Maintainer: Magnus Holmgren <holmgren@debian.org>
Build-Depends: cdbs, debhelper (>= 5), quilt,
libc-client2007b-dev | libc-client2007-dev | libc-client-dev (>= 7:2007),
libc-client2007b-dev | libc-client2007-dev | libc-client-dev (>= 7:2007~),
libldap2-dev, zlib1g-dev, libssl-dev (>= 0.9.6), libdb-dev,
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.kibibyte.se/prayer/trunk
/branches/lenny/debian/changelog
1,3 → 1,14
prayer (1.2.2.1-3) unstable; urgency=low
 
* welcome_is_template.patch:
- shared/config.c: Don't require that the help_dir option, which was
removed from the default prayer.cf earlier, is defined
(Closes: #493009).
* makefile_install_config.patch:
- shared/config.c: Likewise don't check for lock_dir (Closes: #494011).
 
-- Magnus Holmgren <holmgren@debian.org> Wed, 06 Aug 2008 21:20:17 +0200
 
prayer (1.2.2.1-2) unstable; urgency=low
 
* Acknowledge NMU, but change the build dependency to
/branches/lenny/debian/patches/welcome_is_template.patch
29,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
125,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.
172,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");