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

[petere at alioth.debian.org]

Author: petere
Date: 2007-08-07 12:56:11 +0000 (Tue, 07 Aug 2007)
New Revision: 678

Removed:
   kolab-resource-handlers/trunk/debian/patches/30-kolabmailboxfilter.php.dpatch
Modified:
   kolab-resource-handlers/trunk/debian/changelog
   kolab-resource-handlers/trunk/debian/patches/00list
Log:
Removed obsolete 30-kolabmailboxfilter.php.dpatch


Modified: kolab-resource-handlers/trunk/debian/changelog
===================================================================
--- kolab-resource-handlers/trunk/debian/changelog	2007-08-06 13:10:23 UTC (rev 677)
+++ kolab-resource-handlers/trunk/debian/changelog	2007-08-07 12:56:11 UTC (rev 678)
@@ -2,6 +2,7 @@
 
   * New upstream release
     - Obsoleted patches: 10-resmgr.conf.dpatch,
+      30-kolabmailboxfilter.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/00list
===================================================================
--- kolab-resource-handlers/trunk/debian/patches/00list	2007-08-06 13:10:23 UTC (rev 677)
+++ kolab-resource-handlers/trunk/debian/patches/00list	2007-08-07 12:56:11 UTC (rev 678)
@@ -1,6 +1,5 @@
 01-dist_conf
 #20-kolabmailtransport.php.dpatch
-#30-kolabmailboxfilter.php.dpatch
 #40-resmgr.php.dpatch
 #50-kolabfilter.php.dpatch
 #60-olhacks.php.dpatch

Deleted: kolab-resource-handlers/trunk/debian/patches/30-kolabmailboxfilter.php.dpatch
===================================================================
--- kolab-resource-handlers/trunk/debian/patches/30-kolabmailboxfilter.php.dpatch	2007-08-06 13:10:23 UTC (rev 677)
+++ kolab-resource-handlers/trunk/debian/patches/30-kolabmailboxfilter.php.dpatch	2007-08-07 12:56:11 UTC (rev 678)
@@ -1,46 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 30-kolabmailboxfilter.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
-##
-## DP: correct pathes
-
- at DPATCH@
---- kolab-resource-handlers-0.3.9/kolab-resource-handlers/resmgr/kolabmailboxfilter.php.orig	2006-01-04 16:00:39.000000000 +0100
-+++ kolab-resource-handlers-0.3.9/kolab-resource-handlers/resmgr/kolabmailboxfilter.php	2006-01-04 16:40:18.000000000 +0100
-@@ -1,4 +1,3 @@
--#!@l_prefix@/bin/php
- <?php
- /*
-  *  Copyright (c) 2004,2005 Klaraelvdalens Datakonsult AB
-@@ -22,18 +21,18 @@
- /* Fix include_path to pick up our modified Horde classes */
- $include_path = ini_get('include_path');
- ini_set( 'include_path', 
--	 '.:@l_prefix@/var/kolab/php:@l_prefix@/var/kolab/php/pear:'.$include_path);
-+	 '.:/usr/share/kolab-resource-handlers/php:/usr/share/kolab-resource-handlers/php/pear:'.$include_path);
- 
- require_once 'PEAR.php';
--require_once 'kolabfilter/misc.php';
--require_once 'kolabfilter/kolabmailtransport.php';
-+require_once '/usr/share/kolab-resource-handlers/php/misc.php';
-+require_once '/usr/share/kolab-resource-handlers/kolabmailtransport.php';
- 
- // Load our configuration file
- $params = array();
--require_once '@l_prefix@/etc/resmgr/resmgr.conf';
-+require_once '/etc/kolab/resmgr.conf';
- init();
- 
--define( 'TMPDIR', '@l_prefix@/var/resmgr/filter' );
-+define( 'TMPDIR', '/var/lib/kolab/resmgr/filter' );
- define( 'EX_TEMPFAIL', 75 );
- define( 'EX_UNAVAILABLE', 69 );
- 
-@@ -97,7 +96,7 @@
- }
- fclose($tmpf);
- if( $ical ) {
--  require_once 'kolabfilter/resmgr.php';
-+  require_once '/usr/share/kolab-resource-handlers/php/resmgr.php';
-   $newrecips = array();
-   foreach( $recipients as $recip ) {
-     myLog("Calling resmgr_filter( $sender, $recip, $tmpfname )", RM_LOG_DEBUG);