[Pkg-xen-changes] r845 - trunk/xen-common/debian

[Bastian Blank]

Author: waldi
Date: Wed Mar 23 09:46:31 2011
New Revision: 845

Log:
* debian/control: Remove quilt build-dep.
* debian/rules
  - Don't use quilt.
  - Fix stamp files.

Modified:
   trunk/xen-common/debian/control
   trunk/xen-common/debian/rules

Modified: trunk/xen-common/debian/control
==============================================================================
--- trunk/xen-common/debian/control	Wed Mar 23 09:42:34 2011	(r844)
+++ trunk/xen-common/debian/control	Wed Mar 23 09:46:31 2011	(r845)
@@ -4,7 +4,7 @@
 Maintainer: Debian Xen Team <pkg-xen-devel at lists.alioth.debian.org>
 Uploaders: Julien Danjou <acid at debian.org>, Guido Trotter <ultrotter at debian.org>, Bastian Blank <waldi at debian.org>
 Standards-Version: 3.8.4
-Build-Depends: debhelper (>> 7), quilt
+Build-Depends: debhelper (>> 7)
 
 Package: xen-utils-common
 Architecture: all

Modified: trunk/xen-common/debian/rules
==============================================================================
--- trunk/xen-common/debian/rules	Wed Mar 23 09:42:34 2011	(r844)
+++ trunk/xen-common/debian/rules	Wed Mar 23 09:46:31 2011	(r845)
@@ -12,19 +12,16 @@
 BUILD_DIR = debian/build
 STAMPS_DIR = debian/stamps
 
-$(STAMPS_DIR)/source:
-	@mkdir -p $(STAMPS_DIR)
-	QUILT_PATCHES=$(CURDIR)/debian/patches quilt --quiltrc /dev/null push -a || test $$? = 2
-	touch $@
+stamp = [ -d $(dir $@) ] || mkdir $(dir $@); touch $@
 
 $(STAMPS_DIR)/setup: SOURCE_FILES = $(filter-out debian, $(wildcard *))
 $(STAMPS_DIR)/setup: DIR=$(BUILD_DIR)
-$(STAMPS_DIR)/setup: $(STAMPS_DIR)/source
+$(STAMPS_DIR)/setup:
 	@rm -rf $(DIR)
 	mkdir $(DIR)
 	cp -al $(SOURCE_FILES) $(DIR)
 	cp -al debian/scripts $(DIR)
-	touch $@
+	$(stamp)
 
 build: $(STAMPS_DIR)/setup
 	make -C $(BUILD_DIR)/docs man-pages
@@ -55,7 +52,7 @@
 	rm -rf $(filter-out $(NO_ORIG), $(wildcard * .[^.]*))
 
 install: export DESTDIR=$(CURDIR)/debian/tmp
-install: $(STAMPS_DIR)/source
+install:
 	dh_testdir
 	dh_testroot
 	dh_prep