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

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2009-02-03 17:14:19 +0000 (Tue, 03 Feb 2009)
New Revision: 2544

Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/patches/06_services_names.diff
Log:

samba patch not needed anymore


Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog	2009-02-03 11:41:25 UTC (rev 2543)
+++ trunk/ctdb/debian/changelog	2009-02-03 17:14:19 UTC (rev 2544)
@@ -1,6 +1,7 @@
-ctdb (1.0.70-1) UNRELEASED; urgency=low
+ctdb (1.0.71-1) UNRELEASED; urgency=low
 
   * new upstream version
+    - from 1.0.71: 06_services_names.diff: samba patch not needed anymore
   * updated debian/watch
   * debian/copyright: updated, corrects lintian warning:
     copyright-with-old-dh-make-debian-copyright
@@ -8,7 +9,7 @@
   * debian/rules: install upstream changelog (taken from specfile) 
   * debian/copyright: refers to versionned license version
 
- -- Mathieu Parent <math.parent at gmail.com>  Tue, 03 Feb 2009 12:37:47 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Tue, 03 Feb 2009 17:07:47 +0100
 
 ctdb (1.0.65-1) experimental; urgency=low
 

Modified: trunk/ctdb/debian/patches/06_services_names.diff
===================================================================
--- trunk/ctdb/debian/patches/06_services_names.diff	2009-02-03 11:41:25 UTC (rev 2543)
+++ trunk/ctdb/debian/patches/06_services_names.diff	2009-02-03 17:14:19 UTC (rev 2544)
@@ -40,34 +40,3 @@
          ;;
  
       monitor)
-Index: ctdb-1.0.51/config/events.d/50.samba
-===================================================================
---- ctdb-1.0.51.orig/config/events.d/50.samba	2008-08-01 22:04:17.000000000 +0200
-+++ ctdb-1.0.51/config/events.d/50.samba	2008-08-01 22:05:31.000000000 +0200
-@@ -118,7 +118,7 @@
- 	/bin/mkdir -p $CTDB_BASE/state/samba
- 
- 	# make sure samba is not already started
--	service smb stop > /dev/null 2>&1
-+	service samba stop > /dev/null 2>&1
- 	killall -0 -q smbd && {
- 	    sleep 1
- 	    # make absolutely sure samba is dead
-@@ -140,7 +140,7 @@
- 	# start Samba service. Start it reniced, as under very heavy load 
- 	# the number of smbd processes will mean that it leaves few cycles for
- 	# anything else
--	nice_service smb start
-+	nice_service samba start
- 	;;
- 	
-      takeip)
-@@ -158,7 +158,7 @@
- 
-      shutdown)
- 	# shutdown Samba when ctdb goes down
--	service smb stop
-+	service samba stop
- 
- 	# stop the winbind service
- 	check_ctdb_manages_winbind