[Pkg-samba-maint] r1847 - in trunk/ctdb/debian: . patches

Sat Apr 26 13:29:05 UTC 2008

Author: mparent-guest
Date: 2008-04-26 13:29:05 +0000 (Sat, 26 Apr 2008)
New Revision: 1847

Removed:
   trunk/ctdb/debian/patches/03_web.diff
Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/patches/series
   trunk/ctdb/debian/rules
Log:
removed 03_web.diff, replaced by sed replaces in debian/rules 


Modified: trunk/ctdb/debian/changelog
===================================================================

--- trunk/ctdb/debian/changelog	2008-04-26 13:00:43 UTC (rev 1846)
+++ trunk/ctdb/debian/changelog	2008-04-26 13:29:05 UTC (rev 1847)
@@ -1,9 +1,10 @@
-ctdb (1.0.34+git200804242206-1) UNRELEASED; urgency=low
+ctdb (1.0.34+git200804242206-1) unstable; urgency=low
 
   * New upstream git snapshot
   * added CTDB_START_AS_DISABLED parameter to ctdb.init
+  * removed 03_web.diff, replaced by sed replaces in debian/rules 
 
- -- Mathieu Parent <math.parent at gmail.com>  Sat, 26 Apr 2008 14:56:19 +0200
+ -- Mathieu Parent <math.parent at gmail.com>  Sat, 26 Apr 2008 15:21:27 +0200
 
 ctdb (1.0.31+git200803251111-1) unstable; urgency=low
 

Deleted: trunk/ctdb/debian/patches/03_web.diff
===================================================================
--- trunk/ctdb/debian/patches/03_web.diff	2008-04-26 13:00:43 UTC (rev 1846)
+++ trunk/ctdb/debian/patches/03_web.diff	2008-04-26 13:29:05 UTC (rev 1847)
@@ -1,80 +0,0 @@
-Goal: correct various paths in documentation
-
-Two changes :
-* /etc/sysconfig/ is replaced by /etc/default/
-* logs are in /var/log/ctdb/
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: specific to debian
-
-Index: ctdb-0~20080104223653/web/configuring.html
-===================================================================
---- ctdb-0~20080104223653.orig/web/configuring.html	2008-01-20 22:03:20.000000000 +0100
-+++ ctdb-0~20080104223653/web/configuring.html	2008-01-20 22:03:39.000000000 +0100
-@@ -25,12 +25,12 @@
- config files for CTDB are also available from
- <a href="http://samba.org/~tridge/ctdb/config">http://samba.org/~tridge/ctdb/config</a>
- 
--<h3>/etc/sysconfig/ctdb</h3>
-+<h3>/etc/default/ctdb</h3>
- 
- This file contains the startup parameters for ctdb.<p>
- 
- When you installed ctdb, a template config file should have been
--installed in /etc/sysconfig/ctdb.<p>
-+installed in /etc/default/ctdb.<p>
- 
- Edit this file, following the instructions in the template.<p>
- 
-Index: ctdb-0~20080104223653/web/ftp.html
-===================================================================
---- ctdb-0~20080104223653.orig/web/ftp.html	2008-01-20 22:04:01.000000000 +0100
-+++ ctdb-0~20080104223653/web/ftp.html	2008-01-20 22:04:18.000000000 +0100
-@@ -13,9 +13,9 @@
- Configure vsftpd on each node on the cluster.<br><br>
- Set up vsftpd to export directories from the shared cluster filesystem.
- 
--<h2>/etc/sysconfig/vsftpd</h2>
-+<h2>/etc/default/vsftpd</h2>
- 
--Create the file /etc/sysconfig/vsftpd with the content :
-+Create the file /etc/default/vsftpd with the content :
- <pre>
-   CTDB_MANAGES_VSFTPD=yes
- </pre>
-Index: ctdb-0~20080104223653/web/nfs.html
-===================================================================
---- ctdb-0~20080104223653.orig/web/nfs.html	2008-01-20 22:03:48.000000000 +0100
-+++ ctdb-0~20080104223653/web/nfs.html	2008-01-20 22:03:58.000000000 +0100
-@@ -25,7 +25,7 @@
-   /gpfs0/data *(rw,fsid=1235)
- </pre>
- 
--<h2>/etc/sysconfig/nfs</h2>
-+<h2>/etc/default/nfs</h2>
- 
- This file must be edited to point statd to keep its state directory on 
- shared storage instead of in a local directory.<br><br>
-Index: ctdb-0~20080104223653/web/samba.html
-===================================================================
---- ctdb-0~20080104223653.orig/web/samba.html	2008-01-20 22:02:51.000000000 +0100
-+++ ctdb-0~20080104223653/web/samba.html	2008-01-20 22:03:12.000000000 +0100
-@@ -63,7 +63,7 @@
- 
- 
- <h3>CTDB_MANAGES_SAMBA</h3>
--This is a parameter in /etc/sysconfig/ctdb<br><br>
-+This is a parameter in /etc/default/ctdb<br><br>
- When this parameter is set to "yes" CTDB will start/stop/restart the local samba daemon as the cluster configuration changes.<br><br>
- When this parameter is set you should also make sure that samba is NOT started by default by the linux system when it boots:
- <pre>
-@@ -78,7 +78,7 @@
- It is strongly recommended that you set this parameter to "yes" if you intend to use clustered samba.
- 
- <h3>CTDB_MANAGES_WINBIND</h3>
--This is a parameter in /etc/sysconfig/ctdb<br><br>
-+This is a parameter in /etc/default/ctdb<br><br>
- When this parameter is set to "yes" CTDB will start/stop/restart the local winbind daemon as the cluster configuration changes.<br><br>
- When this parameter is set you should also make sure that winbind is NOT started by default by the linux system when it boots:
- <pre>

Modified: trunk/ctdb/debian/patches/series
===================================================================
--- trunk/ctdb/debian/patches/series	2008-04-26 13:00:43 UTC (rev 1846)
+++ trunk/ctdb/debian/patches/series	2008-04-26 13:29:05 UTC (rev 1847)
@@ -1,5 +1,4 @@
 02_ctdb_diagnostics.diff
-03_web.diff
 04_install_chmod.patch
 06_services_names.diff
 25_popt_lib.diff

Modified: trunk/ctdb/debian/rules
===================================================================
--- trunk/ctdb/debian/rules	2008-04-26 13:00:43 UTC (rev 1846)
+++ trunk/ctdb/debian/rules	2008-04-26 13:29:05 UTC (rev 1847)
@@ -91,6 +91,8 @@
 	dh_testroot
 	dh_installchangelogs 
 	dh_installdocs
+	#patch doc
+	sed -i 's|/etc/sysconfig/|/etc/default/|' $(DESTDIR)/usr/share/doc/ctdb/web/*.html
 	dh_installexamples
 	dh_installlogrotate
 	#install init script


