[pkg-kolab] r1002 - in kolabd/trunk/debian: . patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-11-18 18:12:03 +0000 (Tue, 18 Nov 2008)
New Revision: 1002

Modified:
   kolabd/trunk/debian/changelog
   kolabd/trunk/debian/dirs
   kolabd/trunk/debian/patches/90-slapd-template.diff
   kolabd/trunk/debian/rules
Log:
move LDAP schemas to /etc/ldap/schema


Modified: kolabd/trunk/debian/changelog
===================================================================
--- kolabd/trunk/debian/changelog	2008-11-18 18:01:26 UTC (rev 1001)
+++ kolabd/trunk/debian/changelog	2008-11-18 18:12:03 UTC (rev 1002)
@@ -6,8 +6,10 @@
     - debian/rules to keep this template
     - added /etc/amavis/conf.d directory as template target
   * refreshed patches, use quilt headers
+  * debian/rules, debian/patches/90-slapd-template.diff, debian/dirs:
+    move LDAP schemas to /etc/ldap/schema 
 
- -- Mathieu Parent <math.parent at gmail.com>  Tue, 18 Nov 2008 18:50:41 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Tue, 18 Nov 2008 19:08:20 +0100
 
 kolabd (2.2.0-20080709.dfsg-1) unstable; urgency=low
 

Modified: kolabd/trunk/debian/dirs
===================================================================
--- kolabd/trunk/debian/dirs	2008-11-18 18:01:26 UTC (rev 1001)
+++ kolabd/trunk/debian/dirs	2008-11-18 18:12:03 UTC (rev 1002)
@@ -2,3 +2,4 @@
 etc/kolab/filter
 etc/kolab/freebusy
 etc/amavis/conf.d
+etc/ldap/schema

Modified: kolabd/trunk/debian/patches/90-slapd-template.diff
===================================================================
--- kolabd/trunk/debian/patches/90-slapd-template.diff	2008-11-18 18:01:26 UTC (rev 1001)
+++ kolabd/trunk/debian/patches/90-slapd-template.diff	2008-11-18 18:12:03 UTC (rev 1002)
@@ -45,8 +45,8 @@
  include @ldapserver_schemadir@/rfc2739.schema
 -include @ldapserver_schemadir@/kolab2.schema
 -#include @ldapserver_schemadir@/horde.schema
-+include /usr/share/kolabd/schema/kolab2.schema
-+include /usr/share/kolabd/schema/horde.schema
++include @ldapserver_schemadir@/kolab2.schema
++include @ldapserver_schemadir@/horde.schema
  
  pidfile		@ldapserver_pidfile@
  argsfile	@ldapserver_argsfile@

Modified: kolabd/trunk/debian/rules
===================================================================
--- kolabd/trunk/debian/rules	2008-11-18 18:01:26 UTC (rev 1001)
+++ kolabd/trunk/debian/rules	2008-11-18 18:12:03 UTC (rev 1002)
@@ -56,8 +56,8 @@
 
 	# LDAP files
 	install -D -m 644 debian/rfc2739.schema debian/kolabd/etc/ldap/schema/rfc2739.schema
-	install -D -m 644 horde.schema debian/kolabd/usr/share/kolabd/schema/horde.schema
-	install -D -m 644 kolab2.schema debian/kolabd/usr/share/kolabd/schema/kolab2.schema
+	install -D -m 644 horde.schema debian/kolabd/etc/ldap/schema/horde.schema
+	install -D -m 644 kolab2.schema debian/kolabd/etc/ldap/schema/kolab2.schema
 
 #	# Commented out because of copyright issues, needs further investigation
 #	install -D -m 644 rfc2739.schema debian/kolabd/usr/share/kolabd/schema/rfc2739.schema