[pkg-kolab] r674 - in kolab-resource-handlers/trunk/debian: . patches

petere at alioth.debian.org petere at alioth.debian.org
Fri Aug 3 16:04:22 UTC 2007


Author: petere
Date: 2007-08-03 16:04:22 +0000 (Fri, 03 Aug 2007)
New Revision: 674

Removed:
   kolab-resource-handlers/trunk/debian/patches/100-pfb.php-path.dpatch
   kolab-resource-handlers/trunk/debian/patches/90-freebusy.php-path.dpatch
Modified:
   kolab-resource-handlers/trunk/debian/changelog
   kolab-resource-handlers/trunk/debian/patches/00list
   kolab-resource-handlers/trunk/debian/patches/01-dist_conf.dpatch
Log:
Obsoleted patches 90-freebusy.php-path.dpatch and 100-pfb.php-path.dpatch,
replaced by equivalent dist_conf patch.


Modified: kolab-resource-handlers/trunk/debian/changelog
===================================================================
--- kolab-resource-handlers/trunk/debian/changelog	2007-08-02 15:25:14 UTC (rev 673)
+++ kolab-resource-handlers/trunk/debian/changelog	2007-08-03 16:04:22 UTC (rev 674)
@@ -1,7 +1,8 @@
 kolab-resource-handlers (2.1.0-20070510-1) unstable; urgency=low
 
   * New upstream release
-    - Obsoleted patches: 10-resmgr.conf.dpatch
+    - Obsoleted patches: 10-resmgr.conf.dpatch,
+      90-freebusy.php-path.dpatch, 100-pfb.php-path.dpatch
 
  -- Peter Eisentraut <petere at debian.org>  Wed, 01 Aug 2007 13:38:31 +0200
 

Modified: kolab-resource-handlers/trunk/debian/patches/00list
===================================================================
--- kolab-resource-handlers/trunk/debian/patches/00list	2007-08-02 15:25:14 UTC (rev 673)
+++ kolab-resource-handlers/trunk/debian/patches/00list	2007-08-03 16:04:22 UTC (rev 674)
@@ -6,5 +6,3 @@
 #60-olhacks.php.dpatch
 #70-IMAP.php.dpatch
 #80-freebusycache.class.php-path.dpatch
-#90-freebusy.php-path.dpatch
-#100-pfb.php-path.dpatch

Modified: kolab-resource-handlers/trunk/debian/patches/01-dist_conf.dpatch
===================================================================
--- kolab-resource-handlers/trunk/debian/patches/01-dist_conf.dpatch	2007-08-02 15:25:14 UTC (rev 673)
+++ kolab-resource-handlers/trunk/debian/patches/01-dist_conf.dpatch	2007-08-03 16:04:22 UTC (rev 674)
@@ -4,9 +4,9 @@
 ## DP: Adjusts some paths
 
 @DPATCH@
-diff -urNad kolab-resource-handlers-2.1.0-20070510~/dist_conf/debian kolab-resource-handlers-2.1.0-20070510/dist_conf/debian
---- kolab-resource-handlers-2.1.0-20070510~/dist_conf/debian	2007-05-10 12:28:48.000000000 +0200
-+++ kolab-resource-handlers-2.1.0-20070510/dist_conf/debian	2007-08-01 14:24:19.000000000 +0200
+diff -urNad kolab-resource-handlers-2.1.0-20070510.obsolete.0.131198541102098~/dist_conf/debian kolab-resource-handlers-2.1.0-20070510.obsolete.0.131198541102098/dist_conf/debian
+--- kolab-resource-handlers-2.1.0-20070510.obsolete.0.131198541102098~/dist_conf/debian	2007-05-10 12:28:48.000000000 +0200
++++ kolab-resource-handlers-2.1.0-20070510.obsolete.0.131198541102098/dist_conf/debian	2007-08-03 17:58:06.000000000 +0200
 @@ -98,7 +98,7 @@
  ldapserver_grp=ldap
  ldapserver_rusr=ldap
@@ -25,12 +25,22 @@
  webserver_musr=kolab
  webserver_usr=wwwrun
  webserver_grp=www
-@@ -127,7 +127,7 @@
+@@ -126,15 +126,15 @@
+ sasl_logfile=${localstatedir}/log/saslauthd.log
  
  resmgr_logfile=${localstatedir}/log/resmgr.log
