[pkg-nvidia-devel] r858 - in /packages/nvidia-graphics-drivers/trunk/debian: README.source changelog rules upstream_info

[rra at users.alioth.debian.org]

Author: rra
Date: Sat May  8 03:40:41 2010
New Revision: 858

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=858
Log:
Replace debian/upstream_info with a makefile fragment

[ Andreas Beckmann ]
* replace shell script debian/upstream_info with makefile fragment
  debian/rules.defs

Removed:
    packages/nvidia-graphics-drivers/trunk/debian/upstream_info
Modified:
    packages/nvidia-graphics-drivers/trunk/debian/README.source
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/rules

Modified: packages/nvidia-graphics-drivers/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/README.source?rev=858&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/README.source (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/README.source Sat May  8 03:40:41 2010
@@ -17,8 +17,8 @@
 
           tar czvf nvidia-graphics-drivers_190.53.orig.tar.gz
 
-    * Edit debian/upstream_info in the Debian package and change RELEASE
-      to the appropriate value.
+    * Edit debian/rules.defs in the Debian package and change
+      NVIDIA_RELEASE to the appropriate value.
 
     * Edit debian/module/conftest.h if necessary for kernel compatibility
       and test.

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=858&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sat May  8 03:40:41 2010
@@ -99,6 +99,8 @@
     - reorder packages for better logical grouping
   * install the bug-script in all packages as well as in the binary modules
     packages built from nvidia-kernel-source
+  * replace shell script debian/upstream_info with makefile fragment
+    debian/rules.defs
 
  -- 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=858&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Sat May  8 03:40:41 2010
@@ -5,13 +5,14 @@
 
 DEB_BUILD_ARCH		?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-version			:= $(shell sh debian/upstream_info VERSION)
-url_x86			:= $(shell sh debian/upstream_info URL_X86)
-url_x86_64		:= $(shell sh debian/upstream_info URL_X86_64)
-filename_x86		:= $(shell sh debian/upstream_info FILENAME_X86)
-filename_x86_64		:= $(shell sh debian/upstream_info FILENAME_X86_64)
-dirname_x86		:= $(shell sh debian/upstream_info DIRNAME_X86)
-dirname_x86_64		:= $(shell sh debian/upstream_info DIRNAME_X86_64)
+include debian/rules.defs
+version			 = $(NVIDIA_RELEASE)
+url_x86			 = $(NVIDIA_URL_X86)
+url_x86_64		 = $(NVIDIA_URL_X86_64)
+filename_x86		 = $(NVIDIA_FILENAME_X86)
+filename_x86_64		 = $(NVIDIA_FILENAME_X86_64)
+dirname_x86		 = $(NVIDIA_DIRNAME_X86)
+dirname_x86_64		 = $(NVIDIA_DIRNAME_X86_64)
 
 TEMPLATES	:= $(wildcard debian/*.in)
 AUTOGEN		+= $(patsubst %.in,%,$(TEMPLATES))
@@ -123,7 +124,7 @@
 
 
 # Generating control files
-%:	%.in debian/upstream_info
+%:	%.in debian/rules.defs
 	perl -p \
 	-e 's{#VERSION#}{$(version)}g;' \
 	-e 's{#URL_X86#}{$(url_x86)}g;' \