[kernel] r10418 - in dists/trunk/redhat-cluster/redhat-cluster/debian: . patches

[Frederik Schüler]

Author: fs
Date: Tue Feb  5 13:03:50 2008
New Revision: 10418

Log:
New upstream snapshot.
- fix build failures with 2.6.24
Add libnet-snmp-perl and libnet-telnet-perl dependency to cman, needed for some fencing scripts.
Merge changes from ubuntu:
- drop libcman2 and libdlm 2 postrm, this is handled by debhelper.
- Make cman init script not fail if qdiskd fails to start up
- drop 00_fix_gfs2_quota.dpatch
Fix modules/redhat-cluster/debian/rules permissions



Removed:
   dists/trunk/redhat-cluster/redhat-cluster/debian/libcman2.postrm
   dists/trunk/redhat-cluster/redhat-cluster/debian/libdlm2.postrm
   dists/trunk/redhat-cluster/redhat-cluster/debian/patches/
Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
   dists/trunk/redhat-cluster/redhat-cluster/debian/cman.init
   dists/trunk/redhat-cluster/redhat-cluster/debian/control
   dists/trunk/redhat-cluster/redhat-cluster/debian/rules

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/changelog	(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/changelog	Tue Feb  5 13:03:50 2008
@@ -1,9 +1,17 @@
-redhat-cluster (2.20080107-3) UNRELEASED; urgency=low
+redhat-cluster (2.20080205-1) unstable; urgency=low
 
-  * Add libnet-snmp-perl and libnet-telnet-perl dependency to cman, needed 
+  * New upstream snapshot.
+    - fix build failures with 2.6.24
+  * Add libnet-snmp-perl and libnet-telnet-perl dependency to cman, needed
     for some fencing scripts.
+  * Merge changes from ubuntu:
+    - drop libcman2 and libdlm 2 postrm, this is handled by
+      debhelper.
+    - Make cman init script not fail if qdiskd fails to start up
+    - drop 00_fix_gfs2_quota.dpatch
+  * Fix modules/redhat-cluster/debian/rules permissions
 
- -- Frederik Schüler <fs at debian.org>  Fri, 25 Jan 2008 19:17:21 +0100
+ -- Frederik Schüler <fs at debian.org>  Tue, 05 Feb 2008 13:59:43 +0100
 
 redhat-cluster (2.20080107-2) unstable; urgency=low
 

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.init
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/cman.init	(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.init	Tue Feb  5 13:03:50 2008
@@ -113,7 +113,7 @@
 	fence_tool -w -t $FENCED_START_TIMEOUT join
 	echo " done"
 	echo -n " Starting Quorum Disk daemon:"
-	start-stop-daemon --start --quiet --pidfile /var/run/qdiskd.pid --exec /usr/sbin/qdiskd -- -Q
+	start-stop-daemon --start --quiet --pidfile /var/run/qdiskd.pid --exec /usr/sbin/qdiskd -- -Q || true
 	echo " done"
 	;;
   stop)

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/control
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/control	(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/control	Tue Feb  5 13:03:50 2008
@@ -4,7 +4,7 @@
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
 Uploaders: Bastian Blank <waldi at debian.org>, Frederik Schüler <fs at debian.org>
 Standards-Version: 3.7.3.0
-Build-Depends: dpatch, debhelper (>= 4.2.28), libxml2-dev, libncurses5-dev, libopenais-dev (>= 0.82-2), libvolume-id-dev (>=  0.105-4), linux-libc-dev (>= 2.6.23-1), libvirt-dev (>= 0.3.0) [amd64 i386], libnss3-dev [amd64 i386], libnspr4-dev [amd64 i386], bzip2, libslang2-dev
+Build-Depends: debhelper (>= 4.2.28), libxml2-dev, libncurses5-dev, libopenais-dev (>= 0.82-2), libvolume-id-dev (>=  0.105-4), linux-libc-dev (>= 2.6.23-1), libvirt-dev (>= 0.3.0) [amd64 i386], libnss3-dev [amd64 i386], libnspr4-dev [amd64 i386], bzip2, libslang2-dev
 Build-Conflicts: libccs-dev, libcman-dev (<= 2.0), libdlm-dev (<= 2.0), libcman2, libdlm2
 
 Package: redhat-cluster-suite

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/rules
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/rules	(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/rules	Tue Feb  5 13:03:50 2008
@@ -3,8 +3,6 @@
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
-include /usr/share/dpatch/dpatch.make
-
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 xen_arches = amd64 i386
@@ -17,7 +15,7 @@
 SOMAJOR=2
 SOMINOR=0
 
-configure: patch configure-stamp
+configure: configure-stamp
 configure-stamp:
 	dh_testdir
 	
@@ -81,6 +79,7 @@
 		debian/redhat-cluster-source/usr/src/modules/redhat-cluster/debian/README.Debian
 	cp debian/redhat-cluster-source.rules \
 		debian/redhat-cluster-source/usr/src/modules/redhat-cluster/debian/rules
+	chmod 755 debian/redhat-cluster-source/usr/src/modules/redhat-cluster/debian/rules
 	cp debian/redhat-cluster-source.Makefile \
 		debian/redhat-cluster-source/usr/src/modules/redhat-cluster/Makefile
 	
@@ -132,7 +131,7 @@
 
 binary: binary-arch binary-indep 
 
-clean: unpatch
+clean: 
 	dh_testdir
 	dh_testroot
 	dh_clean
@@ -140,5 +139,4 @@
 	 [ ! -f make/defines.mk ] || $(MAKE) distclean
 
 	rm -rf *-stamp
-	rm -rf debian/patched