- resmgr_confdir=${sysconfdir}/resmgr
+-resmgr_confdir=${sysconfdir}/resmgr
 -resmgr_filterdir=${localstatedir}/resmgr/filter
++resmgr_confdir=${sysconfdir}/kolab
 +resmgr_filterdir=${localstatedir}/lib/kolab/resmgr/filter
  resmgr_scriptsdir=${resmgr_confdir}
  resmgr_usr=kolab
  resmgr_grp=kolab-n
+ 
+ fbview_logfile=${localstatedir}/resmgr/fbview.log
+ freebusy_logfile=${localstatedir}/resmgr/freebusy.log
+-freebusy_cachedir=${webserver_document_root}${webserver_web_prefix}/freebusy/cache
++freebusy_cachedir=${localstatedir}/lib/kolab/freebusy-cache
+ 
+ graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db
+ graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db

Deleted: kolab-resource-handlers/trunk/debian/patches/100-pfb.php-path.dpatch
===================================================================
--- kolab-resource-handlers/trunk/debian/patches/100-pfb.php-path.dpatch	2007-08-02 15:25:14 UTC (rev 673)
+++ kolab-resource-handlers/trunk/debian/patches/100-pfb.php-path.dpatch	2007-08-03 16:04:22 UTC (rev 674)
@@ -1,30 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 100-pfb.php-path.dpatch by Noèl Köthe <noel at debian.org>
-##
-## DP: path changes
-
- at DPATCH@
---- pfb.php.orig	2006-02-09 16:38:27.000000000 +0100
-+++ kolab-resource-handlers-0.3.9/kolab-resource-handlers/freebusy/pfb.php	2006-02-09 16:45:46.000000000 +0100
-@@ -34,7 +34,7 @@
- require_once('freebusy/freebusycache.class.php');
- require_once('freebusy/misc.php');
- 
--require_once('@l_prefix@/etc/resmgr/freebusy.conf');
-+require_once('/etc/kolab/freebusy.conf');
- 
- logInit('pfb');
- 
-@@ -101,10 +101,8 @@
-   exit;
- }
- 
--$cache =& new FreeBusyCache( $params['kolab_prefix'].'/var/kolab/www/freebusy/cache',
--			     false );
--$xcache =& new FreeBusyCache( $params['kolab_prefix'].'/var/kolab/www/freebusy/cache',
--			     true );
-+$cache =& new FreeBusyCache( '/var/lib/kolab/freebusy-cache', false );
-+$xcache =& new FreeBusyCache( '/var/lib/kolab/freebusy-cache', true );
- 
- if( $req_cache ) {
-   $acl = false;

Deleted: kolab-resource-handlers/trunk/debian/patches/90-freebusy.php-path.dpatch
===================================================================
--- kolab-resource-handlers/trunk/debian/patches/90-freebusy.php-path.dpatch	2007-08-02 15:25:14 UTC (rev 673)
+++ kolab-resource-handlers/trunk/debian/patches/90-freebusy.php-path.dpatch	2007-08-03 16:04:22 UTC (rev 674)
@@ -1,26 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 90-freebusy.php-path.dpatch by Noèl Köthe <noel at debian.org>
-##
-## DP: path changes
-
- at DPATCH@
---- kolab-resource-handlers-0.3.9/kolab-resource-handlers/freebusy/freebusy.php.orig	2006-02-01 15:28:00.000000000 +0100
-+++ kolab-resource-handlers-0.3.9/kolab-resource-handlers/freebusy/freebusy.php	2006-02-01 15:45:15.000000000 +0100
-@@ -23,7 +23,7 @@
- require_once('freebusy/freebusyldap.class.php');
- require_once('freebusy/misc.php');
- 
--require_once('@l_prefix@/etc/resmgr/freebusy.conf');
-+require_once('/etc/kolab/freebusy.conf');
- 
- logInit( 'freebusy' );
- 
-@@ -69,7 +69,7 @@
- 
- 
- $user = strtolower($user);
--$cache =& new FreeBusyCache( $params['kolab_prefix'].'/var/kolab/www/freebusy/cache', $req_extended );
-+$cache =& new FreeBusyCache( $params['kolab_prefix'].'/var/lib/kolab/freebusy-cache', $req_extended );
- $collector =& new FreeBusyCollector( $user );
- 
- $groups = $ldap->distlists( $ldap->dn( $user ) );




More information about the pkg-kolab-devel mailing list