[pkg-kolab] r555 - kolab-resource-handlers/trunk/debian
kolab-webadmin/trunk/debian kolabd/trunk/debian
Steffen Joeris
white-guest at alioth.debian.org
Wed Dec 20 12:38:42 CET 2006
Author: white-guest
Date: 2006-12-20 12:38:41 +0100 (Wed, 20 Dec 2006)
New Revision: 555
Modified:
kolab-resource-handlers/trunk/debian/apache.conf
kolab-resource-handlers/trunk/debian/changelog
kolab-webadmin/trunk/debian/changelog
kolab-webadmin/trunk/debian/dirs
kolab-webadmin/trunk/debian/rules
kolabd/trunk/debian/changelog
Log:
* fix apache configuration for kolab-webadmin
and make sure that it is enabled automatically
(Closes: #400627)
Modified: kolab-resource-handlers/trunk/debian/apache.conf
===================================================================
--- kolab-resource-handlers/trunk/debian/apache.conf 2006-12-11 10:44:33 UTC (rev 554)
+++ kolab-resource-handlers/trunk/debian/apache.conf 2006-12-20 11:38:41 UTC (rev 555)
@@ -51,6 +51,6 @@
# Pull in kolab-webadmin configuration
# (Uncomment this if kolab-webadmin is installed.)
- #Include /etc/kolab-webadmin/apache.conf
+ Include /etc/kolab/kolab-webadmin-apache*.conf
</VirtualHost>
Modified: kolab-resource-handlers/trunk/debian/changelog
===================================================================
--- kolab-resource-handlers/trunk/debian/changelog 2006-12-11 10:44:33 UTC (rev 554)
+++ kolab-resource-handlers/trunk/debian/changelog 2006-12-20 11:38:41 UTC (rev 555)
@@ -1,10 +1,14 @@
kolab-resource-handlers (0.3.9-20060811-3) UNRELEASED; urgency=medium
+ [ Peter Eisentraut ]
* Fixed path for resmgr.conf (closes: #401116)
- * Comment out /etc/kolab-webadmin/apache.conf by default
- (closes: #400627)
* Made file permissions more secure
+ [ Steffen Joeris ]
+ * Change the include path for the kolab-webadmin
+ apache.conf file to enable it by default if the package
+ is installed (Closes: #400627)
+
-- Peter Eisentraut <petere at debian.org> Fri, 8 Dec 2006 19:49:46 +0100
kolab-resource-handlers (0.3.9-20060811-2) unstable; urgency=medium
Modified: kolab-webadmin/trunk/debian/changelog
===================================================================
--- kolab-webadmin/trunk/debian/changelog 2006-12-11 10:44:33 UTC (rev 554)
+++ kolab-webadmin/trunk/debian/changelog 2006-12-20 11:38:41 UTC (rev 555)
@@ -1,7 +1,12 @@
kolab-webadmin (0.4.0-20060810-4) UNRELEASED; urgency=medium
+ [ Peter Eisentraut ]
* Updated instructions for kolab-resource-handlers Apache integration
+ [ Steffen Joeris ]
+ * Install the apache.conf file into the kolab directory to make sure
+ we can enable it by default if the package is installed
+
-- Peter Eisentraut <petere at debian.org> Fri, 1 Dec 2006 16:34:49 +0100
kolab-webadmin (0.4.0-20060810-3) unstable; urgency=medium
Modified: kolab-webadmin/trunk/debian/dirs
===================================================================
--- kolab-webadmin/trunk/debian/dirs 2006-12-11 10:44:33 UTC (rev 554)
+++ kolab-webadmin/trunk/debian/dirs 2006-12-20 11:38:41 UTC (rev 555)
@@ -1 +1,2 @@
var/cache/kolab-webadmin/templates
+etc/kolab
Modified: kolab-webadmin/trunk/debian/rules
===================================================================
--- kolab-webadmin/trunk/debian/rules 2006-12-11 10:44:33 UTC (rev 554)
+++ kolab-webadmin/trunk/debian/rules 2006-12-20 11:38:41 UTC (rev 555)
@@ -36,7 +36,7 @@
dh_clean -k
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/kolab-webadmin
- install -D -m 644 debian/apache.conf $(CURDIR)/debian/kolab-webadmin/etc/kolab-webadmin/apache.conf
+ install -D -m 644 debian/apache.conf $(CURDIR)/debian/kolab-webadmin/etc/kolab/kolab-webadmin-apache.conf
install -D -m 644 debian/session_vars.php $(CURDIR)/debian/kolab-webadmin/etc/kolab-webadmin/session_vars.php
install -D -m 644 debian/distdeleted.tpl debian/kolab-webadmin/usr/share/kolab-webadmin/admin/templates/distdeleted.tpl
install -D -m 644 debian/sfdeleted.tpl debian/kolab-webadmin/usr/share/kolab-webadmin/admin/templates/sfdeleted.tpl
Modified: kolabd/trunk/debian/changelog
===================================================================
--- kolabd/trunk/debian/changelog 2006-12-11 10:44:33 UTC (rev 554)
+++ kolabd/trunk/debian/changelog 2006-12-20 11:38:41 UTC (rev 555)
@@ -5,6 +5,7 @@
dependencies (closes: #400022)
* Added pointer to kolab-webadmin setup instructions (closes: #370531)
* Changed php path to /usr/bin/php4 to be explicit (closes: #401831)
+ * Improve explanation about apache configuration
[ Steffen Joeris ]
* Minor fixes to README.Debian and adding some useful information
More information about the pkg-kolab-devel
mailing list