Subversion Repositories prayer

Compare Revisions

Regard whitespace Rev 35 → Rev 36

/trunk/debian/patches/welcome_is_template.patch
0,0 → 1,31
--- a/cmd/cmd_welcome.c
+++ b/cmd/cmd_welcome.c
@@ -74,12 +74,7 @@ void cmd_welcome(struct session *session
unsigned long msgno;
if ((request->method != POST) && (prefs->use_welcome)) {
- if (config->welcome_path &&
- (string = read_welcome(request->pool, config->welcome_path)))
- generate_welcome_page(session, string);
- else
- session_redirect(session, request, "list");
-
+ generate_welcome_page(session, NULL);
return;
}
--- a/files/etc/prayer.cf.SRC
+++ b/files/etc/prayer.cf.SRC
@@ -402,12 +402,6 @@ ssl_required = FALSE
# Session banner (local HTML inserted into each page of login session)
#session_banner_path = "$prefix/etc/session_banner.html"
-# Welcome text displayed when user first logs in
-welcome_path = "$prefix/etc/welcome.html"
-
-# Location of help files
-help_dir = "$prefix/help"
-
# Location of icon files
icon_dir = "$prefix/icons"
/trunk/debian/changelog
16,8 → 16,14
+ Add dependency on ssl-cert (>= 1.0.11).
+ prayer.postinst: Add prayer to group ssl-cert on fresh install or
when upgrading from versions prior to this one.
* welcome_is_template.patch (new): Although the welcome screen is now a
template among others, cmd_welcome.c still tried to read the file
specified by welcome_path (welcome.html by default) and wouldn't show
the welcome screen if the option was unset or the file couldn't be
read. This patch removes that check as well as the welcome_path and
help_path options from prayer.cf.
 
-- Magnus Holmgren <holmgren@debian.org> Mon, 23 Jun 2008 21:19:17 +0200
-- Magnus Holmgren <holmgren@debian.org> Mon, 23 Jun 2008 21:32:03 +0200
 
prayer (1.2.0-1) unstable; urgency=low