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

petere at alioth.debian.org petere at alioth.debian.org
Sun Jan 6 12:50:40 UTC 2008


Author: petere
Date: 2008-01-06 12:50:40 +0000 (Sun, 06 Jan 2008)
New Revision: 713

Added:
   kolab-resource-handlers/trunk/debian/patches/20-horde-path.dpatch
Modified:
   kolab-resource-handlers/trunk/debian/changelog
   kolab-resource-handlers/trunk/debian/patches/00list
Log:
* Fixed include path for Horde in pfb.php (closes: #455072)

Modified: kolab-resource-handlers/trunk/debian/changelog
===================================================================
--- kolab-resource-handlers/trunk/debian/changelog	2007-12-28 15:44:26 UTC (rev 712)
+++ kolab-resource-handlers/trunk/debian/changelog	2008-01-06 12:50:40 UTC (rev 713)
@@ -5,6 +5,7 @@
   * Moved /usr/share/kolab-resource-handlers/ to /usr/share/kolab/ for better
     consistency with upstream
   * Updated standards version
+  * Fixed include path for Horde in pfb.php (closes: #455072)
 
  -- Peter Eisentraut <petere at debian.org>  Thu, 13 Dec 2007 07:50:48 +0100
 

Modified: kolab-resource-handlers/trunk/debian/patches/00list
===================================================================
--- kolab-resource-handlers/trunk/debian/patches/00list	2007-12-28 15:44:26 UTC (rev 712)
+++ kolab-resource-handlers/trunk/debian/patches/00list	2008-01-06 12:50:40 UTC (rev 713)
@@ -1,2 +1,3 @@
 common/dist_conf
 10-resmgr.conf
+20-horde-path

Added: kolab-resource-handlers/trunk/debian/patches/20-horde-path.dpatch
===================================================================
--- kolab-resource-handlers/trunk/debian/patches/20-horde-path.dpatch	                        (rev 0)
+++ kolab-resource-handlers/trunk/debian/patches/20-horde-path.dpatch	2008-01-06 12:50:40 UTC (rev 713)
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20-horde-path.dpatch by Peter Eisentraut <petere at debian.org>
+##
+## DP: Include path does not include Horde (bug #455072)
+
+ at DPATCH@
+diff -urNad kolab-resource-handlers-2.1.0-20070510~/freebusy/pfb.php.in kolab-resource-handlers-2.1.0-20070510/freebusy/pfb.php.in
+--- kolab-resource-handlers-2.1.0-20070510~/freebusy/pfb.php.in	2006-11-22 18:05:18.000000000 +0100
++++ kolab-resource-handlers-2.1.0-20070510/freebusy/pfb.php.in	2008-01-06 12:55:29.000000000 +0100
+@@ -50,6 +50,7 @@
+ $req_folder   = isset($_REQUEST['folder'])?$_REQUEST['folder']:false;
+ $req_extended = isset($_REQUEST['extended'])?(bool)$_REQUEST['extended']:false;
+ // convert character encoding (stores utf7 folder names also on disc)
++require_once '/usr/share/horde3/lib/core.php';
+ require_once "Horde/Util.php";
+ require_once "Horde/String.php";
+ $req_folder = String::convertCharset($req_folder, "UTF-8", "UTF7-IMAP");


Property changes on: kolab-resource-handlers/trunk/debian/patches/20-horde-path.dpatch
___________________________________________________________________
Name: svn:executable
   + *




More information about the pkg-kolab-devel mailing list