[pkg-kolab] r526 - kolab-resource-handlers/trunk/debian

[Peter Eisentraut]

Author: petere
Date: 2006-12-01 16:34:00 +0100 (Fri, 01 Dec 2006)
New Revision: 526

Modified:
   kolab-resource-handlers/trunk/debian/apache.conf
   kolab-resource-handlers/trunk/debian/changelog
Log:
* Comment out /etc/kolab-webadmin/apache.conf by default
  (closes: #400627)

Modified: kolab-resource-handlers/trunk/debian/apache.conf
===================================================================
--- kolab-resource-handlers/trunk/debian/apache.conf	2006-12-01 13:45:45 UTC (rev 525)
+++ kolab-resource-handlers/trunk/debian/apache.conf	2006-12-01 15:34:00 UTC (rev 526)
@@ -49,7 +49,8 @@
 	         downgrade-1.0 force-response-1.0
 
 
-	# Pull in kolab-webadmin configuration if installed
-	Include /etc/kolab-webadmin/apache*.conf
+	# Pull in kolab-webadmin configuration
+	# (Uncomment this if kolab-webadmin is installed.)
+	#Include /etc/kolab-webadmin/apache.conf
 
 </VirtualHost>                                  

Modified: kolab-resource-handlers/trunk/debian/changelog
===================================================================
--- kolab-resource-handlers/trunk/debian/changelog	2006-12-01 13:45:45 UTC (rev 525)
+++ kolab-resource-handlers/trunk/debian/changelog	2006-12-01 15:34:00 UTC (rev 526)
@@ -1,8 +1,10 @@
 kolab-resource-handlers (0.3.9-20060811-3) UNRELEASED; urgency=medium
 
   * Fixed path for resmgr.conf (closes: #401116)
+  * Comment out /etc/kolab-webadmin/apache.conf by default
+    (closes: #400627)
 
- -- Peter Eisentraut <petere at debian.org>  Fri,  1 Dec 2006 14:32:02 +0100
+ -- Peter Eisentraut <petere at debian.org>  Fri,  1 Dec 2006 16:32:58 +0100
 
 kolab-resource-handlers (0.3.9-20060811-2) unstable; urgency=medium