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

[petere at alioth.debian.org]

Author: petere
Date: 2007-08-08 15:51:51 +0000 (Wed, 08 Aug 2007)
New Revision: 682

Removed:
   kolab-resource-handlers/trunk/debian/patches/50-kolabfilter.php.dpatch
Modified:
   kolab-resource-handlers/trunk/debian/changelog
   kolab-resource-handlers/trunk/debian/patches/00list
Log:
50-kolabfilter.php.dpatch is obsolete


Modified: kolab-resource-handlers/trunk/debian/changelog
===================================================================
--- kolab-resource-handlers/trunk/debian/changelog	2007-08-08 15:39:00 UTC (rev 681)
+++ kolab-resource-handlers/trunk/debian/changelog	2007-08-08 15:51:51 UTC (rev 682)
@@ -3,7 +3,7 @@
   * New upstream release
     - Updated patches
     - Obsoleted patches: 30-kolabmailboxfilter.php.dpatch,
-      40-resmgr.php.dpatch, 60-olhacks.php.dpatch,
+      40-resmgr.php.dpatch, 50-kolabfilter.php.dpatch, 60-olhacks.php.dpatch,
       70-IMAP.php.dpatch, 80-freebusycache.class.php-path.dpatch,
       90-freebusy.php-path.dpatch, 100-pfb.php-path.dpatch
   * Now using upstream freebusy.conf

Modified: kolab-resource-handlers/trunk/debian/patches/00list
===================================================================
--- kolab-resource-handlers/trunk/debian/patches/00list	2007-08-08 15:39:00 UTC (rev 681)
+++ kolab-resource-handlers/trunk/debian/patches/00list	2007-08-08 15:51:51 UTC (rev 682)
@@ -1,4 +1,3 @@
 01-dist_conf
 10-resmgr.conf
 #20-kolabmailtransport.php.dpatch
-#50-kolabfilter.php.dpatch

Deleted: kolab-resource-handlers/trunk/debian/patches/50-kolabfilter.php.dpatch
===================================================================
--- kolab-resource-handlers/trunk/debian/patches/50-kolabfilter.php.dpatch	2007-08-08 15:39:00 UTC (rev 681)
+++ kolab-resource-handlers/trunk/debian/patches/50-kolabfilter.php.dpatch	2007-08-08 15:51:51 UTC (rev 682)
@@ -1,50 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 50-kolabfilter.php.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
-##
-## DP: Correct requires for kolabfilter
-
- at DPATCH@
---- kolab-resource-handlers-0.3.9/kolab-resource-handlers/resmgr/kolabfilter.php.orig	2006-01-05 11:44:23.000000000 +0100
-+++ kolab-resource-handlers-0.3.9/kolab-resource-handlers/resmgr/kolabfilter.php	2006-01-05 11:44:19.000000000 +0100
-@@ -1,4 +1,3 @@
--#!@l_prefix@/bin/php
- <?php
- /*
-  *  Copyright (c) 2004 Klaraelvdalens Datakonsult AB
-@@ -22,11 +21,11 @@
- /* 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:'.$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';
- 
- // Profiling code
- /*
-@@ -58,10 +57,10 @@
- 
- // 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 );
- 
-@@ -221,7 +220,7 @@
- 
- if( !$senderok ) {
-   if( $ical && $params['allow_outlook_ical_forward'] ) {
--    require_once('kolabfilter/olhacks.php');
-+    require_once('/usr/share/kolab-resource-handlers/php/olhacks.php');
-     $rc = olhacks_embedical( $fqhostname, $sender, $recipients, $from, $subject, $tmpfname );
-     if( PEAR::isError( $rc ) ) {
-       fwrite(STDOUT,"Filter failed: ".$rc->getMessage()."\n");