[pkg-kolab] r1039 - in kolabd/branches/2.2.1/debian: . patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-12-16 17:52:37 +0000 (Tue, 16 Dec 2008)
New Revision: 1039

Modified:
   kolabd/branches/2.2.1/debian/changelog
   kolabd/branches/2.2.1/debian/patches/55-no-distconf_kolabsrv.diff
Log:
Updated patch: 55-no-distconf_kolabsrv


Modified: kolabd/branches/2.2.1/debian/changelog
===================================================================
--- kolabd/branches/2.2.1/debian/changelog	2008-12-16 17:27:49 UTC (rev 1038)
+++ kolabd/branches/2.2.1/debian/changelog	2008-12-16 17:52:37 UTC (rev 1039)
@@ -10,8 +10,9 @@
     - 86-slapd-syncrepl-24
   * Moved patch: 30-bootstrap to libkolab-perl 
   * Moved patch: 40-disable-amavis to libkolab-perl 
+  * Updated patch: 55-no-distconf_kolabsrv
 
- -- Mathieu Parent <math.parent at gmail.com>  Tue, 16 Dec 2008 18:23:46 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Tue, 16 Dec 2008 18:49:54 +0100
 
 kolabd (2.2.0-20080709.dfsg-3) UNRELEASED; urgency=low
 

Modified: kolabd/branches/2.2.1/debian/patches/55-no-distconf_kolabsrv.diff
===================================================================
--- kolabd/branches/2.2.1/debian/patches/55-no-distconf_kolabsrv.diff	2008-12-16 17:27:49 UTC (rev 1038)
+++ kolabd/branches/2.2.1/debian/patches/55-no-distconf_kolabsrv.diff	2008-12-16 17:52:37 UTC (rev 1039)
@@ -8,21 +8,23 @@
 ===================================================================
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -148,8 +148,8 @@
- 	kolabcheckperm
- else
- kolabsbin_FILES = kolabd \
--	kolabcheckperm \
--	dist_conf/kolabsrv
-+	kolabcheckperm
-+#	dist_conf/kolabsrv
- endif	
+@@ -134,9 +134,9 @@
+ kolabdocdir = $(pkgdocdir)/@PACKAGE@
+ kolabdoc_DATA = $(kolabdoc_FILES) $(kolabdoc_GENERATED)
  
+-if ! OPENPKG
+-kolabsbin_FILES = dist_conf/kolabsrv
+-endif	
++#if ! OPENPKG
++#kolabsbin_FILES = dist_conf/kolabsrv
++#endif	
+ 
  kolabsbindir = $(sbindir)/
-@@ -224,9 +224,9 @@
- 	chmod 744 $(DESTDIR)$(sbindir)/kolabd
- 	chmod 744 $(DESTDIR)$(sbindir)/kolabcheckperm
- 	chmod 755 $(DESTDIR)$(bindir)/kolabpasswd
+ kolabsbin_DATA = $(kolabsbin_FILES)
+@@ -206,9 +206,9 @@
+ 	chmod 444 $(DESTDIR)$(kolabconfdir)/kolab.globals
+ 	chmod 775 $(DESTDIR)$(kolabdir)$(kolab_FILES)
+ 	chmod 744 $(DESTDIR)$(kolabnamespacedir)/*
 -if ! OPENPKG
 -	chmod 755 $(DESTDIR)$(sbindir)/kolabsrv
 -endif
@@ -36,21 +38,21 @@
 ===================================================================
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -283,7 +283,7 @@
+@@ -272,7 +272,7 @@
+ 
+ kolabdocdir = $(pkgdocdir)/@PACKAGE@
  kolabdoc_DATA = $(kolabdoc_FILES) $(kolabdoc_GENERATED)
- @OPENPKG_FALSE at kolabsbin_FILES = kolabd \
- @OPENPKG_FALSE@	kolabcheckperm \
-- at OPENPKG_FALSE@	dist_conf/kolabsrv
-+# @OPENPKG_FALSE@	dist_conf/kolabsrv
- 
- @OPENPKG_TRUE at kolabsbin_FILES = kolabd \
- @OPENPKG_TRUE@	kolabcheckperm
-@@ -894,7 +894,7 @@
- 	chmod 744 $(DESTDIR)$(sbindir)/kolabd
- 	chmod 744 $(DESTDIR)$(sbindir)/kolabcheckperm
- 	chmod 755 $(DESTDIR)$(bindir)/kolabpasswd
+- at OPENPKG_FALSE@kolabsbin_FILES = dist_conf/kolabsrv
++#@OPENPKG_FALSE at kolabsbin_FILES = dist_conf/kolabsrv
+ kolabsbindir = $(sbindir)/
+ kolabsbin_DATA = $(kolabsbin_FILES)
+ kolabbindir = $(bindir)
+@@ -875,7 +875,7 @@
+ 	chmod 444 $(DESTDIR)$(kolabconfdir)/kolab.globals
+ 	chmod 775 $(DESTDIR)$(kolabdir)$(kolab_FILES)
+ 	chmod 744 $(DESTDIR)$(kolabnamespacedir)/*
 - at OPENPKG_FALSE@	chmod 755 $(DESTDIR)$(sbindir)/kolabsrv
-+# @OPENPKG_FALSE@	chmod 755 $(DESTDIR)$(sbindir)/kolabsrv
++#@OPENPKG_FALSE@	chmod 755 $(DESTDIR)$(sbindir)/kolabsrv
  @OPENPKG_TRUE@	chmod 755 $(DESTDIR)$(kolabrcdir)/$(kolabrc_DATA)
  @OPENPKG_TRUE@	chmod 744 $(DESTDIR)$(bindir)/kolab
  # Tell versions [3.59,3.63) of GNU make to not export all variables.