# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1410472503 -7200
# Node ID 44cffc18408211de6ad7625a3b2ad21f528b0165
# Parent  57e111c59ff551aaa303159c773cd4084c0201c7
Integrated upstream patches. Updated the logging patch.

diff -r 57e111c59ff5 -r 44cffc184082 debian/patches/composer.json.diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/patches/composer.json.diff	Thu Sep 11 23:55:03 2014 +0200
@@ -0,0 +1,12 @@
+--- a/composer.json
++++ b/composer.json
+@@ -19,5 +19,9 @@
+ 		"desarrolla2/cache":  "dev-master",
+ 		"sabre/vobject" : "2.0.*"
+ 	},
++	"require-dev": {
++		"kolab/Net_LDAP3": "dev-master",
++		"pear-pear/Net_LDAP2":">=2.0.12"
++	},
+ 	"minimum-stability": "dev"
+ }
diff -r 57e111c59ff5 -r 44cffc184082 debian/patches/config-log-path.diff
--- a/debian/patches/config-log-path.diff	Wed Sep 10 17:21:54 2014 +0200
+++ b/debian/patches/config-log-path.diff	Thu Sep 11 23:55:03 2014 +0200
@@ -1,10 +1,10 @@
 --- a/config/config.ini.sample
 +++ b/config/config.ini.sample
-@@ -27,7 +27,7 @@
- ;; Logging configuration
+@@ -3,7 +3,7 @@
+ ; Logging configuration
  [log]
  driver = file  ; supported drivers: file, syslog
--path = ./log
+-path = ./logs
 +path = /var/log/kolab-freebusy
  name = freebusy
  level = 300  ; (100 = Debug, 200 = Info, 300 = Warn, 400 = Error, 500 = Critical)
diff -r 57e111c59ff5 -r 44cffc184082 debian/patches/index-search-path.diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/patches/index-search-path.diff	Thu Sep 11 23:55:03 2014 +0200
@@ -0,0 +1,10 @@
+--- a/public_html/index.php
++++ b/public_html/index.php
+@@ -34,6 +34,7 @@
+ // use composer's autoloader for both dependencies and local lib
+ $loader = require_once(KOLAB_FREEBUSY_ROOT . '/vendor/autoload.php');
+ $loader->set('Kolab', array(KOLAB_FREEBUSY_ROOT . '/lib'));  // register Kolab namespace
++$loader->setUseIncludePath(true);  // enable searching the include_path (e.g. for PEAR packages)
+ 
+ use Kolab\Config;
+ use Kolab\FreeBusy\Utils;
diff -r 57e111c59ff5 -r 44cffc184082 debian/patches/series
--- a/debian/patches/series	Wed Sep 10 17:21:54 2014 +0200
+++ b/debian/patches/series	Thu Sep 11 23:55:03 2014 +0200
@@ -1,2 +1,4 @@
 index-config-path.diff
 config-log-path.diff
+composer.json.diff
+index-search-path.diff