1.1 --- a/debian/changelog Mon May 12 21:37:03 2014 +0200
1.2 +++ b/debian/changelog Wed Sep 10 17:01:07 2014 +0200
1.3 @@ -1,3 +1,10 @@
1.4 +chwala (0.2-0~kolab9) unstable; urgency=low
1.5 +
1.6 + * Disable chwala apache site when removed
1.7 + * create correct sites-availabe/chwala configuration
1.8 +
1.9 + -- Daniel Hoffend <dh@dotlan.net> Tue, 25 Feb 2014 13:37:23 +0200
1.10 +
1.11 chwala (0.2-0~kolab8) unstable; urgency=low
1.12
1.13 * Disable chwala apache site when removed
2.1 --- a/debian/dirs Mon May 12 21:37:03 2014 +0200
2.2 +++ b/debian/dirs Wed Sep 10 17:01:07 2014 +0200
2.3 @@ -1,4 +1,3 @@
2.4 -etc/apache2/sites-available
2.5 usr/share/chwala
2.6 usr/share/chwala/public_html
2.7 usr/share/chwala/lib
3.1 --- a/debian/install Mon May 12 21:37:03 2014 +0200
3.2 +++ b/debian/install Wed Sep 10 17:01:07 2014 +0200
3.3 @@ -1,3 +1,2 @@
3.4 lib/ usr/share/chwala/
3.5 public_html/ usr/share/chwala/
3.6 -doc/chwala.conf etc/apache2/sites-available/chwala
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
4.2 +++ b/debian/preinst Wed Sep 10 17:01:07 2014 +0200
4.3 @@ -0,0 +1,18 @@
4.4 +#!/bin/sh
4.5 +
4.6 +set -e
4.7 +
4.8 +case "$1" in
4.9 + upgrade|install)
4.10 + # old version had problems with the apache conf created as directoy instead of file
4.11 + if [ -e "/etc/apache2/sites-available/chwala/chwala.conf" ]; then
4.12 + DIR=$(mktemp -d)
4.13 + mv /etc/apache2/sites-available/chwala/* $DIR/
4.14 + rmdir /etc/apache2/sites-available/chwala/
4.15 + mv $DIR/chwala.conf /etc/apache2/sites-available/chwala
4.16 + rmdir $DIR
4.17 + fi
4.18 + ;;
4.19 +esac
4.20 +
4.21 +exit 0
5.1 --- a/debian/prerm Mon May 12 21:37:03 2014 +0200
5.2 +++ b/debian/prerm Wed Sep 10 17:01:07 2014 +0200
5.3 @@ -13,7 +13,7 @@
5.4 case "$1" in
5.5 remove)
5.6 if [ -e "/etc/apache2/sites-enabled/chwala" ]; then
5.7 - a2ensite chwala
5.8 + a2dissite chwala
5.9 fi
5.10 reload_apache reload
5.11 ;;
6.1 --- a/debian/rules Mon May 12 21:37:03 2014 +0200
6.2 +++ b/debian/rules Wed Sep 10 17:01:07 2014 +0200
6.3 @@ -9,6 +9,9 @@
6.4 override_dh_install:
6.5 dh_install -XLICENSE -X.gitignore
6.6
6.7 + mkdir -p $(CURDIR)/debian/chwala/etc/apache2/sites-available
6.8 + install -pm 644 $(CURDIR)/doc/chwala.conf $(CURDIR)/debian/chwala/etc/apache2/sites-available/chwala
6.9 +
6.10 # prepare for symbolic links, throw away unneeded code (same as in .spec file)
6.11 rm -rf $(CURDIR)/debian/chwala/usr/share/chwala/lib/ext/Auth
6.12 rm -rf $(CURDIR)/debian/chwala/usr/share/chwala/lib/ext/HTTP