[pkg-kolab] r770 - kolab-filter/branches/2.2/debian kolab-freebusy/branches/2.2/debian kolab-freebusy/branches/2.2/debian/patches kolab-webadmin/branches/2.2/debian kolab-webadmin/branches/2.2/debian/patches kolab-webadmin/branches/2.2/debian/patches/common kolabconf/branches/2.2/debian kolabconf/branches/2.2/debian/patches kolabd/branches/2.2/debian kolabd/branches/2.2/debian/patches kolabd/branches/2.2/debian/patches/common libkolab-perl/branches/2.2/debian php-kolab/branches/2.2/debian
mparent-guest at alioth.debian.org
mparent-guest at alioth.debian.org
Mon Mar 17 18:55:30 UTC 2008
Author: mparent-guest
Date: 2008-03-17 18:55:29 +0000 (Mon, 17 Mar 2008)
New Revision: 770
Removed:
kolabconf/branches/2.2/debian/patches/80-kolab-syslog-facility.dpatch
Modified:
kolab-filter/branches/2.2/debian/changelog
kolab-freebusy/branches/2.2/debian/changelog
kolab-freebusy/branches/2.2/debian/patches/30-syslog.dpatch
kolab-webadmin/branches/2.2/debian/changelog
kolab-webadmin/branches/2.2/debian/patches/10-fix-require.dpatch
kolab-webadmin/branches/2.2/debian/patches/common/dist_conf.dpatch
kolabconf/branches/2.2/debian/changelog
kolabconf/branches/2.2/debian/patches/00list
kolabd/branches/2.2/debian/changelog
kolabd/branches/2.2/debian/patches/80-kolab-syslog-facility.dpatch
kolabd/branches/2.2/debian/patches/common/dist_conf.dpatch
libkolab-perl/branches/2.2/debian/changelog
php-kolab/branches/2.2/debian/changelog
Log:
Patches update for 2.2rc2
Modified: kolab-filter/branches/2.2/debian/changelog
===================================================================
--- kolab-filter/branches/2.2/debian/changelog 2008-03-17 18:54:58 UTC (rev 769)
+++ kolab-filter/branches/2.2/debian/changelog 2008-03-17 18:55:29 UTC (rev 770)
@@ -1,3 +1,9 @@
+kolab-filter (2.2~rc2+20080314-1) UNRELEASED; urgency=low
+
+ * New upstream version: 2.2rc2
+
+ -- Mathieu Parent <math.parent at gmail.com> Mon, 17 Mar 2008 19:13:23 +0100
+
kolab-filter (2.2~rc1+20080204-1) UNRELEASED; urgency=low
* Initial release, reorganisation of kolab-resources-handler
Modified: kolab-freebusy/branches/2.2/debian/changelog
===================================================================
--- kolab-freebusy/branches/2.2/debian/changelog 2008-03-17 18:54:58 UTC (rev 769)
+++ kolab-freebusy/branches/2.2/debian/changelog 2008-03-17 18:55:29 UTC (rev 770)
@@ -1,3 +1,10 @@
+kolab-freebusy (2.2~rc2+20080314-1) UNRELEASED; urgency=low
+
+ * New upstream version: 2.2rc2
+ * removed ''No newline at end of file'' patch from 30-syslog.dpatch
+
+ -- Mathieu Parent <math.parent at gmail.com> Mon, 17 Mar 2008 19:13:14 +0100
+
kolab-freebusy (2.2~rc1+20080204-1) UNRELEASED; urgency=low
* Initial release, reorganisation of kolab-resources-handler
Modified: kolab-freebusy/branches/2.2/debian/patches/30-syslog.dpatch
===================================================================
--- kolab-freebusy/branches/2.2/debian/patches/30-syslog.dpatch 2008-03-17 18:54:58 UTC (rev 769)
+++ kolab-freebusy/branches/2.2/debian/patches/30-syslog.dpatch 2008-03-17 18:55:29 UTC (rev 770)
@@ -18,10 +18,4 @@
$conf['log']['ident'] = 'Kolab Free/Busy';
$conf['log']['params']['append'] = true;
-@@ -134,4 +134,4 @@
- // ini_set('display_errors', 1);
- //
- // Both setting will disrupt header delivery (which should not cause a
--// problem).
-\ No newline at end of file
-+// problem).
+
Modified: kolab-webadmin/branches/2.2/debian/changelog
===================================================================
--- kolab-webadmin/branches/2.2/debian/changelog 2008-03-17 18:54:58 UTC (rev 769)
+++ kolab-webadmin/branches/2.2/debian/changelog 2008-03-17 18:55:29 UTC (rev 770)
@@ -1,3 +1,10 @@
+kolab-webadmin (2.1.99+20080314.dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream version: 2.2rc2
+ * updated 10-fix-requrires.dpatch
+
+ -- Mathieu Parent <math.parent at gmail.com> Mon, 17 Mar 2008 19:13:59 +0100
+
kolab-webadmin (2.1.99+20080204-1) UNRELEASED; urgency=low
* New upstream release
Modified: kolab-webadmin/branches/2.2/debian/patches/10-fix-require.dpatch
===================================================================
--- kolab-webadmin/branches/2.2/debian/patches/10-fix-require.dpatch 2008-03-17 18:54:58 UTC (rev 769)
+++ kolab-webadmin/branches/2.2/debian/patches/10-fix-require.dpatch 2008-03-17 18:55:29 UTC (rev 770)
@@ -4,24 +4,24 @@
## DP: Correction of the require paths
@DPATCH@
-diff -urNad kolab-webadmin-0.4.0-20060810~/php/admin/include/ldap.class.php kolab-webadmin-0.4.0-20060810/php/admin/include/ldap.class.php
---- kolab-webadmin-0.4.0-20060810~/php/admin/include/ldap.class.php 2006-08-10 20:18:16.000000000 +0200
-+++ kolab-webadmin-0.4.0-20060810/php/admin/include/ldap.class.php 2006-10-25 20:28:23.000000000 +0200
+diff -urNad kolab-webadmin-2.1.99+20080314~/php/admin/include/ldap.class.php.in kolab-webadmin-2.1.99+20080314/php/admin/include/ldap.class.php.in
+--- kolab-webadmin-2.1.99+20080314~/php/admin/include/ldap.class.php.in 2008-03-06 12:46:29.000000000 +0100
++++ kolab-webadmin-2.1.99+20080314/php/admin/include/ldap.class.php.in 2008-03-17 19:52:48.000000000 +0100
@@ -19,7 +19,7 @@
*/
require_once('mysmarty.php');
--require_once('session_vars.php');
+-require_once('@sysconfdir@/kolab/session_vars.php');
+require_once('/etc/kolab-webadmin/session_vars.php');
require_once('debug.php');
/* We dont have any better place to put this right now... */
-diff -urNad kolab-webadmin-0.4.0-20060810~/php/admin/include/mysmarty.php kolab-webadmin-0.4.0-20060810/php/admin/include/mysmarty.php
---- kolab-webadmin-0.4.0-20060810~/php/admin/include/mysmarty.php.in 2006-08-10 20:18:16.000000000 +0200
-+++ kolab-webadmin-0.4.0-20060810/php/admin/include/mysmarty.php.in 2006-10-25 20:28:23.000000000 +0200
+diff -urNad kolab-webadmin-2.1.99+20080314~/php/admin/include/mysmarty.php.in kolab-webadmin-2.1.99+20080314/php/admin/include/mysmarty.php.in
+--- kolab-webadmin-2.1.99+20080314~/php/admin/include/mysmarty.php.in 2007-07-03 16:55:17.000000000 +0200
++++ kolab-webadmin-2.1.99+20080314/php/admin/include/mysmarty.php.in 2008-03-17 19:52:01.000000000 +0100
@@ -36,7 +36,7 @@
- $basedir = "$php_dir/admin/";
+ $basedir = "$php_dir/@kolab_php_module_prefix at admin/";
$this->template_dir = $basedir.'templates/';
- $this->compile_dir = $basedir.'templates_c/';
+ $this->compile_dir = '/var/cache/kolab-webadmin/templates/';
Modified: kolab-webadmin/branches/2.2/debian/patches/common/dist_conf.dpatch
===================================================================
--- kolab-webadmin/branches/2.2/debian/patches/common/dist_conf.dpatch 2008-03-17 18:54:58 UTC (rev 769)
+++ kolab-webadmin/branches/2.2/debian/patches/common/dist_conf.dpatch 2008-03-17 18:55:29 UTC (rev 770)
@@ -4,9 +4,9 @@
## DP: Adjusts some paths
@DPATCH@
-diff -urNad kolab-webadmin-2.1.99+20080204~/dist_conf/debian kolab-webadmin-2.1.99+20080204/dist_conf/debian
---- kolab-webadmin-2.1.99+20080204~/dist_conf/debian 2008-02-29 17:47:23.000000000 +0100
-+++ kolab-webadmin-2.1.99+20080204/dist_conf/debian 2008-02-29 17:47:55.000000000 +0100
+diff -urNad kolabd-2.1.99+20080314.dfsg~/dist_conf/debian kolabd-2.1.99+20080314.dfsg/dist_conf/debian
+--- kolabd-2.1.99+20080314.dfsg~/dist_conf/debian 2008-02-26 14:58:04.000000000 +0100
++++ kolabd-2.1.99+20080314.dfsg/dist_conf/debian 2008-03-17 19:27:44.000000000 +0100
@@ -1,14 +1,15 @@
-kolab_usr=root
-kolab_grp=root
@@ -53,7 +53,7 @@
clamav_confdir=${sysconfdir}/clamav
clamav_socket=${localstatedir}/clamav/clamd.sock
-@@ -53,42 +54,45 @@
+@@ -53,26 +54,29 @@
emailserver_socket=${libdir}/postfix/lmtp
emailserver_localstatedir=${localstatedir}/spool/postfix
emailserver_logfile=${localstatedir}/log/mail.log
@@ -79,14 +79,18 @@
imap_lmtp=${localstatedir}/run/cyrus/socket/lmtp
+imap_notify_socket=${localstatedir}/run/cyrus/socket/notify
- kolab_statedir=${localstatedir}/kolab
+-kolab_statedir=${localstatedir}/kolab
++kolab_statedir=${localstatedir}/lib/kolab
kolab_logdir=${localstatedir}/log/kolab
kolab_pidfile=${sysrundir}/kolab.pid
kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
-kolab_scriptsdir=$(sysconfdir)/kolab
-+kolab_scriptsdir=${sbindir}
++kolab_scriptsdir=$(sbindir)
kolab_php_smarty_prefix=smarty/libs
+ # Kolab web user interface
+@@ -80,18 +84,18 @@
+
ldapserver_statedir=${localstatedir}/lib/ldap
ldapserver_dir=${localstatedir}/lib/ldap
-ldapserver_replogfile=${localstatedir}/log/ldap-replicalog
@@ -112,7 +116,7 @@
webserver_cgidir=${webserver_document_root}/cgi-bin
webserver_sessions=${localstatedir}/cache/kolab/httpd_sessions
webserver_logdir=${localstatedir}/log/apache2
-@@ -102,31 +106,43 @@
+@@ -105,31 +109,43 @@
webserver_mime_typesfile=${sysconfdir}/apache2/mime.types
webserver_sslscache=${sysrundir}/ssl_scache
webserver_sslmutex=${sysrundir}/ssl_mutex
@@ -138,11 +142,12 @@
resmgr_logfile=${localstatedir}/log/resmgr.log
-resmgr_confdir=${sysconfdir}/resmgr
-resmgr_filterdir=${localstatedir}/resmgr/filter
+-resmgr_scriptsdir=${resmgr_confdir}
+-resmgr_usr=kolab
+-resmgr_grp=kolab-n
+resmgr_confdir=${sysconfdir}/kolab
+resmgr_filterdir=${localstatedir}/lib/kolab/resmgr/filter
- resmgr_scriptsdir=${resmgr_confdir}
--resmgr_usr=kolab
--resmgr_grp=kolab-n
++resmgr_scriptsdir=/usr/share/kolab/filter
+resmgr_conffile_usr=kolab
+resmgr_conffile_grp=root
+resmgr_usr=root
@@ -157,8 +162,8 @@
+freebusy_usr=root
+freebusy_grp=www-data
- graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db
- graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db
+ graveyard_uidcache=${kolab_statedir}/graveyard-uidcache.db
+ graveyard_tscache=${kolab_statedir}/graveyard-tscache.db
+backupdir=${localstatedir}/backups/kolab
+
Modified: kolabconf/branches/2.2/debian/changelog
===================================================================
--- kolabconf/branches/2.2/debian/changelog 2008-03-17 18:54:58 UTC (rev 769)
+++ kolabconf/branches/2.2/debian/changelog 2008-03-17 18:55:29 UTC (rev 770)
@@ -1,3 +1,10 @@
+kolabconf (2.2~rc2+20080314-1) UNRELEASED; urgency=low
+
+ * New upstream version: 2.2rc2
+ * Removed 80-kolab-syslog-facility.dpatch: applied upstream
+
+ -- Mathieu Parent <math.parent at gmail.com> Mon, 17 Mar 2008 19:11:53 +0100
+
kolabconf (2.2~rc1+20080204-1) UNRELEASED; urgency=low
* kolabconf sorted out of kolabd
Modified: kolabconf/branches/2.2/debian/patches/00list
===================================================================
--- kolabconf/branches/2.2/debian/patches/00list 2008-03-17 18:54:58 UTC (rev 769)
+++ kolabconf/branches/2.2/debian/patches/00list 2008-03-17 18:55:29 UTC (rev 770)
@@ -1,5 +1,4 @@
10-kolabconf-perl-path
30-invoke-rc
50-postfix-hashes
-80-kolab-syslog-facility
85-slapd-syncrepl-24
Deleted: kolabconf/branches/2.2/debian/patches/80-kolab-syslog-facility.dpatch
===================================================================
--- kolabconf/branches/2.2/debian/patches/80-kolab-syslog-facility.dpatch 2008-03-17 18:54:58 UTC (rev 769)
+++ kolabconf/branches/2.2/debian/patches/80-kolab-syslog-facility.dpatch 2008-03-17 18:55:29 UTC (rev 770)
@@ -1,19 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 80-kolab-syslog-facility.dpatch by Marc Brockschmidt <marc.brockschmidt at credativ.de>
-##
-## DP: Make the used syslog facility configureable
-
- at DPATCH@
-diff -Nwru kolabd-1.9.4dfsg/kolabconf kolabd-1.9.4dfsg.patched/kolabconf
---- kolabd-1.9.4dfsg/bin/kolabconf.in 2005-04-28 02:16:59.000000000 +0200
-+++ kolabd-1.9.4dfsg.patched/bin/kolabconf.in 2006-05-26 15:32:13.000000000 +0200
-@@ -37,7 +37,7 @@
- use Kolab::LDAP;
- use vars qw($opt_d $opt_n $opt_h);
-
--openlog('kolabconf', 'cons, pid', 'user');
-+openlog('kolabconf', 'cons, pid', ($Kolab::config{'syslog_facility'} || 'user'));
-
- getopts('dnh');
- if ($opt_h) {
-
Modified: kolabd/branches/2.2/debian/changelog
===================================================================
--- kolabd/branches/2.2/debian/changelog 2008-03-17 18:54:58 UTC (rev 769)
+++ kolabd/branches/2.2/debian/changelog 2008-03-17 18:55:29 UTC (rev 770)
@@ -1,3 +1,11 @@
+kolabd (2.1.99+20080314.dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream version: 2.2rc2
+ * updated common/dist_conf.dpatch
+ * simplify 80-kolab-syslog-facility.dpatch: merged upstream
+
+ -- Mathieu Parent <math.parent at gmail.com> Mon, 17 Mar 2008 19:13:51 +0100
+
kolabd (2.1.99+20080204.dfsg-1) UNRELEASED; urgency=low
* New upstream version
Modified: kolabd/branches/2.2/debian/patches/80-kolab-syslog-facility.dpatch
===================================================================
--- kolabd/branches/2.2/debian/patches/80-kolab-syslog-facility.dpatch 2008-03-17 18:54:58 UTC (rev 769)
+++ kolabd/branches/2.2/debian/patches/80-kolab-syslog-facility.dpatch 2008-03-17 18:55:29 UTC (rev 770)
@@ -1,26 +1,15 @@
#!/bin/sh /usr/share/dpatch/dpatch-run
## 80-kolab-syslog-facility.dpatch by Marc Brockschmidt <marc.brockschmidt at credativ.de>
##
-## DP: Make the used syslog facility configureable
+## DP: Use syslog
@DPATCH@
-diff -Nwru kolabd-1.9.4dfsg/kolab.conf kolabd-1.9.4dfsg.patched/kolab.conf
---- kolabd-1.9.4dfsg/kolab.conf 2004-11-23 21:26:47.000000000 +0100
-+++ kolabd-1.9.4dfsg.patched/kolab.conf 2006-05-26 15:21:52.000000000 +0200
+diff -Nwru kolabd-1.9.4dfsg/kolab.globals.in kolabd-1.9.4dfsg.patched/kolab.globals.in
+--- kolabd-1.9.4dfsg/kolab.globals.in 2004-11-23 21:26:47.000000000 +0100
++++ kolabd-1.9.4dfsg.patched/kolab.globals.in 2006-05-26 15:21:52.000000000 +0200
@@ -10,3 +10,4 @@
- php_pw : @@@nobody_pw@@@
- slurpd_addr : 127.0.0.1
- slurpd_port : 9999
+ bind_addr : 0.0.0.0
+ calendar_id : calendar
+ syslog_facility : user
+syslog_facility : local5
-diff -Nwru kolabd-1.9.4dfsg/kolabd kolabd-1.9.4dfsg.patched/kolabd
---- kolabd-1.9.4dfsg/kolabd.in 2004-12-22 14:50:03.000000000 +0100
-+++ kolabd-1.9.4dfsg.patched/kolabd.in 2006-05-26 15:31:56.000000000 +0200
-@@ -49,7 +49,7 @@
- use Kolab::LDAP::Backend;
- use vars qw(%pids);
-
--openlog('kolabd', 'cons, pid', 'user');
-+openlog('kolabd', 'cons, pid', ($Kolab::config{'syslog_facility'} || 'user'));
-
- my $prefix = $Kolab::config{'prefix'};
- my $pidfile = IO::File->new("$prefix/var/kolab/kolab.pid", 'w+')
+
Modified: kolabd/branches/2.2/debian/patches/common/dist_conf.dpatch
===================================================================
--- kolabd/branches/2.2/debian/patches/common/dist_conf.dpatch 2008-03-17 18:54:58 UTC (rev 769)
+++ kolabd/branches/2.2/debian/patches/common/dist_conf.dpatch 2008-03-17 18:55:29 UTC (rev 770)
@@ -4,9 +4,9 @@
## DP: Adjusts some paths
@DPATCH@
-diff -urNad kolabd-2.1.99+20080204.dfsg~/dist_conf/debian kolabd-2.1.99+20080204.dfsg/dist_conf/debian
---- kolabd-2.1.99+20080204.dfsg~/dist_conf/debian 2008-03-14 21:02:36.000000000 +0100
-+++ kolabd-2.1.99+20080204.dfsg/dist_conf/debian 2008-03-14 21:03:14.000000000 +0100
+diff -urNad kolabd-2.1.99+20080314.dfsg~/dist_conf/debian kolabd-2.1.99+20080314.dfsg/dist_conf/debian
+--- kolabd-2.1.99+20080314.dfsg~/dist_conf/debian 2008-02-26 14:58:04.000000000 +0100
++++ kolabd-2.1.99+20080314.dfsg/dist_conf/debian 2008-03-17 19:27:44.000000000 +0100
@@ -1,14 +1,15 @@
-kolab_usr=root
-kolab_grp=root
@@ -53,7 +53,7 @@
clamav_confdir=${sysconfdir}/clamav
clamav_socket=${localstatedir}/clamav/clamd.sock
-@@ -53,42 +54,45 @@
+@@ -53,26 +54,29 @@
emailserver_socket=${libdir}/postfix/lmtp
emailserver_localstatedir=${localstatedir}/spool/postfix
emailserver_logfile=${localstatedir}/log/mail.log
@@ -85,9 +85,12 @@
kolab_pidfile=${sysrundir}/kolab.pid
kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
-kolab_scriptsdir=$(sysconfdir)/kolab
-+kolab_scriptsdir=${sbindir}
++kolab_scriptsdir=$(sbindir)
kolab_php_smarty_prefix=smarty/libs
+ # Kolab web user interface
+@@ -80,18 +84,18 @@
+
ldapserver_statedir=${localstatedir}/lib/ldap
ldapserver_dir=${localstatedir}/lib/ldap
-ldapserver_replogfile=${localstatedir}/log/ldap-replicalog
@@ -113,7 +116,7 @@
webserver_cgidir=${webserver_document_root}/cgi-bin
webserver_sessions=${localstatedir}/cache/kolab/httpd_sessions
webserver_logdir=${localstatedir}/log/apache2
-@@ -102,31 +106,43 @@
+@@ -105,31 +109,43 @@
webserver_mime_typesfile=${sysconfdir}/apache2/mime.types
webserver_sslscache=${sysrundir}/ssl_scache
webserver_sslmutex=${sysrundir}/ssl_mutex
@@ -159,8 +162,8 @@
+freebusy_usr=root
+freebusy_grp=www-data
- graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db
- graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db
+ graveyard_uidcache=${kolab_statedir}/graveyard-uidcache.db
+ graveyard_tscache=${kolab_statedir}/graveyard-tscache.db
+backupdir=${localstatedir}/backups/kolab
+
Modified: libkolab-perl/branches/2.2/debian/changelog
===================================================================
--- libkolab-perl/branches/2.2/debian/changelog 2008-03-17 18:54:58 UTC (rev 769)
+++ libkolab-perl/branches/2.2/debian/changelog 2008-03-17 18:55:29 UTC (rev 770)
@@ -1,3 +1,9 @@
+libkolab-perl (5.8.7-20080314-1) UNRELEASED; urgency=low
+
+ * New upstream version: 2.2rc2
+
+ -- Mathieu Parent <math.parent at gmail.com> Mon, 17 Mar 2008 19:10:37 +0100
+
libkolab-perl (5.8.7-20080204-1) UNRELEASED; urgency=low
* New upstream version
Modified: php-kolab/branches/2.2/debian/changelog
===================================================================
--- php-kolab/branches/2.2/debian/changelog 2008-03-17 18:54:58 UTC (rev 769)
+++ php-kolab/branches/2.2/debian/changelog 2008-03-17 18:55:29 UTC (rev 770)
@@ -1,3 +1,9 @@
+php-kolab (2.2~rc2+20080314-1) UNRELEASED; urgency=low
+
+ * New upstream version: 2.2rc2
+
+ -- Mathieu Parent <math.parent at gmail.com> Mon, 17 Mar 2008 19:13:04 +0100
+
php-kolab (2.2~rc1+20080204-1) UNRELEASED; urgency=low
* Initial release, reorganisation of kolab-resources-handler
More information about the pkg-kolab-devel
mailing list