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

[Guido Günther]

The following commit has been merged in the master branch:
commit ea29a3c57a5fd6bafab06fb35f1185bf71a0b04e
Merge: 14e26cfc77baef0700698efaa597be7a00666840 aa6bf55834114024972971cb34404e31916ffe58
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sat May 1 10:47:17 2010 +0200

    Merge branch 'experimental'

diff --combined debian/changelog
index 80739c7,b1a4723..bb2fea5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,19 +1,25 @@@
+ redhat-cluster (3.0.9-1) experimental; urgency=low
+ 
+   * [7c1a75c] Imported Upstream version 3.0.7
+   * [9381ece] Drop 0003-Do-nothing-if-cman_tool-isn-t-there.patch fixed
+     upstream
+   * [8ed7908] Bump (build-)dep on corosync
+   * [5b162fa] Enable gfs since it defaults to off now upstream.
+   * [1d4ad8f] Imported Upstream version 3.0.9
+   * [09c214b] Version dependencies of meta package
+   * [4352b38] Redo patches
+   * [61487cc] New patch 0003-Don-t-rely-on-chkconfig-and-check-for-
+     network-manage.patch Don't rely on chkconfig and check for network-
+     manager
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Wed, 10 Mar 2010 22:29:05 +0100
+ 
 +redhat-cluster (3.0.6-5) unstable; urgency=low
 +
 +  * [ebda28c] Don't ship drbd resource script (Closes: #566095)
 +
 + -- Guido Günther <agx at sigxcpu.org>  Fri, 22 Jan 2010 20:45:52 +0100
 +
  redhat-cluster (3.0.6-4) unstable; urgency=low
  
    * [9725a65] Only install schema (Closes: #565382)
diff --combined debian/rules
index ea0dcd6,65dfe27..ee58cb8
--- a/debian/rules
+++ b/debian/rules
@@@ -18,6 -18,7 +18,7 @@@ configure-stamp
  		    --nsprincdir=/usr/include/nspr \
  		    --libexecdir=/usr/lib \
  		    --disable_kernel_check \
+ 		    --enable_gfs \
  		    --without_kernel_modules
  
  	touch $@
@@@ -45,10 -46,6 +46,10 @@@ install: buil
  	# no need for upstream doc install
  	rm -rf $(BUILDROOT)/debian/tmp/usr/share/doc/cluster
  
 +	# drbd8 ships this itself
 +	rm -f $(BUILDROOT)/debian/tmp/usr/share/cluster/drbd.metadata
 +	rm -f $(BUILDROOT)/debian/tmp/usr/share/cluster/drbd.sh
 +
  	# manual craft
  	install -d -m 0755 debian/tmp/etc/cluster
  

-- 
cluster suite Debian packaging