r887 - lvm2/trunk/debian

[Bastian Blank]

Author: waldi
Date: Sun Nov  6 16:56:55 2011
New Revision: 887

Log:
* debian/changelog: Update.
* debian/control
  - Add libcorosync-dev and openais-dev to build-deps.
  - Add corosync to deps of clvm.
* debian/rules: Enable corosync and openais cluster support.

Modified:
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/control
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	Thu Oct 20 21:11:05 2011	(r886)
+++ lvm2/trunk/debian/changelog	Sun Nov  6 16:56:55 2011	(r887)
@@ -1,3 +1,9 @@
+lvm2 (2.02.88-2) UNRELEASED; urgency=low
+
+  * Enable corosync and openais support.
+
+ -- Bastian Blank <waldi at debian.org>  Sun, 06 Nov 2011 00:01:47 +0000
+
 lvm2 (2.02.88-1) unstable; urgency=low
 
   * New upstream version.

Modified: lvm2/trunk/debian/control
==============================================================================
--- lvm2/trunk/debian/control	Thu Oct 20 21:11:05 2011	(r886)
+++ lvm2/trunk/debian/control	Sun Nov  6 16:56:55 2011	(r887)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian LVM Team <pkg-lvm-maintainers at lists.alioth.debian.org>
 Uploaders: Bastian Blank <waldi at debian.org>
-Build-Depends: debhelper (>> 7), automake, libcman-dev (>> 2), libdlm-dev (>> 2), libreadline-gplv2-dev, libselinux1-dev, libudev-dev, pkg-config
+Build-Depends: debhelper (>> 7), automake, libcman-dev (>> 2), libcorosync-dev, libdlm-dev (>> 2), libreadline-gplv2-dev, libselinux1-dev, libudev-dev, openais-dev, pkg-config
 Standards-Version: 3.9.1
 Homepage: http://sources.redhat.com/lvm2/
 Vcs-Svn: svn://svn.debian.org/pkg-lvm/lvm2/trunk/
@@ -37,11 +37,12 @@
 Package: clvm
 Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, lvm2 (= ${binary:Version}), lsb-base, cman
+Depends: ${shlibs:Depends}, ${misc:Depends}, lvm2 (= ${binary:Version}), lsb-base, corosync | cman
 Description: Cluster LVM Daemon for lvm2
- This package provides the clustering interface for lvm2, when used with 
- Red Hat's "cman" cluster infrastructure. It allows logical volumes to
- be created on shared storage devices (eg Fibre Channel, or iSCSI). 
+ This package provides the clustering interface for lvm2, when used with
+ Red Hat's "cman" or corosync based (eg Pacemaker) cluster infrastructure.
+ It allows logical volumes to be created on shared storage devices
+ (eg Fibre Channel, or iSCSI).
 
 Package: libdevmapper-dev
 Section: libdevel

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	Thu Oct 20 21:11:05 2011	(r886)
+++ lvm2/trunk/debian/rules	Sun Nov  6 16:56:55 2011	(r887)
@@ -70,7 +70,7 @@
 	./configure CFLAGS="$(CFLAGS)" \
 		$(CONFIGURE_FLAGS) \
 		--with-optimisation="" \
-		--with-clvmd=cman \
+		--with-clvmd=cman,corosync,openais \
 		--with-cluster=internal \
 		--with-device-uid=0 \
 		--with-device-gid=6 \