r42 - lvm2/trunk/debian

[Bastian Blank]

Author: waldi
Date: Sat Feb 26 20:07:33 2005
New Revision: 42

Modified:
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/control
   lvm2/trunk/debian/rules
Log:
* debian/changelog: Update.
* debian/control, debian/rules: Always build clvmd and bump version of needed libdlm.


Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	(original)
+++ lvm2/trunk/debian/changelog	Sat Feb 26 20:07:33 2005
@@ -1,3 +1,10 @@
+lvm2 (2.01.04-1.unreleased-1) UNRELEASED; urgency=low
+
+  * New maintainer.
+  * Always build clvmd and bump version of needed libdlm.
+
+ -- Bastian Blank <waldi@debian.org>  Sat, 26 Feb 2005 19:17:44 +0100
+
 lvm2 (2.01.04-1) unstable; urgency=low
 
   * New upstream

Modified: lvm2/trunk/debian/control
==============================================================================
--- lvm2/trunk/debian/control	(original)
+++ lvm2/trunk/debian/control	Sat Feb 26 20:07:33 2005
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian LVM Team <pkg-lvm-maintainers@lists.alioth.debian.org>
 Uploaders: Bastian Blank <waldi@debian.org>, Andres Salomon <dilinger@debian.org>
-Build-Depends: cdbs (>= 0.4.20), debhelper (>> 4.1.16), libdevmapper-dev (>= 2:1.00.07-1), libreadline4-dev, autotools-dev, libdlm-dev
+Build-Depends: cdbs (>= 0.4.20), debhelper (>> 4.1.16), libdevmapper-dev (>= 2:1.00.07-1), libreadline4-dev, autotools-dev, libdlm-dev (>= 0.trunk20050206-2)
 Standards-Version: 3.6.1
 
 Package: lvm2
@@ -38,7 +38,7 @@
 Package: clvm
 Section: admin
 Priority: extra
-Architecture: i386 ia64 powerpc arm mips hppa alpha mipsel m68k
+Architecture: any
 Depends: ${shlibs:Depends}, lvm2 (>> 2.0.23)
 Suggests: cman, fence
 Description: Cluster LVM Daemon for lvm2

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	(original)
+++ lvm2/trunk/debian/rules	Sat Feb 26 20:07:33 2005
@@ -17,14 +17,11 @@
         DEB_CONFIGURE_EXTRA_FLAGS := --disable-o_direct
 endif
 
-ifeq (clvm, $(findstring clvm, $(DEB_ARCH_PACKAGES)))
-  DEB_CONFIGURE_EXTRA_FLAGS += --with-clvmd=cman --with-cluster=shared
-endif
-
 DEB_CONFIGURE_PREFIX = /
 DEB_CONFIGURE_MANDIR = "\$${prefix}/usr/share/man"
 DEB_CONFIGURE_INFODIR = "\$${prefix}/usr/share/info"
 DEB_CONFIGURE_EXTRA_FLAGS += --with-confdir=/etc/lvm
+DEB_CONFIGURE_EXTRA_FLAGS += --with-clvmd=cman --with-cluster=shared
 DEB_AC_AUX_DIR := $(DEB_SRCDIR)/autoconf
 
 DEB_MAKE_INSTALL_TARGET = install prefix=$(DEB_DESTDIR) sbindir=$(DEB_DESTDIR)/lib/lvm-200 confdir=$(DEB_DESTDIR)/etc/lvm