r545 - lvm2/trunk/debian

[Bastian Blank]

Author: waldi
Date: Tue Jan 22 16:31:50 2008
New Revision: 545

Log:
* debian/changelog: Update.
* debian/control
  - Add libcman-dev and libdlm-dev to build-deps.
  - Add clvm.
* debian/rules: Build clvm package.


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

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	(original)
+++ lvm2/trunk/debian/changelog	Tue Jan 22 16:31:50 2008
@@ -1,6 +1,7 @@
-lvm2 (2.02.31) UNRELEASED; urgency=low
+lvm2 (2.02.31-1) UNRELEASED; urgency=low
 
   * New upstream version.
+  * Readd clvm.
 
  -- Bastian Blank <waldi at debian.org>  Sun, 20 Jan 2008 11:39:46 +0000
 

Modified: lvm2/trunk/debian/control
==============================================================================
--- lvm2/trunk/debian/control	(original)
+++ lvm2/trunk/debian/control	Tue Jan 22 16:31:50 2008
@@ -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 (>> 4.2), automake, libdevmapper-dev (>> 2:1.02.24), libreadline5-dev, quilt
+Build-Depends: debhelper (>> 4.2), automake, libcman-dev (>> 2), libdevmapper-dev (>> 2:1.02.24), libdlm-dev (>> 2), libreadline5-dev, quilt
 Standards-Version: 3.6.2
 
 Package: lvm2
@@ -33,3 +33,13 @@
  volume groups can be allocated to logical volumes, which are accessed as
  regular block devices.
 
+Package: clvm
+Section: admin
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}, lvm2 (= ${binary:Version})
+Suggests: 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). 

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	(original)
+++ lvm2/trunk/debian/rules	Tue Jan 22 16:31:50 2008
@@ -21,7 +21,7 @@
 BUILD_DIR = debian/build
 STAMPS_DIR = debian/stamps
 
-PACKAGES_DEB = lvm2
+PACKAGES_DEB = lvm2 clvm
 PACKAGES_UDEB = lvm2-udeb
 
 CONFIGURE_FLAGS = --build $(DEB_BUILD_GNU_TYPE)
@@ -54,7 +54,8 @@
 	cd $(DIR); \
 	./configure CFLAGS="$(CFLAGS)" \
 		$(CONFIGURE_FLAGS) \
-		--with-cluster=none \
+		--with-cluster=shared \
+		--with-clvmd=cman \
 		--enable-readline
 	touch $@
 
@@ -116,6 +117,17 @@
 	dh_md5sums
 	dh_builddeb
 
+install-clvm: export DH_OPTIONS = -pclvm
+install-clvm: DIR = $(BUILD_DIR)/build-deb
+install-clvm: $(STAMPS_DIR)/build-deb
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/debian/tmp
+	dh_install --sourcedir=debian/tmp
+	dh_installexamples
+	$(MAKE) -f debian/rules install-base
+
 install-lvm2: export DH_OPTIONS = -plvm2
 install-lvm2: DIR = $(BUILD_DIR)/build-deb
 install-lvm2: $(STAMPS_DIR)/build-deb