[kernel] r5200 - people/waldi/linux-2.6/debian

[Bastian Blank]

Author: waldi
Date: Tue Jan  3 15:30:03 2006
New Revision: 5200

Modified:
   people/waldi/linux-2.6/debian/rules.real
Log:
debian/rules.real: Use new apply script for arch and subarch patches.


Modified: people/waldi/linux-2.6/debian/rules.real
==============================================================================
--- people/waldi/linux-2.6/debian/rules.real	(original)
+++ people/waldi/linux-2.6/debian/rules.real	Tue Jan  3 15:30:03 2006
@@ -105,7 +105,7 @@
 	rm -rf '$(DIR)'
 	mkdir -p '$(DIR)'
 	cp -al $(srcfiles) '$(DIR)'
-	cd '$(DIR)'; python2.4 '$(CURDIR)/debian/bin/apply.py' -a '$(ARCH)' --overwrite-home='$(CURDIR)/debian/patches-debian' --overwrite-source='$(SOURCE_VERSION)' --overwrite-revisions='$(REVISIONS)'
+	cd '$(DIR)'; python2.4 '$(CURDIR)/debian/bin/apply.py' --overwrite-home='$(CURDIR)/debian/patches-debian' --overwrite-source='$(SOURCE_VERSION)' --overwrite-revisions='$(REVISIONS)'
 	#make-kpkg does this when building kernel-source.
 	mv '$(DIR)/scripts/package/Makefile' '$(DIR)/scripts/package/Makefile.dist'
 	mv '$(DIR)/scripts/package/builddeb' '$(DIR)/scripts/package/builddeb.dist'
@@ -128,12 +128,7 @@
 	cp debian/copyright '$(DIR)/debian'
 	cp debian/control '$(DIR)/debian/control'
 	touch '$(DIR)/debian/official'
-	if [ -n '$(patches)' ]; then			\
-	  cd '$(DIR)';					\
-	  for patch in $(patches); do			\
-	    cat "$(CURDIR)/$$patch" | patch -p1;	\
-	  done;						\
-	fi
+	cd '$(DIR)'; python2.4 '$(CURDIR)/debian/bin/apply.py' -a $(ARCH) -s $(SUBARCH) --overwrite-home='$(CURDIR)/debian/patches-debian' --overwrite-source='$(SOURCE_VERSION)' --overwrite-revisions='$(REVISIONS)'
 	touch '$@'
 #
 # This target performs a build for a particular flavour. Note