[pkg-kolab] r641 - kolabd/trunk/debian/patches

[petere at alioth.debian.org]

Author: petere
Date: 2007-07-03 14:38:31 +0000 (Tue, 03 Jul 2007)
New Revision: 641

Modified:
   kolabd/trunk/debian/patches/90-slapd-template.dpatch
Log:
Owner in template fix


Modified: kolabd/trunk/debian/patches/90-slapd-template.dpatch
===================================================================
--- kolabd/trunk/debian/patches/90-slapd-template.dpatch	2007-07-03 14:34:24 UTC (rev 640)
+++ kolabd/trunk/debian/patches/90-slapd-template.dpatch	2007-07-03 14:38:31 UTC (rev 641)
@@ -4,9 +4,21 @@
 ## DP: slapd.conf template fixes
 
 @DPATCH@
-diff -urNad kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846~/templates/slapd.conf.template.in kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846/templates/slapd.conf.template.in
---- kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846~/templates/slapd.conf.template.in	2007-06-21 20:45:21.000000000 +0200
-+++ kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846/templates/slapd.conf.template.in	2007-06-21 20:45:50.000000000 +0200
+diff -urNad kolabd-2.1.0-20070510.dfsg~/templates/DB_CONFIG.slapd.template.in kolabd-2.1.0-20070510.dfsg/templates/DB_CONFIG.slapd.template.in
+--- kolabd-2.1.0-20070510.dfsg~/templates/DB_CONFIG.slapd.template.in	2006-09-27 18:48:30.000000000 +0200
++++ kolabd-2.1.0-20070510.dfsg/templates/DB_CONFIG.slapd.template.in	2007-06-25 01:09:00.000000000 +0200
+@@ -1,7 +1,7 @@
+ KOLAB_META_START
+ TARGET=@ldapserver_dir@/DB_CONFIG
+ PERMISSIONS=0640
+-OWNERSHIP=@kolab_musr@:@kolab_rgrp@
++OWNERSHIP=@ldapserver_usr@:@ldapserver_grp@
+ KOLAB_META_END
+ # (c) 2005 Klaraelvdalens Datakonsult AB
+ #     Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+diff -urNad kolabd-2.1.0-20070510.dfsg~/templates/slapd.conf.template.in kolabd-2.1.0-20070510.dfsg/templates/slapd.conf.template.in
+--- kolabd-2.1.0-20070510.dfsg~/templates/slapd.conf.template.in	2007-06-25 01:08:15.000000000 +0200
++++ kolabd-2.1.0-20070510.dfsg/templates/slapd.conf.template.in	2007-06-25 01:08:16.000000000 +0200
 @@ -13,6 +13,12 @@
  # this file is automatically written by the Kolab config backend and should have the 
  # file mode 0640