[pkg-nvidia-devel] r769 - in /packages/nvidia-graphics-drivers/trunk: debian.binary/rules debian/rules

[rra at users.alioth.debian.org]

Author: rra
Date: Wed Apr  7 05:38:54 2010
New Revision: 769

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=769
Log:
Fixes to the new quilt patching from Andreas Beckmann

Updated patch, fixes a permission problem. (The patches/ directory in
module source tarball in nvidia-kernel-source was shipped as 0644.)
Also avoid calling dh_quilt_patch when there is no debian/control.

Modified:
    packages/nvidia-graphics-drivers/trunk/debian.binary/rules
    packages/nvidia-graphics-drivers/trunk/debian/rules

Modified: packages/nvidia-graphics-drivers/trunk/debian.binary/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian.binary/rules?rev=769&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian.binary/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian.binary/rules Wed Apr  7 05:38:54 2010
@@ -23,13 +23,13 @@
 -include /usr/share/modass/include/common-rules.make
 
 configure:
-	dh_quilt_patch
 	sed 's/#KVERS#/$(KVERS)/g' debian/control.template > $(CURDIR)/debian/control
 	sed 's/#KVERS#/$(KVERS)/g' debian/dirs.template > $(CURDIR)/debian/dirs
 	sed 's/#KVERS#/$(KVERS)/g' debian/override.template > $(CURDIR)/debian/override
 
 binary-modules: configure
 	dh_testroot
+	dh_quilt_patch
 
 	dh_prep
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=769&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Wed Apr  7 05:38:54 2010
@@ -112,7 +112,8 @@
 		# Prepare debian files for module package
 	    cp -a $(CURDIR)/debian.binary/* $(CURDIR)/debian/temp/modules/nvidia-kernel/debian
 	    for f in `ls $(CURDIR)/debian.binary` ; do \
-	       test ! -f $(CURDIR)/debian.binary/$$f || perl -p \
+	       if [ -f $(CURDIR)/debian.binary/$$f ]; then \
+		perl -p \
 	        -e 's{#BASE_VERSION#}{$(base_version)}g;' \
 		-e 's{#RELEASE#}{$(release)}g;' \
 		-e 's{#VERSION#}{$(version)}g;' \
@@ -120,6 +121,7 @@
 		-e 's{#URL#}{$(url)}g' \
 		< $(CURDIR)/debian.binary/$$f >		$(CURDIR)/debian/temp/modules/nvidia-kernel/debian/$$f ; \
 		chmod 0644 $(CURDIR)/debian/temp/modules/nvidia-kernel/debian/$$f ; \
+	      fi \
 	    done
 
 #	    chmod 775 $(CURDIR)/debian/temp/modules/nvidia-kernel/debian/patches