[pkg-nvidia-devel] r822 - in /packages/nvidia-graphics-drivers/trunk/debian: README.source changelog copyright.in rules upstream_info
rra at users.alioth.debian.org
rra at users.alioth.debian.org
Sun Apr 25 04:20:38 UTC 2010
Author: rra
Date: Sun Apr 25 04:20:26 2010
New Revision: 822
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=822
Log:
Simplify the script that generates upstream variables
[ Andreas Beckmann ]
* 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
Modified:
packages/nvidia-graphics-drivers/trunk/debian/README.source
packages/nvidia-graphics-drivers/trunk/debian/changelog
packages/nvidia-graphics-drivers/trunk/debian/copyright.in
packages/nvidia-graphics-drivers/trunk/debian/rules
packages/nvidia-graphics-drivers/trunk/debian/upstream_info
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=822&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/README.source (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/README.source Sun Apr 25 04:20:26 2010
@@ -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.
Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=822&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sun Apr 25 04:20:26 2010
@@ -41,6 +41,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
-- Russ Allbery <rra at debian.org> Sat, 24 Apr 2010 20:35:20 -0700
Modified: packages/nvidia-graphics-drivers/trunk/debian/copyright.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/copyright.in?rev=822&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/copyright.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/copyright.in Sun Apr 25 04:20:26 2010
@@ -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 <linux-bugs at nvidia.com>
Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=822&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Sun Apr 25 04:20:26 2010
@@ -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
Modified: packages/nvidia-graphics-drivers/trunk/debian/upstream_info
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/upstream_info?rev=822&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/upstream_info (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/upstream_info Sun Apr 25 04:20:26 2010
@@ -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
-
-VERSION=${RELEASE}
-UPSTREAMVERSION=${RELEASE}
-URL=${BASE_URL}/${FILENAME}
+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}
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
More information about the Pkg-nvidia-devel
mailing list