r145 - devmapper/trunk/debian

[Bastian Blank]

Author: waldi
Date: Sun Aug 14 09:26:26 2005
New Revision: 145

Modified:
   devmapper/trunk/debian/changelog
   devmapper/trunk/debian/control
   devmapper/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: devmapper/trunk/debian/changelog
==============================================================================
--- devmapper/trunk/debian/changelog	(original)
+++ devmapper/trunk/debian/changelog	Sun Aug 14 09:26:26 2005
@@ -1,7 +1,13 @@
+devmapper (2:1.01.04-2) UNRELEASED; urgency=low
+
+  * Enable selinux support for debs. (closes: #323022)
+
+ -- Bastian Blank <waldi at debian.org>  Sun, 14 Aug 2005 11:14:54 +0200
+
 devmapper (2:1.01.04-1) unstable; urgency=low
 
   * New upstream version.
-  * Explicitly disable selinux support (blocked by #322891).
+  * Explicitly disable selinux support. (blocked by #322891)
 
  -- Bastian Blank <waldi at debian.org>  Sat, 13 Aug 2005 13:16:31 +0200
 

Modified: devmapper/trunk/debian/control
==============================================================================
--- devmapper/trunk/debian/control	(original)
+++ devmapper/trunk/debian/control	Sun Aug 14 09:26:26 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), autotools-dev
+Build-Depends: debhelper (>= 4.2), autotools-dev, libselinux1-dev
 Standards-Version: 3.6.1
 
 Package: libdevmapper-dev

Modified: devmapper/trunk/debian/rules
==============================================================================
--- devmapper/trunk/debian/rules	(original)
+++ devmapper/trunk/debian/rules	Sun Aug 14 09:26:26 2005
@@ -10,44 +10,99 @@
 INSTALL_PROGRAM += -s
 endif
 
-config.status:
+BUILD_DIR = debian/build
+
+PACKAGES_DEB = libdevmapper-dev libdevmapper1.01 dmsetup
+PACKAGES_UDEB = libdevmapper1.01-udeb dmsetup-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
+	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 \
 		--prefix=/usr \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
 		--libdir=/lib --sbindir=/sbin \
-		--enable-compat --disable-selinux
+		--enable-compat
 
-build: build-stamp
-build-stamp: config.status
+$(BUILD_DIR)/build-udeb/config.status: DIR = $(BUILD_DIR)/build-udeb
+$(BUILD_DIR)/build-udeb/config.status:
 	dh_testdir
 
-	$(MAKE)
+	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 \
+		--prefix=/usr \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+		--libdir=/lib --sbindir=/sbin \
+		--with-optimisation=-Os \
+		--enable-compat \
+		--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) -C $(DIR)
+
+	touch $@
+
+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
+
+	$(MAKE) -C $(DIR)
 
 	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f *-stamp
-
-	-$(MAKE) distclean
-	-rm autoconf/config.guess autoconf/config.sub
+	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: