[pkg-kolab] r859 - kolabd/branches/2.2/debian/patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-05-25 10:45:31 +0000 (Sun, 25 May 2008)
New Revision: 859

Added:
   kolabd/branches/2.2/debian/patches/55-no-distconf_kolabsrv.dpatch
Modified:
   kolabd/branches/2.2/debian/patches/00list
Log:
distconf/kolabsrv.in is not shipped in. We don't need it anyway.


Modified: kolabd/branches/2.2/debian/patches/00list
===================================================================
--- kolabd/branches/2.2/debian/patches/00list	2008-05-25 10:25:56 UTC (rev 858)
+++ kolabd/branches/2.2/debian/patches/00list	2008-05-25 10:45:31 UTC (rev 859)
@@ -2,6 +2,7 @@
 30-bootstrap
 40-disable-amavis
 50-postfix-hashes
+55-no-distconf_kolabsrv
 #60-kolabdcachetool-cachefiles
 70-kolab2.schema-removal.of.rfc2739.dpatch
 80-kolab_globals

Added: kolabd/branches/2.2/debian/patches/55-no-distconf_kolabsrv.dpatch
===================================================================
--- kolabd/branches/2.2/debian/patches/55-no-distconf_kolabsrv.dpatch	                        (rev 0)
+++ kolabd/branches/2.2/debian/patches/55-no-distconf_kolabsrv.dpatch	2008-05-25 10:45:31 UTC (rev 859)
@@ -0,0 +1,54 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 55-no-distconf_kolabsrv.dpatch by Mathieu Parent <math.parent at gmail.com>
+##
+## DP: distconf/kolabsrv.in is not shipped in. We don't need it anyway.
+
+ at DPATCH@
+diff -urNad kolabd-2.1.99-20080521.dfsg~/Makefile.am kolabd-2.1.99-20080521.dfsg/Makefile.am
+--- kolabd-2.1.99-20080521.dfsg~/Makefile.am	2008-05-25 12:36:30.000000000 +0200
++++ kolabd-2.1.99-20080521.dfsg/Makefile.am	2008-05-25 12:37:48.000000000 +0200
+@@ -149,8 +149,8 @@
+ 	kolabcheckperm
+ else
+ kolabsbin_FILES = kolabd \
+-	kolabcheckperm \
+-	dist_conf/kolabsrv
++	kolabcheckperm
++#	dist_conf/kolabsrv
+ endif	
+ 
+ kolabsbindir = $(sbindir)/
+@@ -226,9 +226,9 @@
+ 	chmod 744 $(DESTDIR)$(sbindir)/kolabd
+ 	chmod 744 $(DESTDIR)$(sbindir)/kolabcheckperm
+ 	chmod 755 $(DESTDIR)$(bindir)/kolabpasswd
+-if ! OPENPKG
+-	chmod 755 $(DESTDIR)$(sbindir)/kolabsrv
+-endif
++#if ! OPENPKG
++#	chmod 755 $(DESTDIR)$(sbindir)/kolabsrv
++#endif
+ if OPENPKG
+ 	chmod 755 $(DESTDIR)$(kolabrcdir)/$(kolabrc_DATA)
+ 	chmod 744 $(DESTDIR)$(bindir)/kolab
+diff -urNad kolabd-2.1.99-20080521.dfsg~/Makefile.in kolabd-2.1.99-20080521.dfsg/Makefile.in
+--- kolabd-2.1.99-20080521.dfsg~/Makefile.in	2008-05-25 12:36:30.000000000 +0200
++++ kolabd-2.1.99-20080521.dfsg/Makefile.in	2008-05-25 12:37:10.000000000 +0200
+@@ -284,7 +284,7 @@
+ 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
+@@ -895,7 +895,7 @@
+ 	chmod 744 $(DESTDIR)$(sbindir)/kolabd
+ 	chmod 744 $(DESTDIR)$(sbindir)/kolabcheckperm
+ 	chmod 755 $(DESTDIR)$(bindir)/kolabpasswd
+- at 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.


Property changes on: kolabd/branches/2.2/debian/patches/55-no-distconf_kolabsrv.dpatch
___________________________________________________________________
Name: svn:executable
   + *