[pkg-nvidia-devel] r824 - in /packages/nvidia-graphics-drivers/trunk: debian.binary/control.template debian.binary/control.template.in debian/changelog debian/rules

[rra at users.alioth.debian.org]

Author: rra
Date: Sun Apr 25 04:25:28 2010
New Revision: 824

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=824
Log:
Simplify template generation method for debian.binary/control.template

[ Andreas Beckmann ]
* debian.binary/control.template: rename to *.in
* debian/rules: use same variable substitutions as for debian/*.in to create
  debian.binary/control.template

Added:
    packages/nvidia-graphics-drivers/trunk/debian.binary/control.template.in
      - copied unchanged from r812, packages/nvidia-graphics-drivers/trunk/debian.binary/control.template
Removed:
    packages/nvidia-graphics-drivers/trunk/debian.binary/control.template
Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/rules

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=824&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sun Apr 25 04:25:28 2010
@@ -48,6 +48,9 @@
   * conftest.h: implement conftest.sh function acpi_walk_namespace (new in
     195.xx), acpi_walk_namespace is available since 2.4.0 (checked with lxr)
   * conftest.h: reorder and make INIT_WORK implementation more complete
+  * debian.binary/control.template: rename to *.in
+  * debian/rules: use same variable substitutions as for debian/*.in to create
+    debian.binary/control.template
 
  -- Russ Allbery <rra at debian.org>  Sat, 24 Apr 2010 20:35:20 -0700
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=824&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Sun Apr 25 04:25:28 2010
@@ -41,6 +41,7 @@
 debian/nvidia-libvdpau1-ia32.symbols \
 debian/nvidia-vdpau-driver-ia32.links \
 debian/nvidia-vdpau-driver.links \
+debian.binary/control.template \
 debian.binary/changelog
 
 
@@ -83,7 +84,7 @@
 build-kernel:
 
 .PHONY: build-kernel-stamp 
-build-kernel-stamp: debian.binary/changelog
+build-kernel-stamp: $(AUTOGEN)
 	    dh_testroot
 	    dh_testdir
 
@@ -92,14 +93,7 @@
 	    
 		# 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 \
-	       if [ -f $(CURDIR)/debian.binary/$$f ]; then \
-		perl -p \
-		-e 's{#VERSION#}{$(version)}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
+	rm -f debian/temp/modules/nvidia-kernel/debian/*.in
 	cp -a debian/copyright $(CURDIR)/debian/temp/modules/nvidia-kernel/debian
 
 	    cp $(CURDIR)/$(dirname)/usr/src/nv/* $(CURDIR)/debian/temp/modules/nvidia-kernel/
@@ -121,7 +115,8 @@
 	    cp $(CURDIR)/patches.h $(CURDIR)/debian/temp/modules/nvidia-kernel/
 
 		# Fix permissions
-	    chmod 755 $(CURDIR)/debian/temp/modules/nvidia-kernel/debian/rules
+	chmod -R a-sx,u=rwX,go=rX debian/temp/modules
+	chmod a+x $(CURDIR)/debian/temp/modules/nvidia-kernel/debian/rules
 	    chown -R root:src $(CURDIR)/debian/temp/modules
 	    
 	    tar -jcvf $(CURDIR)/nvidia-kernel.tar.bz2 -C $(CURDIR)/debian/temp modules