r924 - lvm2/trunk/debian

[Bastian Blank]

Author: waldi
Date: Wed Jan  2 10:11:23 2013
New Revision: 924

Log:
Drop cluster support.

* debian/changelog: Update.
* debian/clvm.*: Remove.
* debian/control
  - Remove cluster build-depends.
  - Remove clvm binary package.
* debian/rules: Disable building of cluster support.

Deleted:
   lvm2/trunk/debian/clvm.NEWS
   lvm2/trunk/debian/clvm.README.Debian
   lvm2/trunk/debian/clvm.defaults
   lvm2/trunk/debian/clvm.examples
   lvm2/trunk/debian/clvm.init
   lvm2/trunk/debian/clvm.install
Modified:
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/control
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	Mon Nov 19 11:11:37 2012	(r923)
+++ lvm2/trunk/debian/changelog	Wed Jan  2 10:11:23 2013	(r924)
@@ -1,3 +1,10 @@
+lvm2 (2.02.95-6) UNRELEASED; urgency=low
+
+  * Drop cluster (clvm) support. It never properly worked and is more dead
+    than alive.
+
+ -- Bastian Blank <waldi at debian.org>  Wed, 02 Jan 2013 11:04:51 +0100
+
 lvm2 (2.02.95-5) unstable; urgency=low
 
   * Don't discard pv areas on pvmove commands. (closes: #691271)

Modified: lvm2/trunk/debian/control
==============================================================================
--- lvm2/trunk/debian/control	Mon Nov 19 11:11:37 2012	(r923)
+++ lvm2/trunk/debian/control	Wed Jan  2 10:11:23 2013	(r924)
@@ -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: dpkg-dev (>= 1.16.1~), debhelper (>= 8.1.3~), automake, libcman-dev (>> 2), libcorosync-dev, libdlm-dev (>> 2), libreadline-gplv2-dev, libselinux1-dev, libudev-dev, openais-dev, pkg-config
+Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 8.1.3~), automake, libreadline-gplv2-dev, libselinux1-dev, libudev-dev, pkg-config
 Standards-Version: 3.9.1
 Homepage: http://sources.redhat.com/lvm2/
 Vcs-Svn: svn://svn.debian.org/pkg-lvm/lvm2/trunk/
@@ -35,18 +35,6 @@
  volume groups can be allocated to logical volumes, which are accessed as
  regular block devices.
 
-Package: clvm
-Priority: extra
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, lvm2 (= ${binary:Version}), lsb-base
-Recommends: corosync | openais | cman
-Multi-Arch: foreign
-Description: Cluster LVM Daemon for lvm2
- 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
 Architecture: any

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	Mon Nov 19 11:11:37 2012	(r923)
+++ lvm2/trunk/debian/rules	Wed Jan  2 10:11:23 2013	(r924)
@@ -77,8 +77,7 @@
 	$(CONFIGURE) \
 		--libdir=\$${exec_prefix}/lib/$(DEB_HOST_MULTIARCH) \
 		--with-optimisation="$(CFLAGS_OPT_DEB)" \
-		--with-clvmd=cman,corosync,openais \
-		--with-cluster=internal \
+		--with-cluster=none \
 		--with-thin=internal \
 		--with-device-uid=0 \
 		--with-device-gid=6 \
@@ -161,13 +160,6 @@
 	dh_md5sums
 	dh_builddeb $(BUILDDEB_ARGS)
 
-install_clvm: export DH_OPTIONS = -pclvm
-install_clvm: DIR = $(BUILD_DIR)/install_deb
-install_clvm: $(STAMPS_DIR)/install_deb
-	+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
-	dh_installinit --no-start -- start 63 S . start 51 0 6 .
-	+$(MAKE_SELF) install-base
-
 install_dmeventd: export DH_OPTIONS = -pdmeventd
 install_dmeventd: DIR = $(BUILD_DIR)/install_deb
 install_dmeventd: $(STAMPS_DIR)/install_deb install_liblvm2
@@ -246,7 +238,7 @@
 	+$(MAKE_SELF) install-base
 
 binary-indep:
-binary-arch: $(addprefix install_,libdevmapper libdevmapper-udeb libdevmapper-event libdevmapper-dev dmsetup dmsetup-udeb dmeventd liblvm2 lvm2 lvm2-udeb clvm)
+binary-arch: $(addprefix install_,libdevmapper libdevmapper-udeb libdevmapper-event libdevmapper-dev dmsetup dmsetup-udeb dmeventd liblvm2 lvm2 lvm2-udeb)
 
 binary: binary-indep binary-arch