[pkg-nvidia-devel] r830 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog rules

[rra at users.alioth.debian.org]

Author: rra
Date: Sun Apr 25 04:43:22 2010
New Revision: 830

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=830
Log:
Reindent and simplify debian/rules

Patch by Andreas Beckmann.

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=830&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sun Apr 25 04:43:22 2010
@@ -76,6 +76,7 @@
   * debian/rules, debian/*.install.in: use dh_install instead of manual
     installation
   * debian/*.dirs: remove or minimize
+  * debian/rules: reindent and simplify
 
  -- 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=830&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Sun Apr 25 04:43:22 2010
@@ -8,21 +8,15 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
-version:=$(shell sh debian/upstream_info VERSION)
+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)
-dirname			 = NVIDIA-Linux
-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)
+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)
 
 AUTOGEN		 = $(AUTOKEEP) $(AUTOCLEAN)
 AUTOKEEP	 = debian/copyright
@@ -120,7 +114,7 @@
 	dh_clean 
 
 	rm -f NVIDIA-Linux NVIDIA-Linux-i386 NVIDIA-Linux-amd64
-	rm -fr $(dirname_x86) $(dirname_x86_64)  nvidia-kernel.tar.bz2
+	rm -fr $(dirname_x86) $(dirname_x86_64) nvidia-kernel.tar.bz2
 	rm -fr debian/temp
 
 	rm -f $(AUTOCLEAN)
@@ -156,7 +150,7 @@
 binary-common:
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs $(CURDIR)/$(dirname)/usr/share/doc/NVIDIA_Changelog
+	dh_installchangelogs NVIDIA-Linux/usr/share/doc/NVIDIA_Changelog
 	dh_installdocs -s 
 	dh_installexamples
 #	dh_installmenu