# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1410361882 -7200
# Node ID faba023cc790ea681a12e3ae6231c3b66bad7155
# Parent  4bbc66ecef8df903cbd6490110f3be917ecf308f# Parent  0f3291e2c747dbecb75ee5f2780dbca40ed7ca6e
Merged upstream changes.

diff -r 4bbc66ecef8d -r faba023cc790 debian/changelog
--- a/debian/changelog	Sat Aug 16 18:06:13 2014 +0200
+++ b/debian/changelog	Wed Sep 10 17:11:22 2014 +0200
@@ -1,3 +1,15 @@
+kolab-freebusy (1.0.5-0~kolab2) unstable; urgency=low
+ 
+  * applied patch to fix usage of Net_LDAP3
+ 
+ -- Daniel Hoffend <dh@dotlan.net>  Wed, 20 Aug 2014 16:54:02 +0100
+
+kolab-freebusy (1.0.5-0~kolab1) unstable; urgency=low
+ 
+  * Release 1.0.5
+ 
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 14 Aug 2014 12:00:22 +0200
+
 kolab-freebusy (1.0.4-0~kolab1) unstable; urgency=low
  
   * New upstream version enabling real-time Free/Busy data directly from IMAP through
diff -r 4bbc66ecef8d -r faba023cc790 debian/conffiles
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/conffiles	Wed Sep 10 17:11:22 2014 +0200
@@ -0,0 +1,1 @@
+etc/kolab-freebusy/config.ini
diff -r 4bbc66ecef8d -r faba023cc790 debian/control
--- a/debian/control	Sat Aug 16 18:06:13 2014 +0200
+++ b/debian/control	Wed Sep 10 17:11:22 2014 +0200
@@ -11,7 +11,9 @@
 Package: kolab-freebusy
 Architecture: all
 Depends: ${misc:Depends},
-        kolab-utils, kolab-conf
+        php-net-ldap3,
+        roundcubemail,
+        roundcubemail-plugins-kolab
 Description: Free/Busy for Kolab Groupware
  The Kolab Groupware Free/Busy web application offers simple
  and extended Free/Busy information for Kolab Groupware users,
diff -r 4bbc66ecef8d -r faba023cc790 debian/dirs
--- a/debian/dirs	Sat Aug 16 18:06:13 2014 +0200
+++ b/debian/dirs	Wed Sep 10 17:11:22 2014 +0200
@@ -1,3 +1,4 @@
 etc/kolab-freebusy
 usr/share/kolab-freebusy
+var/cache/kolab-freebusy
 var/log/kolab-freebusy
diff -r 4bbc66ecef8d -r faba023cc790 debian/links
--- a/debian/links	Sat Aug 16 18:06:13 2014 +0200
+++ b/debian/links	Wed Sep 10 17:11:22 2014 +0200
@@ -1,2 +1,6 @@
-etc/kolab-freebusy /usr/share/kolab-freebusy/config
+etc/kolab-freebusy/config.ini /usr/share/kolab-freebusy/config/config.ini
+etc/roundcubemail/config.inc.php /usr/share/kolab-freebusy/config/config.inc.php
+etc/roundcubemail/defaults.inc.php /usr/share/kolab-freebusy/config/defaults.inc.php
+usr/share/roundcubemail/plugins /usr/share/kolab-freebusy/lib/plugins
+usr/share/roundcubemail/program/lib/Roundcube /usr/share/kolab-freebusy/lib/Roundcube
 var/log/kolab-freebusy /usr/share/kolab-freebusy/logs
diff -r 4bbc66ecef8d -r faba023cc790 debian/postinst
--- a/debian/postinst	Sat Aug 16 18:06:13 2014 +0200
+++ b/debian/postinst	Wed Sep 10 17:11:22 2014 +0200
@@ -7,8 +7,10 @@
 
 fixperms() {
     chown -R www-data:adm \
+        /var/cache/kolab-freebusy \
         /var/log/kolab-freebusy
     chmod 750 \
+        /var/cache/kolab-freebusy \
         /var/log/kolab-freebusy
 }
 
diff -r 4bbc66ecef8d -r faba023cc790 debian/preinst
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/preinst	Wed Sep 10 17:11:22 2014 +0200
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+function relink_config() {
+    if [ -d "/usr/share/kolab-freebusy/config" ]; then
+        if [ -L "/usr/share/kolab-freebusy/config" ]; then
+            rm -rf /usr/share/kolab-freebusy/config
+            mkdir /usr/share/kolab-freebusy/config
+            cd /usr/share/kolab-freebusy/config
+            ln -sf /etc/kolab-freebusy/config.ini config.ini
+        fi
+    fi
+}
+
+case "$1" in
+    install|upgrade)
+        relink_config
+    ;;
+esac
diff -r 4bbc66ecef8d -r faba023cc790 debian/rules
--- a/debian/rules	Sat Aug 16 18:06:13 2014 +0200
+++ b/debian/rules	Wed Sep 10 17:11:22 2014 +0200
@@ -1,12 +1,5 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
 %:
@@ -19,3 +12,9 @@
 	# Install apache2 configuration
 	mkdir -p $(CURDIR)/debian/kolab-freebusy/etc/apache2/sites-available
 	install -pm 644 $(CURDIR)/debian/apache2.conf $(CURDIR)/debian/kolab-freebusy/etc/apache2/sites-available/kolab-freebusy
+
+override_dh_link:
+	# These become links
+	rm -rf $(CURDIR)/debian/kolab-freebusy/usr/share/kolab-freebusy/lib/Roundcube
+	rm -rf $(CURDIR)/debian/kolab-freebusy/usr/share/kolab-freebusy/lib/plugins
+	dh_link