[Debian-ha-svn-commits] [SCM] cluster suite Debian packaging branch, experimental, updated. debian/3.0.6-4-5-g5b162fa

[Guido Günther]

The following commit has been merged in the experimental branch:
commit 9381ece6e89bf70342981b2a1c416d8217a1f104
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Jan 21 18:15:51 2010 +0100

    Drop 0003-Do-nothing-if-cman_tool-isn-t-there.patch
    
    fixed upstream

diff --git a/debian/patches/0002-Fix-Default-Start-Stop-for-dependency-based-boot.patch b/debian/patches/0002-Fix-Default-Start-Stop-for-dependency-based-boot.patch
index ef1635d..7177223 100644
--- a/debian/patches/0002-Fix-Default-Start-Stop-for-dependency-based-boot.patch
+++ b/debian/patches/0002-Fix-Default-Start-Stop-for-dependency-based-boot.patch
@@ -13,7 +13,7 @@ Closes; #541980
  4 files changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
-index 68fafd6..f090064 100644
+index a35590a..24e045b 100644
 --- a/cman/init.d/cman.in
 +++ b/cman/init.d/cman.in
 @@ -10,8 +10,8 @@
diff --git a/debian/patches/0003-Do-nothing-if-cman_tool-isn-t-there.patch b/debian/patches/0003-Do-nothing-if-cman_tool-isn-t-there.patch
deleted file mode 100644
index 52fde5e..0000000
--- a/debian/patches/0003-Do-nothing-if-cman_tool-isn-t-there.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Wed, 25 Nov 2009 22:26:55 +0100
-Subject: [PATCH] Do nothing if cman_tool isn't there
-
-so we don't report an error if the package was removed but not purged.
----
- cman/init.d/cman.in |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
-index f090064..0801105 100644
---- a/cman/init.d/cman.in
-+++ b/cman/init.d/cman.in
-@@ -19,6 +19,8 @@
- # set secure PATH
- PATH="/bin:/usr/bin:/sbin:/usr/sbin:@SBINDIR@"
- 
-+test -x @SBINDIR@/cman_tool || exit 0
-+
- local_chkconfig()
- {
- 	ls /etc/rc${2}.d/S*${3} > /dev/null 2>/dev/null
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 11450cf..8e29619 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-add-dlm-kernel-headers.patch
 0002-Fix-Default-Start-Stop-for-dependency-based-boot.patch
-0003-Do-nothing-if-cman_tool-isn-t-there.patch

-- 
cluster suite Debian packaging