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

[petere at alioth.debian.org]

Author: petere
Date: 2007-08-06 12:59:34 +0000 (Mon, 06 Aug 2007)
New Revision: 676

Removed:
   kolab-resource-handlers/trunk/debian/patches/80-freebusycache.class.php-path.dpatch
Modified:
   kolab-resource-handlers/trunk/debian/changelog
   kolab-resource-handlers/trunk/debian/patches/00list
Log:
80-freebusycache.class.php-path.dpatch obsoleted because the path is
now configurable in freebusy.conf


Modified: kolab-resource-handlers/trunk/debian/changelog
===================================================================
--- kolab-resource-handlers/trunk/debian/changelog	2007-08-06 12:43:43 UTC (rev 675)
+++ kolab-resource-handlers/trunk/debian/changelog	2007-08-06 12:59:34 UTC (rev 676)
@@ -2,6 +2,7 @@
 
   * New upstream release
     - Obsoleted patches: 10-resmgr.conf.dpatch,
+      80-freebusycache.class.php-path.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-06 12:43:43 UTC (rev 675)
+++ kolab-resource-handlers/trunk/debian/patches/00list	2007-08-06 12:59:34 UTC (rev 676)
@@ -5,4 +5,3 @@
 #50-kolabfilter.php.dpatch
 #60-olhacks.php.dpatch
 #70-IMAP.php.dpatch
-#80-freebusycache.class.php-path.dpatch

Deleted: kolab-resource-handlers/trunk/debian/patches/80-freebusycache.class.php-path.dpatch
===================================================================
--- kolab-resource-handlers/trunk/debian/patches/80-freebusycache.class.php-path.dpatch	2007-08-06 12:43:43 UTC (rev 675)
+++ kolab-resource-handlers/trunk/debian/patches/80-freebusycache.class.php-path.dpatch	2007-08-06 12:59:34 UTC (rev 676)
@@ -1,54 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 80-freebusycache.class.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/freebusycache.class.php.orig	2006-02-01 15:18:38.000000000 +0100
-+++ kolab-resource-handlers-0.3.9/kolab-resource-handlers/freebusy/freebusycache.class.php	2006-02-01 15:26:12.000000000 +0100
-@@ -40,7 +40,7 @@
-       // false data means delete the pfb
-       unlink($fbfilename);
-       $oldacl = $this->loadACL( $filename );
--      $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', 'gdbm' );
-+      $db = dba_open( '/var/lib/kolab/freebusy-cache/pfbcache.db', 'cd', 'db4' );
-       if( $db === false ) return false;
-       foreach( $oldacl as $ac ) {
- 	  if( dba_exists( $ac['USER'], $db ) ) {
-@@ -87,9 +87,9 @@
-       default: $perm = 'a';
-       }
- 
--      $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', 'gdbm' );
-+      $db = dba_open( '/var/lib/kolab/freebusy-cache/pfbcache.db', 'cd', 'db4' );
-       if( $db === false ) {
--	myLog('Unable to open freebusy cache db '.$this->basedir.'/pfbcache.db',
-+	myLog('Unable to open freebusy cache db /var/lib/kolab/freebusy-cache/pfbcache.db',
- 	      RM_LOG_ERROR );
- 	return false;
-       }
-@@ -139,7 +139,7 @@
-     $fbfilename = $this->mkfbfilename($filename);
-     unlink($fbfilename);
-     unlink($this->mkaclfilename($filename));    
--    $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', 'gdbm' );
-+    $db = dba_open( '/var/lib/kolab/freebusy-cache/pfbcache.db', 'cd', 'db4' );
-     if( $db === false ) return false;
-     for( $uid = dba_firstkey($db); $uid !== false; $uid = dba_nextkey($db)) {
-       $lst = dba_fetch( $uid, $db );
-@@ -153,7 +153,7 @@
- 
-   function findAll( $uid, $groups ) {
-     $lst = array();
--    $db = dba_open( $this->basedir.'/pfbcache.db', 'rd', 'gdbm' );
-+    $db = dba_open( '/var/lib/kolab/freebusy-cache/pfbcache.db', 'rd', 'db4' );
-     if( $db === false ) return false;
-     $uids = $groups;
-     for( $i = 0; $i < count($uids); $i++ ) $uids[$i] = 'group:'.$uids[$i];
-@@ -314,4 +314,4 @@
-   var $error;
- };
- 
--?>
-\ Kein Zeilenumbruch am Dateiende.
-+?>