[pkg-kolab] r583 - kolabd/trunk/debian

[petere at alioth.debian.org]

Author: petere
Date: 2007-05-18 10:06:33 +0000 (Fri, 18 May 2007)
New Revision: 583

Modified:
   kolabd/trunk/debian/README.Debian
   kolabd/trunk/debian/changelog
   kolabd/trunk/debian/rules
Log:
* Install kolab_bootstrap under /usr/share/doc, so it doesn't look so
  much like you can actually use it (closes: #365876)    

Modified: kolabd/trunk/debian/README.Debian
===================================================================
--- kolabd/trunk/debian/README.Debian	2007-05-11 16:08:22 UTC (rev 582)
+++ kolabd/trunk/debian/README.Debian	2007-05-18 10:06:33 UTC (rev 583)
@@ -495,9 +495,9 @@
 
 -------------------------------------------------------------------------------
 
-There is a partly adjusted bootstrap for Debian at
-/usr/share/kolabd/kolab_bootstrap, but it's not working 100%.  Patches
-to make this bootstrap working 100% are very welcome!
+The bootstrapping program and templates used by upstream can be found at
+/usr/share/doc/kolabd/bootstrap/ for reference, but that code are not
+adjusted for the Debian installation, so it won't actually work.
 
 
- -- The Debian Kolab Maintainers, 11 December 2006
+ -- The Debian Kolab Maintainers, 18 May 2007

Modified: kolabd/trunk/debian/changelog
===================================================================
--- kolabd/trunk/debian/changelog	2007-05-11 16:08:22 UTC (rev 582)
+++ kolabd/trunk/debian/changelog	2007-05-18 10:06:33 UTC (rev 583)
@@ -6,6 +6,10 @@
   [ Noèl Köthe ]
   * remove $mydestination from kolab-ldapdistlist.cf; doesn't work there
 
+  [ Peter Eisentraut ]
+  * Install kolab_bootstrap under /usr/share/doc, so it doesn't look so
+    much like you can actually use it (closes: #365876)    
+
  -- Steffen Joeris <white at debian.org>  Wed,  3 Jan 2007 11:17:12 +0100
 
 kolabd (1.9.4-20060707.dfsg-3) unstable; urgency=medium

Modified: kolabd/trunk/debian/rules
===================================================================
--- kolabd/trunk/debian/rules	2007-05-11 16:08:22 UTC (rev 582)
+++ kolabd/trunk/debian/rules	2007-05-18 10:06:33 UTC (rev 583)
@@ -38,13 +38,11 @@
 	install -D -m 755 kolab_smtpdpolicy debian/kolabd/usr/sbin/kolab_smtpdpolicy
 	install -D -m 644 quotawarning.txt debian/kolabd/etc/kolab/quotawarning.txt
 	install -D -m 644 rootDSE.ldif debian/kolabd/etc/kolab/rootDSE.ldif
-	
-	# Install files in /usr/share/kolabd
-	install -D -m 755 kolab_bootstrap debian/kolabd/usr/share/kolabd/kolab_bootstrap
-	
-	# Template files for /etc/kolab/templates
-	for i in templates/* ; do install -D -m 644 $$i debian/kolabd/usr/share/doc/kolabd/$$i ; done
 
+	# Upstream Kolab bootstrapping files, installed for reference
+	install -D -m 755 kolab_bootstrap debian/kolabd/usr/share/doc/kolabd/bootstrap/kolab_bootstrap
+	for i in templates/* ; do install -D -m 644 $$i debian/kolabd/usr/share/doc/kolabd/bootstrap/$$i ; done
+
 	# install horde-sarge-iCal.patch
 	install -D -m 644 debian/horde-sarge-iCal.patch debian/kolabd/usr/share/doc/kolabd/horde-sarge-iCal.patch