[kernel] r11945 - dists/trunk/redhat-cluster/redhat-cluster/debian

Sat Aug 2 11:48:32 UTC 2008

Author: fs
Date: Sat Aug  2 11:48:31 2008
New Revision: 11945

Log:
New upstream release version 2.03.06.
debian/control: build-depend on linux-libc-dev >= 2.6.26
Add README.source.
cman, rgmanager: Adjust initscript LSB headers.
debian/copyright: new upstream homepage url.



Added:
   dists/trunk/redhat-cluster/redhat-cluster/debian/README.source
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/copyright
   dists/trunk/redhat-cluster/redhat-cluster/debian/rgmanager.init
   dists/trunk/redhat-cluster/redhat-cluster/debian/rules

Added: dists/trunk/redhat-cluster/redhat-cluster/debian/README.source
==============================================================================

--- (empty file)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/README.source	Sat Aug  2 11:48:31 2008
@@ -0,0 +1,25 @@
+README.source for redhat-cluster
+--------------------------------
+
+The source can be obtained following the instructions on
+
+http://sources.redhat.com/cluster/wiki
+
+either by cloning the STABLE2 branch from git, or by downloading
+the 2.x stable release from
+
+ftp://sources.redhat.com/pub/cluster/releases/
+
+
+DFSG-changes
+------------
+
+The only change made to the original tarball to become dfsg-compliant
+was removing the file
+
+csnap/doc/csnap.ps
+
+because the source is missing.
+
+
+ -- Frederik Schüler <fs at debian.org>  Sat, 02 Aug 2008 12:37:36 +0200

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	Sat Aug  2 11:48:31 2008
@@ -1,3 +1,13 @@
+redhat-cluster (2.20080801-1) unstable; urgency=low
+
+  * New upstream release version 2.03.06.
+  * debian/control: build-depend on linux-libc-dev >= 2.6.26
+  * Add README.source.
+  * cman, rgmanager: Adjust initscript LSB headers.
+  * debian/copyright: new upstream homepage url.
+
+ -- Frederik Schüler <fs at debian.org>  Sat, 02 Aug 2008 12:51:37 +0200
+
 redhat-cluster (2.20080629-1) unstable; urgency=low
 
   * New upstram snapshot, includes release 2.03.04.

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	Sat Aug  2 11:48:31 2008
@@ -2,8 +2,10 @@
 
 ### BEGIN INIT INFO
 # Provides:          cluster manager
-# Required-Start:    $network $time
-# Required-Stop:     $network $time
+# Required-Start:    $network $remote_fs
+# Required-Stop:     $network $remote_fs
+# Should-Start:      $named $time $syslog ssh
+# Should-Stop:       $named $time $syslog ssh
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Starts and stops cman
@@ -18,7 +20,11 @@
 
 # ccsd
 
-CCSD_OPTS=""
+if [ -f /etc/defaults/cman ] ; then
+	. /etc/defaults/cman
+fi
+
+[ -z "$CCSD_OPTS" ] && CCSD_OPTS=
 
 # CMAN_CLUSTER_TIMEOUT -- amount of time to wait for joinging a cluster
 #     before giving up.  If CMAN_CLUSTER_TIMEOUT is positive, then we will
@@ -47,9 +53,9 @@
 [ -z "$FENCED_START_TIMEOUT" ] && FENCED_START_TIMEOUT=300
 
 load_modules() {
-	modprobe configfs 2>&1 || true
-	modprobe dlm 2>&1 || true
-	modprobe lock_dlm 2>&1 || true
+	modprobe configfs 2>&1 || return 1
+	modprobe dlm 2>&1 || return 1
+	modprobe lock_dlm 2>&1 || return 1
 }
 
 mount_configfs() {

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	Sat Aug  2 11:48:31 2008
@@ -5,7 +5,7 @@
 Uploaders: Bastian Blank <waldi at debian.org>, Frederik Schüler <fs at debian.org>
 Standards-Version: 3.8.0
 Homepage: http://sources.redhat.com/cluster/wiki
-Build-Depends: dpatch, debhelper (>= 4.2.28), libxml2-dev, libncurses5-dev, libopenais-dev (>= 0.83), libvolume-id-dev (>=  0.105-4), linux-libc-dev (>= 2.6.25), libvirt-dev (>= 0.3.0) [amd64 i386], libnss3-dev [amd64 i386], libnspr4-dev [amd64 i386], bzip2, libslang2-dev
+Build-Depends: dpatch, debhelper (>= 4.2.28), libxml2-dev, libncurses5-dev, libopenais-dev (>= 0.83), libvolume-id-dev (>=  0.105-4), linux-libc-dev (>= 2.6.26), 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/copyright
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/copyright	(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/copyright	Sat Aug  2 11:48:31 2008
@@ -14,7 +14,7 @@
   for some init script fixes and portability patches.
 - A really great and responsive upstream.
 
-Upstream: http://sources.redhat.com/cluster/
+Upstream: http://sources.redhat.com/cluster/wiki
 
 Based on a CVS snapshot from the Ubuntu packages archive.
 

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/rgmanager.init
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/rgmanager.init	(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/rgmanager.init	Sat Aug  2 11:48:31 2008
@@ -2,10 +2,10 @@
 
 ### BEGIN INIT INFO
 # Provides:          cluster service manager
-# Required-Start:    $network cman 
-# Required-Stop:     $network cman
-# Should-Start:      gfs-tools gfs2-tools
-# Should-Stop:       gfs-tools gfs2-tools
+# Required-Start:    cman 
+# Required-Stop:     cman
+# Should-Start:      clvm gfs-tools gfs2-tools
+# Should-Stop:       clvm gfs-tools gfs2-tools
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: start and stop the cluster service manager

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	Sat Aug  2 11:48:31 2008
@@ -98,7 +98,7 @@
 		
 	dh_installdirs
 	dh_link
-	dh_installdocs
+	dh_installdocs -A debian/README.Debian debian/README.source
 	dh_installchangelogs
 	dh_installdebconf
 	dh_installinit -p cman --no-start --no-restart-on-upgrade -- start 61 S . start 5 0 6 .

