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

petere at alioth.debian.org petere at alioth.debian.org
Wed Aug 8 13:33:39 UTC 2007 

Author: petere
Date: 2007-08-08 13:33:38 +0000 (Wed, 08 Aug 2007)
New Revision: 680

Added:
   kolab-resource-handlers/trunk/debian/patches/10-resmgr.conf.dpatch
Removed:
   kolab-resource-handlers/trunk/debian/patches/40-resmgr.php.dpatch
   kolab-resource-handlers/trunk/debian/patches/60-olhacks.php.dpatch
Modified:
   kolab-resource-handlers/trunk/debian/changelog
   kolab-resource-handlers/trunk/debian/patches/00list
Log:
Sort out Horde installation paths


Modified: kolab-resource-handlers/trunk/debian/changelog
===================================================================
--- kolab-resource-handlers/trunk/debian/changelog	2007-08-08 13:32:14 UTC (rev 679)
+++ kolab-resource-handlers/trunk/debian/changelog	2007-08-08 13:33:38 UTC (rev 680)
@@ -1,8 +1,9 @@
 kolab-resource-handlers (2.1.0-20070510-1) unstable; urgency=low
 
   * New upstream release
-    - Obsoleted patches: 10-resmgr.conf.dpatch,
-      30-kolabmailboxfilter.php.dpatch,
+    - Updated patches
+    - Obsoleted patches: 30-kolabmailboxfilter.php.dpatch,
+      40-resmgr.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
 

Modified: kolab-resource-handlers/trunk/debian/patches/00list
===================================================================
--- kolab-resource-handlers/trunk/debian/patches/00list	2007-08-08 13:32:14 UTC (rev 679)
+++ kolab-resource-handlers/trunk/debian/patches/00list	2007-08-08 13:33:38 UTC (rev 680)
@@ -1,5 +1,4 @@
 01-dist_conf
+10-resmgr.conf
 #20-kolabmailtransport.php.dpatch
-#40-resmgr.php.dpatch
 #50-kolabfilter.php.dpatch
-#60-olhacks.php.dpatch

Added: kolab-resource-handlers/trunk/debian/patches/10-resmgr.conf.dpatch
===================================================================
--- kolab-resource-handlers/trunk/debian/patches/10-resmgr.conf.dpatch	                        (rev 0)
+++ kolab-resource-handlers/trunk/debian/patches/10-resmgr.conf.dpatch	2007-08-08 13:33:38 UTC (rev 680)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10-resmgr.conf.dpatch by Peter Eisentraut <petere at debian.org>
+##
+## DP: adjusts horde path
+
+ at DPATCH@
+diff -urNad kolab-resource-handlers-2.1.0-20070510~/resmgr/resmgr.conf.in kolab-resource-handlers-2.1.0-20070510/resmgr/resmgr.conf.in
+--- kolab-resource-handlers-2.1.0-20070510~/resmgr/resmgr.conf.in	2007-04-26 18:22:45.000000000 +0200
++++ kolab-resource-handlers-2.1.0-20070510/resmgr/resmgr.conf.in	2007-08-08 15:11:02.000000000 +0200
+@@ -2,7 +2,7 @@
+ // Example conf file for resmgr!
+ 
+ // What is the root directory of our Horde instance?
+- at define('HORDE_BASE', '@webserver_document_root@/fbview');
++ at define('HORDE_BASE', '/usr/share/horde3');
+ 
+ // What is the address of the Cyrus server where the calendar data is stored?
+ $params['server'] = 'localhost';


Property changes on: kolab-resource-handlers/trunk/debian/patches/10-resmgr.conf.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Deleted: kolab-resource-handlers/trunk/debian/patches/40-resmgr.php.dpatch
===================================================================
--- kolab-resource-handlers/trunk/debian/patches/40-resmgr.php.dpatch	2007-08-08 13:32:14 UTC (rev 679)
+++ kolab-resource-handlers/trunk/debian/patches/40-resmgr.php.dpatch	2007-08-08 13:33:38 UTC (rev 680)
@@ -1,47 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 40-resmgr.php.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
-##
-## DP: Correct requires and use horde files and function declaration
-## DP: from freebusy kolab under /usr/share/kolab-resource-handlers/php/*
-
- at DPATCH@
---- kolab-resource-handlers-0.3.9/kolab-resource-handlers/resmgr/resmgr.php.orig	2006-01-05 10:19:13.000000000 +0100
-+++ kolab-resource-handlers-0.3.9/kolab-resource-handlers/resmgr/resmgr.php	2006-01-05 10:59:09.000000000 +0100
-@@ -18,7 +18,7 @@
-  *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
-  */
- 
--require_once 'kolabfilter/misc.php';
-+require_once '/usr/share/kolab-resource-handlers/php/misc.php';
- 
- // What actions we can take when receiving an event request
- define('RM_ACT_ALWAYS_ACCEPT',              1);
-@@ -32,18 +32,18 @@
- define('RM_ITIP_ACCEPT',                    2);
- define('RM_ITIP_TENTATIVE',                 3);
- 
--require_once 'Net/IMAP.php';
--require_once HORDE_BASE . '/lib/core.php';
--require_once 'Horde/iCalendar.php';
--require_once 'Horde/NLS.php';
--require_once 'Horde/MIME.php';
--require_once 'Horde/MIME/Message.php';
--require_once 'Horde/MIME/Headers.php';
--require_once 'Horde/MIME/Part.php';
--require_once 'Horde/MIME/Structure.php';
-+require_once '/usr/share/php/Net/IMAP.php';
-+require_once '/usr/share/horde3/lib/core.php';
-+require_once '/usr/share/horde3/lib/Horde/iCalendar.php';
-+require_once '/usr/share/horde3/lib/Horde/NLS.php';
-+require_once '/usr/share/horde3/lib/Horde/MIME.php';
-+require_once '/usr/share/horde3/lib/Horde/MIME/Message.php';
-+require_once '/usr/share/horde3/lib/Horde/MIME/Headers.php';
-+require_once '/usr/share/horde3/lib/Horde/MIME/Part.php';
-+require_once '/usr/share/horde3/lib/Horde/MIME/Structure.php';
- //include_once 'Horde/Kolab.php';
--require_once 'Horde/Text.php';
-+require_once '/usr/share/horde3/lib/Horde/Text.php';
- require_once 'freebusy/recurrence.class.php';
- 
- // Globals
- $imap = NULL;

Deleted: kolab-resource-handlers/trunk/debian/patches/60-olhacks.php.dpatch
===================================================================
--- kolab-resource-handlers/trunk/debian/patches/60-olhacks.php.dpatch	2007-08-08 13:32:14 UTC (rev 679)
+++ kolab-resource-handlers/trunk/debian/patches/60-olhacks.php.dpatch	2007-08-08 13:33:38 UTC (rev 680)
@@ -1,33 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 60-olhacks.php.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
-##
-## DP: Correct requires for debian
-
- at DPATCH@
---- kolab-resource-handlers-0.3.9/kolab-resource-handlers/resmgr/olhacks.php.orig	2006-01-05 12:02:06.000000000 +0100
-+++ kolab-resource-handlers-0.3.9/kolab-resource-handlers/resmgr/olhacks.php	2006-01-05 12:07:19.000000000 +0100
-@@ -18,15 +18,15 @@
-  *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
-  */
- 
--require_once 'kolabfilter/misc.php';
--require_once HORDE_BASE . '/lib/core.php';
--require_once 'Horde/iCalendar.php';
--require_once 'Horde/NLS.php';
--require_once 'Horde/MIME.php';
--require_once 'Horde/MIME/Message.php';
--require_once 'Horde/MIME/Headers.php';
--require_once 'Horde/MIME/Part.php';
--require_once 'Horde/MIME/Structure.php';
-+require_once '/usr/share/kolab-resource-handlers/php/misc.php';
-+require_once HORDE_BASE . '/usr/share/horde3/lib/core.php';
-+require_once '/usr/share/horde3/lib/Horde/iCalendar.php';
-+require_once '/usr/share/horde3/lib/Horde/NLS.php';
-+require_once '/usr/share/horde3/lib/Horde/MIME.php';
-+require_once '/usr/share/horde3/lib/Horde/MIME/Message.php';
-+require_once '/usr/share/horde3/lib/Horde/MIME/Headers.php';
-+require_once '/usr/share/horde3/lib/Horde/MIME/Part.php';
-+require_once '/usr/share/horde3/lib/Horde/MIME/Structure.php';
- 
- $forwardtext = "This is an invitation forwarded by outlook and\n".
-   "was rectified by the Kolab server.\n".

More information about the pkg-kolab-devel mailing list