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

[Bastian Blank]

Author: waldi
Date: Sun May 10 12:43:44 2009
New Revision: 616

Log:
* debian/changelog: Update.
* debian/control: Build-depend against quilt.
* debian/rules: Use quilt.

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

Modified: trunk/xen-common/debian/changelog
==============================================================================
--- trunk/xen-common/debian/changelog	Sun May 10 12:32:19 2009	(r615)
+++ trunk/xen-common/debian/changelog	Sun May 10 12:43:44 2009	(r616)
@@ -1,6 +1,7 @@
 xen-common (3.3.1-1) UNRELEASED; urgency=low
 
   * New upstream version.
+  * Use quilt instead of dpatch.
 
  -- Bastian Blank <waldi at debian.org>  Sun, 10 May 2009 14:32:18 +0200
 

Modified: trunk/xen-common/debian/control
==============================================================================
--- trunk/xen-common/debian/control	Sun May 10 12:32:19 2009	(r615)
+++ trunk/xen-common/debian/control	Sun May 10 12:43:44 2009	(r616)
@@ -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.7.2.0
-Build-Depends: debhelper (>= 5.0.37.2), dpatch
+Build-Depends: debhelper (>= 5.0.37.2), quilt
 
 Package: xen-utils-common
 Architecture: all

Modified: trunk/xen-common/debian/rules
==============================================================================
--- trunk/xen-common/debian/rules	Sun May 10 12:32:19 2009	(r615)
+++ trunk/xen-common/debian/rules	Sun May 10 12:43:44 2009	(r616)
@@ -19,7 +19,7 @@
 	@rm -rf $(BUILD_DIR)
 	mkdir -p $(BUILD_DIR)
 	cp -a $(srcfiles) $(BUILD_DIR)
-	dpatch -d $(BUILD_DIR) apply-all
+	cd $(BUILD_DIR); QUILT_PATCHES=$(CURDIR)/debian/patches quilt --quiltrc /dev/null push -a || test $$? = 2
 	touch $@
 
 build: $(STAMPS_DIR)/source
@@ -50,9 +50,6 @@
 	tar -C ../orig -xzf $(TAR_ORIG)
 endif
 
-# This is to make dpatch-edit-patch work
-unpatch: clean
-
 maintainerclean:
 	rm -rf $(filter-out $(NO_ORIG), $(wildcard * .[^.]*))