Index: debian/README.source =================================================================== --- debian/README.source (.../anbe-208-cleanup-outdated) (revision 1909) +++ debian/README.source (.../anbe-211-simplify-upstream-info) (revision 1909) @@ -9,6 +9,7 @@ * Download the pkg0.run file for i386 and the pkg2.run file for amd64 from upstream. The pkg2.run file has the ia32 libraries in it. + uscan can be used to download the two files. * mkdir nvidia-graphics-drivers-190.53.orig and place package files in that directory. Make them executable. Then, create the orig @@ -17,7 +18,7 @@ tar czvf nvidia-graphics-drivers_190.53.orig.tar.gz * Edit debian/upstream_info in the Debian package and change RELEASE - and NEXTVER to the appropriate values. + to the appropriate value. * Edit conftest.h if necessary for kernel compatibility and test. Index: debian/upstream_info =================================================================== --- debian/upstream_info (.../anbe-208-cleanup-outdated) (revision 1909) +++ debian/upstream_info (.../anbe-211-simplify-upstream-info) (revision 1909) @@ -1,50 +1,26 @@ -eval `dpkg-architecture` +#!/bin/sh -#BASE_VERSION=1.0 RELEASE=190.53 -NEXTVER=190.54 -if [ "$DEB_BUILD_ARCH" = "amd64" ] ; then - BASE_URL=ftp://download.nvidia.com/XFree86/Linux-x86_64/${RELEASE} - DIRNAME=NVIDIA-Linux-x86_64-${RELEASE}-pkg2 - # change this on next version release - FILENAME=$DIRNAME.run -elif [ "$DEB_BUILD_ARCH" = "i386" ] ; then - BASE_URL=ftp://download.nvidia.com/XFree86/Linux-x86/${RELEASE} - DIRNAME=NVIDIA-Linux-x86-${RELEASE}-pkg0 - FILENAME="$DIRNAME.run" -else - echo "huh? dont know about a version of this driver for your architecture." - exit 1 -fi -FILENAME_X86=NVIDIA-Linux-x86-${RELEASE}-pkg0.run -FILENAME_X86_64=NVIDIA-Linux-x86_64-${RELEASE}-pkg2.run +############################################################################ + DIRNAME_X86=NVIDIA-Linux-x86-${RELEASE}-pkg0 DIRNAME_X86_64=NVIDIA-Linux-x86_64-${RELEASE}-pkg2 +FILENAME_X86=${DIRNAME_X86}.run +FILENAME_X86_64=${DIRNAME_X86_64}.run +BASE_URL_X86=ftp://download.nvidia.com/XFree86/Linux-x86/${RELEASE} +BASE_URL_X86_64=ftp://download.nvidia.com/XFree86/Linux-x86_64/${RELEASE} -VERSION=${RELEASE} -UPSTREAMVERSION=${RELEASE} -URL=${BASE_URL}/${FILENAME} - case "$1" in - BASE_VERSION) - echo "${BASE_VERSION}" - ;; - RELEASE) + VERSION) echo "$RELEASE" ;; - VERSION) - echo "$VERSION" + URL_X86) + echo "$BASE_URL_X86/$FILENAME_X86" ;; - NEXTVER) - echo "$NEXTVER" + URL_X86_64) + echo "$BASE_URL_X86_64/$FILENAME_X86_64" ;; - URL) - echo "$URL" - ;; - FILENAME) - echo "$FILENAME" - ;; FILENAME_X86_64) echo "$FILENAME_X86_64" ;; @@ -57,13 +33,6 @@ DIRNAME_X86) echo "$DIRNAME_X86" ;; - DIRNAME) - echo "$DIRNAME" - ;; - UPSTREAMVERSION) - echo "$UPSTREAMVERSION" - ;; - esac exit 0 Index: debian/rules =================================================================== --- debian/rules (.../anbe-208-cleanup-outdated) (revision 1909) +++ debian/rules (.../anbe-211-simplify-upstream-info) (revision 1909) @@ -15,14 +15,10 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) -base_version:=$(shell sh debian/upstream_info BASE_VERSION) -release:=$(shell sh debian/upstream_info RELEASE) version:=$(shell sh debian/upstream_info VERSION) -nextver:=$(shell sh debian/upstream_info NEXTVER) -upstreamversion:=$(shell sh debian/upstream_info UPSTREAMVERSION) -url:=$(shell sh debian/upstream_info URL) -dirname:=$(shell sh debian/upstream_info DIRNAME) -filename:=$(shell sh debian/upstream_info FILENAME) +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) @@ -99,11 +95,7 @@ for f in `ls $(CURDIR)/debian.binary` ; do \ 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;' \ - -e 's{#UPSTREAMVERSION#}{$(upstreamversion)}g;' \ - -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 \ @@ -281,13 +273,9 @@ # Generating control files %: %.in debian/upstream_info perl -p \ - -e 's{#BASE_VERSION#}{$(base_version)}g;' \ - -e 's{#RELEASE#}{$(release)}g;' \ -e 's{#VERSION#}{$(version)}g;' \ - -e 's{#NEXTVER#}{$(nextver)}g;' \ - -e 's{#UPSTREAMVERSION#}{$(upstreamversion)}g;' \ - -e 's{#FILENAME#}{$(filename)}g;' \ - -e 's{#URL#}{$(url)}g' \ + -e 's{#URL_X86#}{$(url_x86)}g;' \ + -e 's{#URL_X86_64#}{$(url_x86_64)}g;' \ < $< > $@ debian.binary/changelog: debian/changelog Index: debian/copyright.in =================================================================== --- debian/copyright.in (.../anbe-208-cleanup-outdated) (revision 1909) +++ debian/copyright.in (.../anbe-211-simplify-upstream-info) (revision 1909) @@ -2,7 +2,8 @@ Sat, 11 Aug 2001 14:27:28 -0700. It was downloaded from -#URL# +#URL_X86# +#URL_X86_64# Upstream Author: NVIDIA Index: debian/changelog =================================================================== --- debian/changelog (.../anbe-208-cleanup-outdated) (revision 1909) +++ debian/changelog (.../anbe-211-simplify-upstream-info) (revision 1909) @@ -32,6 +32,10 @@ this was the only substitution * patches/*, patches.save/*, patches.dpatch.save/*: remove, long obsolete * debian/rules: remove obsolete code + * debian/upstream_info, debian/rules: simplify + - add URL_X86 and URL_X86_64, include both URLs in debian/copyright + - drop unused variables BASE_VERSION, FILENAME, DIRNAME, URL, RELEASE, + UPSTREAMVERSION, NEXTVER -- Andreas Beckmann Sun, 11 Apr 2010 12:23:16 +0200