[Debian-ha-svn-commits] [SCM] cluster suite Debian packaging branch, master, updated. debian/3.0.6-1

[Guido Günther]

The following commit has been merged in the master branch:
commit bbec984cd74cdad9012c645e80611aca634ecff0
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Dec 10 17:58:32 2009 +0100

    Drop 0003-add-LD_LIBRARY_PATH-so-we-find-liblogthread.patch
    
    applied upstream.

diff --git a/debian/patches/0001-add-dlm-kernel-headers.patch b/debian/patches/0001-add-dlm-kernel-headers.patch
index e014f06..5475896 100644
--- a/debian/patches/0001-add-dlm-kernel-headers.patch
+++ b/debian/patches/0001-add-dlm-kernel-headers.patch
@@ -636,7 +636,7 @@ index 9d75b6c..da40d9c 100644
  CFLAGS += -I$(SRCDIR)/group/dlm_controld/
  CFLAGS += -I${incdir}
 diff --git a/group/dlm_controld/Makefile b/group/dlm_controld/Makefile
-index cd6c950..602ff67 100644
+index f9a2d05..5ee9171 100644
 --- a/group/dlm_controld/Makefile
 +++ b/group/dlm_controld/Makefile
 @@ -35,6 +35,7 @@ CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${logtincdir}
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 4c78d64..ef1635d 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 a58efaf..c6e7730 100644
+index 68fafd6..f090064 100644
 --- a/cman/init.d/cman.in
 +++ b/cman/init.d/cman.in
 @@ -10,8 +10,8 @@
@@ -58,7 +58,7 @@ index b28a99a..9f994bd 100644
  # Description:		mount/unmount gfs2 filesystems configured in /etc/fstab
  ### END INIT INFO
 diff --git a/rgmanager/init.d/rgmanager.in b/rgmanager/init.d/rgmanager.in
-index 37539ba..0f064e7 100644
+index 38f7b1f..3b283fe 100644
 --- a/rgmanager/init.d/rgmanager.in
 +++ b/rgmanager/init.d/rgmanager.in
 @@ -8,8 +8,8 @@
diff --git a/debian/patches/0004-Do-nothing-if-cman_tool-isn-t-there.patch b/debian/patches/0003-Do-nothing-if-cman_tool-isn-t-there.patch
similarity index 95%
rename from debian/patches/0004-Do-nothing-if-cman_tool-isn-t-there.patch
rename to debian/patches/0003-Do-nothing-if-cman_tool-isn-t-there.patch
index 64aec43..52fde5e 100644
--- a/debian/patches/0004-Do-nothing-if-cman_tool-isn-t-there.patch
+++ b/debian/patches/0003-Do-nothing-if-cman_tool-isn-t-there.patch
@@ -8,7 +8,7 @@ so we don't report an error if the package was removed but not purged.
  1 files changed, 2 insertions(+), 0 deletions(-)
 
 diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
-index c6e7730..c4ae579 100644
+index f090064..0801105 100644
 --- a/cman/init.d/cman.in
 +++ b/cman/init.d/cman.in
 @@ -19,6 +19,8 @@
diff --git a/debian/patches/0003-add-LD_LIBRARY_PATH-so-we-find-liblogthread.patch b/debian/patches/0003-add-LD_LIBRARY_PATH-so-we-find-liblogthread.patch
deleted file mode 100644
index 7620a27..0000000
--- a/debian/patches/0003-add-LD_LIBRARY_PATH-so-we-find-liblogthread.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Mon, 2 Nov 2009 19:44:09 +0100
-Subject: [PATCH] add LD_LIBRARY_PATH so we find liblogthread
-
----
- fence/agents/xvm/Makefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/fence/agents/xvm/Makefile b/fence/agents/xvm/Makefile
-index 6215263..31b277f 100644
---- a/fence/agents/xvm/Makefile
-+++ b/fence/agents/xvm/Makefile
-@@ -61,7 +61,7 @@ ${TARGET3}: ${OBJS3}
- 
- $(MANTARGET): $(TARGET1) ${SRCDIR}/fence/agents/lib/fence2man.xsl
- 	set -e && \
--	./$(TARGET1) -o metadata > .$@.tmp && \
-+	LD_LIBRARY_PATH=${logtlibdir} ./$(TARGET1) -o metadata > .$@.tmp && \
- 	xsltproc ${SRCDIR}/fence/agents/lib/fence2man.xsl .$@.tmp > $@
- 
- clean: generalclean
--- 
diff --git a/debian/patches/series b/debian/patches/series
index f19386d..11450cf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-add-dlm-kernel-headers.patch
 0002-Fix-Default-Start-Stop-for-dependency-based-boot.patch
-0003-add-LD_LIBRARY_PATH-so-we-find-liblogthread.patch
-0004-Do-nothing-if-cman_tool-isn-t-there.patch
+0003-Do-nothing-if-cman_tool-isn-t-there.patch

-- 
cluster suite Debian packaging