Delete the following obsolete file from the svn repository: debian/upstream_info Index: debian/README.source =================================================================== --- debian/README.source (.../anbe-275-bug-script-everywhere) (revision 2229) +++ debian/README.source (.../anbe-276-rules.defs) (revision 2229) @@ -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. Index: debian/rules =================================================================== --- debian/rules (.../anbe-275-bug-script-everywhere) (revision 2229) +++ debian/rules (.../anbe-276-rules.defs) (revision 2229) @@ -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;' \ Index: debian/rules.defs =================================================================== --- debian/rules.defs (.../anbe-275-bug-script-everywhere) (revision 0) +++ debian/rules.defs (.../anbe-276-rules.defs) (revision 2229) @@ -0,0 +1,11 @@ + +NVIDIA_RELEASE = 190.53 + +NVIDIA_DIRNAME_X86 = NVIDIA-Linux-x86-${NVIDIA_RELEASE}-pkg0 +NVIDIA_DIRNAME_X86_64 = NVIDIA-Linux-x86_64-${NVIDIA_RELEASE}-pkg2 +NVIDIA_FILENAME_X86 = ${NVIDIA_DIRNAME_X86}.run +NVIDIA_FILENAME_X86_64 = ${NVIDIA_DIRNAME_X86_64}.run +NVIDIA_BASE_URL_X86 = ftp://download.nvidia.com/XFree86/Linux-x86/${NVIDIA_RELEASE} +NVIDIA_BASE_URL_X86_64 = ftp://download.nvidia.com/XFree86/Linux-x86_64/${NVIDIA_RELEASE} +NVIDIA_URL_X86 = ${NVIDIA_BASE_URL_X86}/${NVIDIA_FILENAME_X86} +NVIDIA_URL_X86_64 = ${NVIDIA_BASE_URL_X86_64}/${NVIDIA_FILENAME_X86_64} Index: debian/changelog =================================================================== --- debian/changelog (.../anbe-275-bug-script-everywhere) (revision 2229) +++ debian/changelog (.../anbe-276-rules.defs) (revision 2229) @@ -105,6 +105,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 Sat, 24 Apr 2010 20:35:20 -0700