# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1408200479 -7200
# Node ID 30dafda6223e555ba1f0ce0ee4b4351d0734d5fb
# Parent  b5a0a7bd3edace32591730f8a6c6c978e5054b37# Parent  ccea965b76b4db934712af75291750a46932ae9f
Merged upstream changes.

diff -r b5a0a7bd3eda -r 30dafda6223e debian/changelog
--- a/debian/changelog	Thu May 15 23:01:42 2014 +0200
+++ b/debian/changelog	Sat Aug 16 16:47:59 2014 +0200
@@ -1,3 +1,16 @@
+kolab-freebusy (1.0.4-0~kolab1) unstable; urgency=low
+ 
+  * New upstream version enabling real-time Free/Busy data directly from IMAP through
+    proxy authentication.
+ 
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 21 May 2014 12:00:22 +0200
+
+kolab-freebusy (1.0.2-3~kolab3) unstable; urgency=low
+ 
+  * Remove apache site configuration on package removal
+ 
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 09 Apr 2014 12:00:22 +0200
+
 kolab-freebusy (1.0.2-3~kolab1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -r b5a0a7bd3eda -r 30dafda6223e debian/dirs
--- a/debian/dirs	Thu May 15 23:01:42 2014 +0200
+++ b/debian/dirs	Sat Aug 16 16:47:59 2014 +0200
@@ -1,3 +1,3 @@
 etc/kolab-freebusy
-usr/share/kolab-freebusy/public_html/
+usr/share/kolab-freebusy
 var/log/kolab-freebusy
diff -r b5a0a7bd3eda -r 30dafda6223e debian/install
--- a/debian/install	Thu May 15 23:01:42 2014 +0200
+++ b/debian/install	Sat Aug 16 16:47:59 2014 +0200
@@ -1,3 +1,3 @@
 lib usr/share/kolab-freebusy/
 vendor usr/share/kolab-freebusy/
-web/* usr/share/kolab-freebusy/public_html/
+public_html usr/share/kolab-freebusy/
diff -r b5a0a7bd3eda -r 30dafda6223e debian/links
--- a/debian/links	Thu May 15 23:01:42 2014 +0200
+++ b/debian/links	Sat Aug 16 16:47:59 2014 +0200
@@ -1,2 +1,2 @@
 etc/kolab-freebusy /usr/share/kolab-freebusy/config
-var/log/kolab-freebusy /usr/share/kolab-freebusy/log
+var/log/kolab-freebusy /usr/share/kolab-freebusy/logs
diff -r b5a0a7bd3eda -r 30dafda6223e debian/prerm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/prerm	Sat Aug 16 16:47:59 2014 +0200
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+reload_apache()
+{
+    if apache2ctl configtest 2>/dev/null; then
+        invoke-rc.d apache2 $1 || true
+    else
+        echo "Your apache2 configuration is broken, so we're not restarting it for you."
+    fi
+}
+
+
+case "$1" in
+    remove)
+        if [ -e "/etc/apache2/sites-enabled/kolab-freebusy" ]; then
+            a2ensite kolab-freebusy
+        fi
+        reload_apache reload
+    ;;
+esac