[kernel] r15026 - people/waldi/s390/s390-tools/debian

[Bastian Blank]

Author: waldi
Date: Wed Jan 27 10:44:56 2010
New Revision: 15026

Log:
debian/rules
- Support 3.0 (quilt) format.
- Use tar.bz2 as orig.

Modified:
   people/waldi/s390/s390-tools/debian/rules

Modified: people/waldi/s390/s390-tools/debian/rules
==============================================================================
--- people/waldi/s390/s390-tools/debian/rules	Wed Jan 27 10:44:09 2010	(r15025)
+++ people/waldi/s390/s390-tools/debian/rules	Wed Jan 27 10:44:56 2010	(r15026)
@@ -14,13 +14,12 @@
 $(STAMPS_DIR)/setup: SOURCE_FILES = $(filter-out debian .svn .svk, $(wildcard * .[^.]*))
 $(STAMPS_DIR)/setup: DIR = $(BUILD_DIR)/build
 $(STAMPS_DIR)/setup:
-	@[ -d $(BUILD_DIR) ] || mkdir $(BUILD_DIR)
-	@[ -d $(STAMPS_DIR) ] || mkdir $(STAMPS_DIR)
+	@[ -d $(STAMPS_DIR) ] || mkdir -p $(STAMPS_DIR)
 	dh_testdir
 	@rm -rf $(DIR)
-	mkdir $(DIR)
+	QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null push -a || test $$? = 2
+	mkdir -p $(DIR)
 	cp -a $(SOURCE_FILES) $(DIR)
-	cd $(DIR); QUILT_PATCHES=$(CURDIR)/debian/patches quilt --quiltrc /dev/null push -a || test $$? = 2
 	touch $@
 
 build: $(STAMPS_DIR)/build
@@ -72,7 +71,7 @@
 binary: binary-indep binary-arch
 
 DIR_ORIG = ../orig/$(SOURCE)-$(VERSION)
-TAR_ORIG_NAME = $(SOURCE)_$(VERSION).orig.tar.gz
+TAR_ORIG_NAME = $(SOURCE)_$(VERSION).orig.tar.bz2
 TAR_ORIG = $(firstword $(wildcard ../$(TAR_ORIG_NAME)) $(wildcard ../orig/$(TAR_ORIG_NAME)))
 
 orig: $(DIR_ORIG)
@@ -83,6 +82,6 @@
 	$(error Cannot find orig tarball $(TAR_ORIG_NAME))
 else
 	mkdir -p ../orig
-	tar -C ../orig -xzf $(TAR_ORIG)
+	tar -C ../orig -xjf $(TAR_ORIG)
 endif