Subversion Repositories prayer-err

Compare Revisions

Ignore whitespace Rev 4 → Rev 5

/trunk/debian/control
1,9 → 1,13
Source: prayer
Section: mail
Priority: optional
Maintainer: Magnus Holmgren <magnus@kibibyte.se>
Build-Depends: cdbs (>= 0.4.27-1), debhelper (>= 5), quilt, libc-client-dev, zlib1g-dev, libssl-dev (>= 0.9.6), libdb4.3-dev | libdb-dev, libldap2-dev
Maintainer: Magnus Holmgren <holmgren@debian.org>
Build-Depends: cdbs (>= 0.4.27-1), debhelper (>= 5), quilt,
libc-client2007-dev, libldap2-dev,
zlib1g-dev, libssl-dev (>= 0.9.6), libdb4.3-dev | libdb-dev,
Standards-Version: 3.7.2
Vcs-Svn: svn://svn.kibibyte.se/prayer/trunk
Vcs-Browser: http://svn.kibibyte.se/prayer
 
Package: prayer
Architecture: any
/trunk/debian/patches/utf8.patch
File deleted
/trunk/debian/patches/hasnochildren_means_noinferiors.patch
File deleted
/trunk/debian/patches/session_unix_bugs.patch
File deleted
/trunk/debian/patches/session_server_bugs.patch
File deleted
/trunk/debian/patches/ipv6.patch
File deleted
/trunk/debian/patches/pidfiles_extension.patch
File deleted
/trunk/debian/patches/includes.patch
1,7 → 1,5
Index: prayer-1.0.18/prayer/prayer_session.h
===================================================================
--- prayer-1.0.18.orig/prayer/prayer_session.h 2007-03-10 18:50:09.676882377 +0100
+++ prayer-1.0.18/prayer/prayer_session.h 2007-03-10 18:50:11.007049496 +0100
--- prayer-1.1.0.orig/prayer/prayer_session.h
+++ prayer-1.1.0/prayer/prayer_session.h
@@ -27,7 +27,7 @@
extern int errno; /* just in case */
11,10 → 9,8
#define PRAYER_FULL_HDRS
#include "prayer_shared.h"
Index: prayer-1.0.18/prayer/cdb.c
===================================================================
--- prayer-1.0.18.orig/prayer/cdb.c 2007-03-10 18:51:20.845827434 +0100
+++ prayer-1.0.18/prayer/cdb.c 2007-03-10 18:51:25.766446163 +0100
--- prayer-1.1.0.orig/prayer/cdb.c
+++ prayer-1.1.0/prayer/cdb.c
@@ -63,7 +63,7 @@
#include <unistd.h>
#include <sys/stat.h>
/trunk/debian/patches/makefile_install_config.patch
1,5 → 1,5
--- prayer-1.0.18.orig/files/etc/prayer-accountd.cf
+++ prayer-1.0.18/files/etc/prayer-accountd.cf
--- prayer-1.1.0.orig/files/etc/prayer-accountd.cf
+++ prayer-1.1.0/files/etc/prayer-accountd.cf
@@ -8,6 +8,8 @@
# Default accountd.cf file suitable for RedHat Linux only.
# See distribution for some sample files for FreeBSD and Solaris
9,9 → 9,9
msforward_name = ".MSforward"
forward_name = ".forward"
aliases_name = "vacation.aliases"
--- prayer-1.0.18.orig/files/Makefile
+++ prayer-1.0.18/files/Makefile
@@ -53,41 +53,44 @@
--- prayer-1.1.0.orig/files/Makefile
+++ prayer-1.1.0/files/Makefile
@@ -53,41 +53,44 @@ distclean:
install-cert:
if [ -f certs/prayer.pem ]; then \
$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) \
69,8 → 69,8
- ./init.d/prayer $(BROOT)/etc/rc.d/init.d/prayer
+ ./init.d/prayer $(DESTDIR)/etc/rc.d/init.d/prayer
#chkconfig prayer --level 2345 on
--- prayer-1.0.18.orig/files/install.sh
+++ prayer-1.0.18/files/install.sh
--- prayer-1.1.0.orig/files/install.sh
+++ prayer-1.1.0/files/install.sh
@@ -4,77 +4,6 @@
PATH=/bin:/sbin/:/usr/bin:/usr/sbin
143,15 → 143,15
-fi
-
-if [ ! -d ${BIN_DIR} ]; then
- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PRIVATE_DIR} ${BIN_DIR}
- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${BIN_DIR}
-fi
-
for i in help icons
do
if [ -d "${PREFIX}/${i}" ]; then
--- prayer-1.0.18.orig/files/etc/prayer.cf.SRC
+++ prayer-1.0.18/files/etc/prayer.cf.SRC
@@ -20,7 +20,7 @@
--- prayer-1.1.0.orig/files/etc/prayer.cf.SRC
+++ prayer-1.1.0/files/etc/prayer.cf.SRC
@@ -20,7 +20,7 @@ var_prefix = "__VAR_PREFIX__"
# User ID to run as if we start off as root
prayer_user = "prayer"
# Group ID to run as if we start off as root
160,7 → 160,7
# Run prayer as background process.
# TRUE => will return as soon as valid configuration is found.
@@ -423,14 +423,14 @@
@@ -428,14 +428,14 @@ bin_dir = "__BIN_DIR__"
# Various directories used by the running system
# Logs stored in $log_dir
178,7 → 178,7
# Split socket directory into 64 subdirs keyed on first letter of sessionID
# Code provides compatibility in both directions: can switch back and forward
@@ -441,14 +441,14 @@
@@ -446,14 +446,14 @@ socket_split_dir = TRUE
init_socket_name = init
# $ssl_session_dir is location for SSL session cache
196,16 → 196,7
# Interface to Hermes finger database
#lookup_rpasswd = "/data/finger/rpasswd.cdb"
@@ -587,7 +587,7 @@
suppress_dotfiles = TRUE
# Mail directory in users account
-maildir = "mail"
+maildir = ""
# Temporary hack to remove "mail/" from favourites list (and anywhere
# else where we find the strings embedded into .prayer files).
@@ -601,7 +601,7 @@
@@ -614,7 +614,7 @@ sent_mail_folder = "sent-mail"
# default_domain = "<valid mail domain>"
# Language for ispell.
214,9 → 205,9
# Size of small and large compose windows
small_cols = 80
--- prayer-1.0.18.orig/prayer/Makefile
+++ prayer-1.0.18/prayer/Makefile
@@ -102,8 +102,9 @@
--- prayer-1.1.0.orig/prayer/Makefile
+++ prayer-1.1.0/prayer/Makefile
@@ -102,8 +102,9 @@ ifeq ($(strip $(CCLIENT_KERB_ENABLE)), t
SESSION_LIBS += $(KERB_LIBS)
endif
228,7 → 219,7
SHARED_OBJS = \
pool.o list.o assoc.o memblock.o buffer.o string.o config.o user_agent.o \
@@ -175,21 +176,21 @@
@@ -175,21 +176,21 @@ clean:
install: all
$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \
/trunk/debian/patches/series
1,8 → 1,2
includes.patch
makefile_install_config.patch
session_unix_bugs.patch
session_server_bugs.patch
hasnochildren_means_noinferiors.patch
pidfiles_extension.patch
ipv6.patch
utf8.patch
/trunk/debian/changelog
1,3 → 1,17
prayer (1.1.0-1) unstable; urgency=low
 
* First upload to unstable.
* New upstream release.
- Drop pidfiles_extension.patch, session_unix_bugs.patch,
session_server_bugs.patch; all incorporated upstream.
- Drop ipv6.patch; incorporated upstream.
- Drop utf8.patch; incorporated and improved upstream.
- Drop hasnochildren_means_noinferiors.patch since upstream now
handles dual-use mailboxes.
* New maintainer email address.
 
-- Magnus Holmgren <holmgren@debian.org> Fri, 18 Apr 2008 18:45:05 +0200
 
prayer (1.0.18-1) experimental; urgency=low
 
* Initial release (Closes: #392823)