Subversion Repositories prayer-err

Compare Revisions

Ignore whitespace Rev 11 → Rev 12

/trunk/debian/patches/makefile_install_config.patch
1,5 → 1,5
--- prayer-1.1.0.orig/files/etc/prayer-accountd.cf
+++ prayer-1.1.0/files/etc/prayer-accountd.cf
--- a/files/etc/prayer-accountd.cf
+++ b/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,8 → 9,8
msforward_name = ".MSforward"
forward_name = ".forward"
aliases_name = "vacation.aliases"
--- prayer-1.1.0.orig/files/Makefile
+++ prayer-1.1.0/files/Makefile
--- a/files/Makefile
+++ b/files/Makefile
@@ -53,41 +53,44 @@ distclean:
install-cert:
if [ -f certs/prayer.pem ]; then \
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.1.0.orig/files/install.sh
+++ prayer-1.1.0/files/install.sh
--- a/files/install.sh
+++ b/files/install.sh
@@ -4,77 +4,6 @@
PATH=/bin:/sbin/:/usr/bin:/usr/sbin
149,8 → 149,8
for i in help icons
do
if [ -d "${PREFIX}/${i}" ]; then
--- prayer-1.1.0.orig/files/etc/prayer.cf.SRC
+++ prayer-1.1.0/files/etc/prayer.cf.SRC
--- a/files/etc/prayer.cf.SRC
+++ b/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"
205,8 → 205,8
# Size of small and large compose windows
small_cols = 80
--- prayer-1.1.0.orig/prayer/Makefile
+++ prayer-1.1.0/prayer/Makefile
--- a/prayer/Makefile
+++ b/prayer/Makefile
@@ -102,8 +102,9 @@ ifeq ($(strip $(CCLIENT_KERB_ENABLE)), t
SESSION_LIBS += $(KERB_LIBS)
endif
213,8 → 213,8
-CFLAGS = $(BASECFLAGS) $(COMMON_SSL_INCLUDE) $(CCLIENT_INCLUDE)
-LDFLAGS = $(BASELDFLAGS)
+CFLAGS = $(BASECFLAGS)
+override CFLAGS += $(COMMON_SSL_INCLUDE) $(CCLIENT_INCLUDE)
+CFLAGS =
+override CFLAGS += $(BASECFLAGS) $(COMMON_SSL_INCLUDE) $(CCLIENT_INCLUDE)
+LDFLAGS = $(BASELDFLAGS) -Wl,--as-needed
SHARED_OBJS = \
/trunk/debian/changelog
1,3 → 1,12
prayer (1.1.0-2) unstable; urgency=low
 
* Define LDAP_DEPRECATED so that the deprecated LDAP interfaces can be
used.
* makefile_install_config.patch: Modify prayer/Makefile so that the
above definition isn't lost if CFLAGS is overridden.
 
-- Magnus Holmgren <holmgren@debian.org> Thu, 15 May 2008 19:32:14 +0200
 
prayer (1.1.0-1) unstable; urgency=low
 
* First upload to unstable.
/trunk/debian/Config
37,8 → 37,8
# Base Compiler options for GCC.
#BASECFLAGS = -Wall -g
#BASELDFLAGS = -g
BASECFLAGS = -Wall -g -O2
BASELDFLAGS = -g -O2
CFLAGS = -Wall -g -O2
LDFLAGS = -g -O2
BASE_LIBS = -lcrypt
 
# Base Compiler options for Sun SUNWspro compiler
85,7 → 85,7
Z_LIBS = -lz
 
# LDAP (required if LDAP_ENABLE set)
LDAP_INCLUDE =
LDAP_INCLUDE = -DLDAP_DEPRECATED
LDAP_LIBS = -lldap
 
# Pam (required if CCLIENT_PAM_ENABLE set)