[kernel] r13004 - dists/trunk/redhat-cluster/redhat-cluster/debian

[Bastian Blank]

Author: waldi
Date: Sat Mar  7 13:03:04 2009
New Revision: 13004

Log:
* debian/changelog: Update.
* debian/control
  - Remove dpatch build-dep
  - Add quilt build-dep.
* debian/rules
  - Use quilt.
  - Build in subdir.


Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
   dists/trunk/redhat-cluster/redhat-cluster/debian/control
   dists/trunk/redhat-cluster/redhat-cluster/debian/rules

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/changelog	(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/changelog	Sat Mar  7 13:03:04 2009
@@ -1,6 +1,7 @@
 redhat-cluster (1:2.03.11-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Use quilt.
 
  -- Bastian Blank <waldi at debian.org>  Sat, 07 Mar 2009 12:41:31 +0100
 

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/control
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/control	(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/control	Sat Mar  7 13:03:04 2009
@@ -5,7 +5,7 @@
 Uploaders: Bastian Blank <waldi at debian.org>, Frederik Schüler <fs at debian.org>
 Standards-Version: 3.8.0
 Homepage: http://sources.redhat.com/cluster/wiki
-Build-Depends: dpatch, debhelper (>= 4.2.28), libxml2-dev, libncurses5-dev, libopenais-dev (>= 0.83), libvolume-id-dev (>=  0.105-4), linux-libc-dev (>= 2.6.26), libvirt-dev (>= 0.3.0) [amd64 i386], libnss3-dev [amd64 i386], libnspr4-dev [amd64 i386], bzip2, libslang2-dev
+Build-Depends: debhelper (>= 4.2.28), libxml2-dev, libncurses5-dev, libopenais-dev (>= 0.83), libvolume-id-dev (>=  0.105-4), linux-libc-dev (>= 2.6.26), libvirt-dev (>= 0.3.0) [amd64 i386], libnss3-dev [amd64 i386], libnspr4-dev [amd64 i386], bzip2, libslang2-dev, quilt
 Build-Conflicts: libccs-dev, libcman-dev (<= 2.0), libdlm-dev (<= 2.0), libcman2, libdlm2
 
 Package: redhat-cluster-suite

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/rules
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/rules	(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/rules	Sat Mar  7 13:03:04 2009
@@ -20,11 +20,22 @@
 SOMAJOR=2
 SOMINOR=3
 
-configure: patch configure-stamp
-configure-stamp:
-	dh_testdir
-	
-	./configure --kernel_src=$(BUILDROOT) \
+BUILD_DIR = debian/build
+STAMPS_DIR = debian/stamps
+SOURCE_FILES = $(filter-out .svn .svk debian, $(wildcard * .[^.]*))
+
+setup: $(STAMPS_DIR)/setup
+
+$(STAMPS_DIR)/setup: DIR = $(BUILD_DIR)/build
+$(STAMPS_DIR)/setup: $(BUILD_DIR) $(STAMPS_DIR)
+	dh_testdir
+	@rm -rf $(DIR)
+	mkdir $(DIR)
+	cp -a $(SOURCE_FILES) $(DIR)
+	cd $(DIR); QUILT_PATCHES=$(CURDIR)/debian/patches quilt --quiltrc /dev/null push -a || test $$? = 2
+	touch $@
+	cd $(DIR); \
+		./configure --kernel_src=$(BUILDROOT) \
 		    --kernel_build=$(BUILDROOT) \
 		    --sbindir=/usr/sbin \
 			$(BUILD_XEN) \
@@ -36,24 +47,37 @@
 			--disable_kernel_check
 	
 	# disable kernel modules
-	sed -i -e 's/-kernel.* \?=/& 1/g' make/defines.mk
+	sed -i -e 's/-kernel.* \?=/& 1/g' $(DIR)/make/defines.mk
 	
 	touch $@
 
-build: configure build-stamp
-build-stamp:
+build: $(STAMPS_DIR)/build
+
+$(STAMPS_DIR)/build: DIR = $(BUILD_DIR)/build
+$(STAMPS_DIR)/build: $(STAMPS_DIR)/setup
 	dh_testdir
+	$(MAKE) -C $(DIR) all
+	touch $@
 
-	$(MAKE) all
+$(BUILD_DIR) $(STAMPS_DIR):
+	@[ -d $@ ] || mkdir $@
 
-	touch $@
+clean:
+	dh_testdir
+	rm -rf $(BUILD_DIR) $(STAMPS_DIR)
+	dh_clean
 
-install: build
+maintainerclean:
+	rm -rf $(SOURCE_FILES)
+
+install: DIR = $(BUILD_DIR)/build
+install: INSTALL_DIR = $(BUILD_DIR)/install
+install: $(STAMPS_DIR)/build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	
-	$(MAKE) install DESTDIR=$(BUILDROOT)/debian/tmp/
+	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/debian/tmp/
 	
 	# manual craft
 	install -d -m 0755 debian/tmp/etc/cluster
@@ -118,7 +142,7 @@
 	dh_compress -a
 	dh_fixperms -a
 	dh_makeshlibs -a
-	dh_shlibdeps -a -l$(BUILDROOT)/debian/tmp/usr/lib
+	dh_shlibdeps -a -l$(CURDIR)/debian/tmp/usr/lib
 	dh_installdeb -a
 	dh_gencontrol -a
 	dh_md5sums -a
@@ -146,19 +170,8 @@
 $(DIR_ORIG):
 ifeq ($(TAR_ORIG),)
 	$(error Cannot find orig tarball $(TAR_ORIG_NAME))
-else
+else   
 	mkdir -p ../orig
 	tar -C ../orig -xzf $(TAR_ORIG)
 endif
 
-maintainerclean:
-	rm -rf $(filter-out debian .svk .svn, $(wildcard * .[^.]*))
-
-clean: unpatch
-	dh_testdir
-	dh_clean
-	
-	 [ ! -f make/defines.mk ] || $(MAKE) distclean
-	
-	rm -rf *-stamp
-	rm -rf debian/patched