# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1410361301 -7200
# Node ID f320517d85dcf26c7d699b6d1506c4f6c6606fb4
# Parent  04aaebeb82b1f67f9680bb2cc6f430d67820cc38# Parent  4f5514da6140cb47d7996546b03bc320d1cddd1a
Merged upstream changes.

diff -r 04aaebeb82b1 -r f320517d85dc debian/changelog
--- a/debian/changelog	Thu May 15 22:59:57 2014 +0200
+++ b/debian/changelog	Wed Sep 10 17:01:41 2014 +0200
@@ -1,3 +1,10 @@
+chwala (0.2-0~kolab9) unstable; urgency=low
+
+  * Disable chwala apache site when removed
+  * create correct sites-availabe/chwala configuration
+
+ -- Daniel Hoffend <dh@dotlan.net>  Tue, 25 Feb 2014 13:37:23 +0200
+
 chwala (0.2-0~kolab8) unstable; urgency=low
 
   * Disable chwala apache site when removed
diff -r 04aaebeb82b1 -r f320517d85dc debian/dirs
--- a/debian/dirs	Thu May 15 22:59:57 2014 +0200
+++ b/debian/dirs	Wed Sep 10 17:01:41 2014 +0200
@@ -1,4 +1,3 @@
-etc/apache2/sites-available
 usr/share/chwala
 usr/share/chwala/public_html
 usr/share/chwala/lib
diff -r 04aaebeb82b1 -r f320517d85dc debian/install
--- a/debian/install	Thu May 15 22:59:57 2014 +0200
+++ b/debian/install	Wed Sep 10 17:01:41 2014 +0200
@@ -1,3 +1,2 @@
 lib/ usr/share/chwala/
 public_html/ usr/share/chwala/
-doc/chwala.conf etc/apache2/sites-available/chwala
diff -r 04aaebeb82b1 -r f320517d85dc debian/preinst
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/preinst	Wed Sep 10 17:01:41 2014 +0200
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    upgrade|install)
+        # old version had problems with the apache conf created as directoy instead of file
+        if [ -e "/etc/apache2/sites-available/chwala/chwala.conf" ]; then
+            DIR=$(mktemp -d)
+            mv /etc/apache2/sites-available/chwala/* $DIR/
+            rmdir /etc/apache2/sites-available/chwala/
+            mv $DIR/chwala.conf /etc/apache2/sites-available/chwala
+            rmdir $DIR
+        fi
+    ;;
+esac
+
+exit 0
diff -r 04aaebeb82b1 -r f320517d85dc debian/prerm
--- a/debian/prerm	Thu May 15 22:59:57 2014 +0200
+++ b/debian/prerm	Wed Sep 10 17:01:41 2014 +0200
@@ -13,7 +13,7 @@
 case "$1" in
     remove)
         if [ -e "/etc/apache2/sites-enabled/chwala" ]; then
-            a2ensite chwala
+            a2dissite chwala
         fi
         reload_apache reload
     ;;
diff -r 04aaebeb82b1 -r f320517d85dc debian/rules
--- a/debian/rules	Thu May 15 22:59:57 2014 +0200
+++ b/debian/rules	Wed Sep 10 17:01:41 2014 +0200
@@ -9,6 +9,9 @@
 override_dh_install:
 	dh_install -XLICENSE -X.gitignore
 
+	mkdir -p $(CURDIR)/debian/chwala/etc/apache2/sites-available
+	install -pm 644 $(CURDIR)/doc/chwala.conf $(CURDIR)/debian/chwala/etc/apache2/sites-available/chwala
+
 	# prepare for symbolic links, throw away unneeded code (same as in .spec file)
 	rm -rf $(CURDIR)/debian/chwala/usr/share/chwala/lib/ext/Auth
 	rm -rf $(CURDIR)/debian/chwala/usr/share/chwala/lib/ext/HTTP