[pkg-kolab] r1475 - in kolabd: trunk/debian trunk/debian/patches upstream
Mathieu Parent
sathieu at alioth.debian.org
Mon Jan 4 21:46:41 UTC 2010
Author: sathieu
Date: 2010-01-04 21:46:40 +0000 (Mon, 04 Jan 2010)
New Revision: 1475
Added:
kolabd/upstream/kolabd_2.2.3-20091217.orig.tar.gz
Modified:
kolabd/trunk/debian/changelog
kolabd/trunk/debian/patches/10-dist_conf.diff
kolabd/trunk/debian/patches/55-no-distconf_kolabsrv.diff
kolabd/trunk/debian/patches/70-kolab2.schema-removal.of.rfc2739.diff
kolabd/trunk/debian/patches/91-postfix-template.diff
kolabd/trunk/debian/patches/95-resmgr-issue1383-issue2499.diff
Log:
New upstream release (2.2.3-20091217)
Updated patches
Modified: kolabd/trunk/debian/changelog
===================================================================
--- kolabd/trunk/debian/changelog 2010-01-04 21:24:56 UTC (rev 1474)
+++ kolabd/trunk/debian/changelog 2010-01-04 21:46:40 UTC (rev 1475)
@@ -1,8 +1,10 @@
-kolabd (2.2.2-20090514-3~1) UNRELEASED; urgency=low
+kolabd (2.2.3-20091217-1) UNRELEASED; urgency=low
* Package snapshot
+ * New upstream release (2.2.3-20091217)
+ * Updated patches
- -- Mathieu Parent <sathieu at debian.org> Tue, 17 Nov 2009 21:52:20 +0100
+ -- Mathieu Parent <sathieu at debian.org> Mon, 04 Jan 2010 22:26:05 +0100
kolabd (2.2.2-20090514-2) unstable; urgency=low
Modified: kolabd/trunk/debian/patches/10-dist_conf.diff
===================================================================
--- kolabd/trunk/debian/patches/10-dist_conf.diff 2010-01-04 21:24:56 UTC (rev 1474)
+++ kolabd/trunk/debian/patches/10-dist_conf.diff 2010-01-04 21:46:40 UTC (rev 1475)
@@ -8,7 +8,7 @@
===================================================================
--- a/dist_conf/common
+++ b/dist_conf/common
-@@ -1,159 +1,159 @@
+@@ -1,160 +1,160 @@
do_subst = sed \
- -e 's,[@]sysconfdir[@],$(sysconfdir),g' \
- -e 's,[@]bindir[@],$(bindir),g' \
@@ -131,6 +131,7 @@
- -e 's,[@]resmgr_conffile_usr[@],$(resmgr_conffile_usr),g' \
- -e 's,[@]resmgr_tmpdir[@],$(resmgr_tmpdir),g' \
- -e 's,[@]resmgr_grp[@],$(resmgr_grp),g' \
+- -e 's,[@]resmgr_localedir[@],$(resmgr_localedir),g' \
- -e 's,[@]resmgr_logdir[@],$(resmgr_logdir),g' \
- -e 's,[@]resmgr_scriptsdir[@],$(resmgr_scriptsdir),g' \
- -e 's,[@]resmgr_usr[@],$(resmgr_usr),g' \
@@ -289,6 +290,7 @@
+ -e 's=[@]resmgr_conffile_usr[@]=$(resmgr_conffile_usr)=g' \
+ -e 's=[@]resmgr_tmpdir[@]=$(resmgr_tmpdir)=g' \
+ -e 's=[@]resmgr_grp[@]=$(resmgr_grp)=g' \
++ -e 's=[@]resmgr_localedir[@]=$(resmgr_localedir)=g' \
+ -e 's=[@]resmgr_logdir[@]=$(resmgr_logdir)=g' \
+ -e 's=[@]resmgr_scriptsdir[@]=$(resmgr_scriptsdir)=g' \
+ -e 's=[@]resmgr_usr[@]=$(resmgr_usr)=g' \
Modified: kolabd/trunk/debian/patches/55-no-distconf_kolabsrv.diff
===================================================================
--- kolabd/trunk/debian/patches/55-no-distconf_kolabsrv.diff 2010-01-04 21:24:56 UTC (rev 1474)
+++ kolabd/trunk/debian/patches/55-no-distconf_kolabsrv.diff 2010-01-04 21:46:40 UTC (rev 1475)
@@ -8,7 +8,7 @@
===================================================================
--- a/Makefile.am
+++ b/Makefile.am
-@@ -134,9 +134,9 @@
+@@ -127,9 +127,9 @@
kolabdocdir = $(pkgdocdir)/@PACKAGE@
kolabdoc_DATA = $(kolabdoc_FILES) $(kolabdoc_GENERATED)
@@ -21,7 +21,7 @@
kolabsbindir = $(sbindir)/
kolabsbin_DATA = $(kolabsbin_FILES)
-@@ -206,9 +206,9 @@
+@@ -199,9 +199,9 @@
chmod 444 $(DESTDIR)$(kolabconfdir)/kolab.globals
chmod 775 $(DESTDIR)$(kolabdir)$(kolab_FILES)
chmod 744 $(DESTDIR)$(kolabnamespacedir)/*
@@ -38,7 +38,7 @@
===================================================================
--- a/Makefile.in
+++ b/Makefile.in
-@@ -272,7 +272,7 @@
+@@ -268,7 +268,7 @@
kolabdocdir = $(pkgdocdir)/@PACKAGE@
kolabdoc_DATA = $(kolabdoc_FILES) $(kolabdoc_GENERATED)
@@ -47,7 +47,7 @@
kolabsbindir = $(sbindir)/
kolabsbin_DATA = $(kolabsbin_FILES)
kolabbindir = $(bindir)
-@@ -875,7 +875,7 @@
+@@ -871,7 +871,7 @@
chmod 444 $(DESTDIR)$(kolabconfdir)/kolab.globals
chmod 775 $(DESTDIR)$(kolabdir)$(kolab_FILES)
chmod 744 $(DESTDIR)$(kolabnamespacedir)/*
Modified: kolabd/trunk/debian/patches/70-kolab2.schema-removal.of.rfc2739.diff
===================================================================
--- kolabd/trunk/debian/patches/70-kolab2.schema-removal.of.rfc2739.diff 2010-01-04 21:24:56 UTC (rev 1474)
+++ kolabd/trunk/debian/patches/70-kolab2.schema-removal.of.rfc2739.diff 2010-01-04 21:46:40 UTC (rev 1475)
@@ -11,7 +11,7 @@
===================================================================
--- a/Makefile.am
+++ b/Makefile.am
-@@ -98,8 +98,7 @@
+@@ -82,8 +82,7 @@
ldapschema_FILES = kolab2.schema \
@@ -25,7 +25,7 @@
===================================================================
--- a/Makefile.in
+++ b/Makefile.in
-@@ -243,8 +243,7 @@
+@@ -230,8 +230,7 @@
kolabnamespacedir = $(libexecdir)/kolab
kolabnamespace_DATA = $(kolabnamespace_FILES)
ldapschema_FILES = kolab2.schema \
Modified: kolabd/trunk/debian/patches/91-postfix-template.diff
===================================================================
--- kolabd/trunk/debian/patches/91-postfix-template.diff 2010-01-04 21:24:56 UTC (rev 1474)
+++ kolabd/trunk/debian/patches/91-postfix-template.diff 2010-01-04 21:46:40 UTC (rev 1475)
@@ -8,9 +8,9 @@
===================================================================
--- a/templates/main.cf.template.in
+++ b/templates/main.cf.template.in
-@@ -19,16 +19,6 @@
- # we use 20 Mebibyte = 20*2^20 Byte
+@@ -22,16 +22,6 @@
message_size_limit = 20971520
+ @@@endif@@@
-# paths
-command_directory = @sbindir@
@@ -47,8 +47,8 @@
-PERMISSIONS=0640
+PERMISSIONS=0644
OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
+ RUNONCHANGE=@sbindir@/postmap -o @emailserver_confdir@/transport
KOLAB_META_END
- # (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
Index: b/templates/virtual.template.in
===================================================================
--- a/templates/virtual.template.in
@@ -59,5 +59,5 @@
-PERMISSIONS=0640
+PERMISSIONS=0644
OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
- RUNONCHANGE=/usr/sbin/postmap -o @emailserver_confdir@/virtual
+ RUNONCHANGE=@sbindir@/postmap -o @emailserver_confdir@/virtual
KOLAB_META_END
Modified: kolabd/trunk/debian/patches/95-resmgr-issue1383-issue2499.diff
===================================================================
--- kolabd/trunk/debian/patches/95-resmgr-issue1383-issue2499.diff 2010-01-04 21:24:56 UTC (rev 1474)
+++ kolabd/trunk/debian/patches/95-resmgr-issue1383-issue2499.diff 2010-01-04 21:46:40 UTC (rev 1475)
@@ -12,18 +12,9 @@
===================================================================
--- a/templates/resmgr.conf.template.in
+++ b/templates/resmgr.conf.template.in
-@@ -29,7 +29,7 @@
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
-- * $Revision: 1.34 $
-+ * $Revision: 1.35 $
- *
- * ABOUT
- * -----
-@@ -157,6 +157,17 @@
- /* Temporary data storage for the scripts */
- $conf['kolab']['filter']['tempdir'] = '@resmgr_tmpdir@';
+@@ -184,6 +184,17 @@
+ //$conf['kolab']['filter']['locale_path'] = '@resmgr_localedir@';
+ //$conf['kolab']['filter']['locale'] = 'de_DE';
+/* Uncomment if the resource manager should generate translated messages. */
+//$conf['kolab']['filter']['locale_path'] = '@resmgr_localedir@';
@@ -43,12 +34,11 @@
===================================================================
--- a/dist_conf/common
+++ b/dist_conf/common
-@@ -120,6 +120,8 @@
+@@ -120,6 +120,7 @@
-e 's=[@]resmgr_conffile_usr[@]=$(resmgr_conffile_usr)=g' \
-e 's=[@]resmgr_tmpdir[@]=$(resmgr_tmpdir)=g' \
-e 's=[@]resmgr_grp[@]=$(resmgr_grp)=g' \
+ -e 's=[@]resmgr_locksdir[@]=$(resmgr_locksdir)=g' \
-+ -e 's=[@]resmgr_localedir[@]=$(resmgr_localedir)=g' \
+ -e 's=[@]resmgr_localedir[@]=$(resmgr_localedir)=g' \
-e 's=[@]resmgr_logdir[@]=$(resmgr_logdir)=g' \
-e 's=[@]resmgr_scriptsdir[@]=$(resmgr_scriptsdir)=g' \
- -e 's=[@]resmgr_usr[@]=$(resmgr_usr)=g' \
Added: kolabd/upstream/kolabd_2.2.3-20091217.orig.tar.gz
===================================================================
(Binary files differ)
Property changes on: kolabd/upstream/kolabd_2.2.3-20091217.orig.tar.gz
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
More information about the pkg-kolab-devel
mailing list