r148 - lvm2/trunk/debian

[Bastian Blank]

Author: waldi
Date: Mon Aug 15 16:22:05 2005
New Revision: 148

Modified:
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/control
   lvm2/trunk/debian/rules
Log:
* debian/changelog: Update.
* debian/control: Add libselinux1-dev to build depends.
* debian/rules: Use seperate build dirs and copy anything into them.


Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	(original)
+++ lvm2/trunk/debian/changelog	Mon Aug 15 16:22:05 2005
@@ -1,8 +1,10 @@
 lvm2 (2.01.14-1) UNRELEASED; urgency=low
 
   * New upstream version. (closes: #320454)
+  * Enable selinux support for debs. (closes: #315505)
+  * Change optimization for udebs.
 
- -- Bastian Blank <waldi at debian.org>  Sat, 13 Aug 2005 10:39:30 +0200
+ -- Bastian Blank <waldi at debian.org>  Mon, 15 Aug 2005 18:21:26 +0200
 
 lvm2 (2.01.12-2) unstable; urgency=low
 

Modified: lvm2/trunk/debian/control
==============================================================================
--- lvm2/trunk/debian/control	(original)
+++ lvm2/trunk/debian/control	Mon Aug 15 16:22:05 2005
@@ -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>, Andres Salomon <dilinger at debian.org>
-Build-Depends: debhelper (>> 4.2), libdevmapper-dev (>= 2:1.00.07-1), autotools-dev, libdlm-dev (>= 0.trunk20050206-2)
+Build-Depends: debhelper (>> 4.2), libdevmapper-dev (>= 2:1.00.07-1), autotools-dev, libdlm-dev (>= 0.trunk20050206-2), libselinux1-dev
 Standards-Version: 3.6.1
 
 Package: lvm2

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	(original)
+++ lvm2/trunk/debian/rules	Mon Aug 15 16:22:05 2005
@@ -20,8 +20,7 @@
 	--exec-prefix= \
 	--mandir=\$${prefix}/share/man \
 	--infodir=\$${prefix}/share/info \
-	--with-confdir=\$${exec_prefix}/etc \
-	--with-clvmd=cman --with-cluster=shared
+	--with-confdir=\$${exec_prefix}/etc
 
 ifneq (,$(findstring $(DEB_HOST_ARCH), arm hpp mips mipsel))
 CONFIGURE_FLAGS += --disable-o_direct
@@ -29,38 +28,93 @@
 
 CFLAGS += -I$(CURDIR)/debian/include/$(DEB_HOST_ARCH)
 
-config.status:
+BUILD_DIR = debian/build
+
+PACKAGES_DEB = lvm2 clvm
+PACKAGES_UDEB = lvm2-udeb
+
+$(BUILD_DIR)/build-deb/config.status: DIR = $(BUILD_DIR)/build-deb
+$(BUILD_DIR)/build-deb/config.status:
 	dh_testdir
 
-	cp -f /usr/share/misc/config.sub /usr/share/misc/config.guess autoconf
-	./configure CFLAGS="$(CFLAGS)" $(CONFIGURE_FLAGS)
+	rm -rf $(DIR)
+	mkdir -p $(DIR)
+	cp -al $(filter-out debian, $(wildcard *)) $(DIR)
+	cp --remove-destination /usr/share/misc/config.sub /usr/share/misc/config.guess $(DIR)/autoconf
+	cd $(DIR); \
+	./configure CFLAGS="$(CFLAGS)" $(CONFIGURE_FLAGS) \
+		--with-cluster=shared \
+		--with-clvmd=cman \
+		--with-pool=internal
+
+$(BUILD_DIR)/build-udeb/config.status: DIR = $(BUILD_DIR)/build-udeb
+$(BUILD_DIR)/build-udeb/config.status:
+	dh_testdir
 
-build: build-stamp
-build-stamp: config.status
+	rm -rf $(DIR)
+	mkdir -p $(DIR)
+	cp -al $(filter-out debian, $(wildcard *)) $(DIR)
+	cp --remove-destination /usr/share/misc/config.sub /usr/share/misc/config.guess $(DIR)/autoconf
+	cd $(DIR); \
+	./configure CFLAGS="$(CFLAGS)" $(CONFIGURE_FLAGS) \
+		--with-optimisation="-Os" \
+		--with-cluster=none \
+		--with-pool=none \
+		--disable-selinux
+
+build: build-deb build-udeb
+
+build-deb: $(BUILD_DIR)/build-deb-stamp
+$(BUILD_DIR)/build-deb-stamp: DIR = $(BUILD_DIR)/build-deb
+$(BUILD_DIR)/build-deb-stamp: $(BUILD_DIR)/build-deb/config.status
 	dh_testdir
 
-	$(MAKE)
+	$(MAKE) -C $(DIR)
 
 	touch $@
 
-clean:
+build-udeb: $(BUILD_DIR)/build-udeb-stamp
+$(BUILD_DIR)/build-udeb-stamp: DIR = $(BUILD_DIR)/build-udeb
+$(BUILD_DIR)/build-udeb-stamp: $(BUILD_DIR)/build-udeb/config.status
 	dh_testdir
-	rm -f *-stamp
 
-	-$(MAKE) distclean
-	-rm autoconf/config.guess autoconf/config.sub
+	$(MAKE) -C $(DIR)
+
+	touch $@
+
+clean:
+	dh_testdir
+	rm -rf $(BUILD_DIR)
 
 	dh_clean
 
-install: build
+install: install-deb install-udeb
+
+install-deb: DH_OPTIONS = $(addprefix -p,$(PACKAGES_DEB))
+install-deb: DIR = $(BUILD_DIR)/build-deb
+install-deb: INSTALL_DIR = $(BUILD_DIR)/install-deb
+install-deb: build-deb
+	dh_testdir
+	dh_testroot
+	dh_clean -k $(DH_OPTIONS)
+
+	rm -rf $(INSTALL_DIR)
+	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/$(INSTALL_DIR)
+
+	dh_install $(DH_OPTIONS) --sourcedir=$(INSTALL_DIR)
+
+install-udeb: DH_OPTIONS = $(addprefix -p,$(PACKAGES_UDEB))
+install-udeb: DIR = $(BUILD_DIR)/build-udeb
+install-udeb: INSTALL_DIR = $(BUILD_DIR)/install-udeb
+install-udeb: build-udeb
 	dh_testdir
 	dh_testroot
-	dh_clean -k
-	dh_installdirs
+	dh_clean -k $(DH_OPTIONS)
 
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	rm -rf $(INSTALL_DIR)
+	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/$(INSTALL_DIR)
 
-	dh_install --sourcedir=debian/tmp
+	dh_install $(DH_OPTIONS) --sourcedir=$(INSTALL_DIR)
 
 # Build architecture-independent files here.
 binary-indep: