[pkg-nvidia-devel] r820 - /packages/nvidia-graphics-drivers/trunk/debian/
rra at users.alioth.debian.org
rra at users.alioth.debian.org
Sun Apr 25 04:15:31 UTC 2010
Author: rra
Date: Sun Apr 25 04:15:17 2010
New Revision: 820
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=820
Log:
Remove one type of substitutions in the debhelper control files
[ Andreas Beckmann ]
* Create symlinks NVIDIA-Linux{-i386,-amd64,} pointing to the extracted
upstream archives to reduce #DIRNAME# and $(dirname_*) usage. (Using
wildcards is not a good idea since beta releases use a different naming
scheme.)
* debian/*.in: replace #DIRNAME# with NVIDIA-Linux and rename *.in to * if
this was the only substitution
Added:
packages/nvidia-graphics-drivers/trunk/debian/libcuda1-dev.install
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.docs
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.examples
packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.docs
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.docs
packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver-ia32.docs
packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.docs
Removed:
packages/nvidia-graphics-drivers/trunk/debian/libcuda1-dev.install.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.docs.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.examples.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.docs.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.docs.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver-ia32.docs.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.docs.in
Modified:
packages/nvidia-graphics-drivers/trunk/debian/changelog
packages/nvidia-graphics-drivers/trunk/debian/libcuda1-ia32.install.in
packages/nvidia-graphics-drivers/trunk/debian/libcuda1.install.in
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=820&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sun Apr 25 04:15:17 2010
@@ -33,6 +33,12 @@
version and hardware information
* debian/control: bump debhelper B-D to (>= 7.2.3~) for dh_bugfiles
* debian/rules: use dh_bugfiles to install bug script
+ * Create symlinks NVIDIA-Linux{-i386,-amd64,} pointing to the extracted
+ upstream archives to reduce #DIRNAME# and $(dirname_*) usage. (Using
+ wildcards is not a good idea since beta releases use a different naming
+ scheme.)
+ * debian/*.in: replace #DIRNAME# with NVIDIA-Linux and rename *.in to * if
+ this was the only substitution
-- Russ Allbery <rra at debian.org> Sat, 24 Apr 2010 20:35:20 -0700
Added: packages/nvidia-graphics-drivers/trunk/debian/libcuda1-dev.install
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libcuda1-dev.install?rev=820&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libcuda1-dev.install (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/libcuda1-dev.install Sun Apr 25 04:15:17 2010
@@ -1,0 +1,2 @@
+NVIDIA-Linux/usr/include/cuda/cuda.h /usr/include/cuda
+NVIDIA-Linux/usr/include/cuda/cudaGL.h /usr/include/cuda
Modified: packages/nvidia-graphics-drivers/trunk/debian/libcuda1-ia32.install.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libcuda1-ia32.install.in?rev=820&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libcuda1-ia32.install.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libcuda1-ia32.install.in Sun Apr 25 04:15:17 2010
@@ -1,1 +1,1 @@
-#DIRNAME#/usr/lib32/libcuda.so.#VERSION# usr/lib32
+NVIDIA-Linux/usr/lib32/libcuda.so.#VERSION# usr/lib32
Modified: packages/nvidia-graphics-drivers/trunk/debian/libcuda1.install.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libcuda1.install.in?rev=820&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libcuda1.install.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libcuda1.install.in Sun Apr 25 04:15:17 2010
@@ -1,1 +1,1 @@
-#DIRNAME#/usr/lib/libcuda.so.#VERSION# usr/lib
+NVIDIA-Linux/usr/lib/libcuda.so.#VERSION# usr/lib
Added: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.docs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.docs?rev=820&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.docs (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.docs Sun Apr 25 04:15:17 2010
@@ -1,0 +1,1 @@
+NVIDIA-Linux/usr/share/doc/README.txt
Added: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.examples
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.examples?rev=820&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.examples (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.examples Sun Apr 25 04:15:17 2010
@@ -1,0 +1,1 @@
+NVIDIA-Linux/usr/share/doc/XF86Config.sample
Added: packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.docs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.docs?rev=820&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.docs (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.docs Sun Apr 25 04:15:17 2010
@@ -1,0 +1,1 @@
+NVIDIA-Linux/usr/share/doc/README.txt
Added: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.docs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.docs?rev=820&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.docs (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.docs Sun Apr 25 04:15:17 2010
@@ -1,0 +1,1 @@
+NVIDIA-Linux/usr/share/doc/README.txt
Added: packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver-ia32.docs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver-ia32.docs?rev=820&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver-ia32.docs (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver-ia32.docs Sun Apr 25 04:15:17 2010
@@ -1,0 +1,1 @@
+NVIDIA-Linux/usr/share/doc/README.txt
Added: packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.docs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.docs?rev=820&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.docs (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.docs Sun Apr 25 04:15:17 2010
@@ -1,0 +1,1 @@
+NVIDIA-Linux/usr/share/doc/README.txt
Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=820&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Sun Apr 25 04:15:17 2010
@@ -13,6 +13,7 @@
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)
base_version:=$(shell sh debian/upstream_info BASE_VERSION)
release:=$(shell sh debian/upstream_info RELEASE)
@@ -32,20 +33,18 @@
AUTOCLEAN = \
debian/nvidia-kernel-source.README.Debian \
debian/nvidia-glx.links \
-debian/nvidia-glx.docs debian/nvidia-glx.examples \
-debian/nvidia-libvdpau1.links debian/nvidia-libvdpau1.docs \
+debian/nvidia-libvdpau1.links \
debian/nvidia-glx.postrm debian/nvidia-glx.init \
debian/nvidia-glx-ia32.links \
debian/nvidia-libvdpau1-ia32.links \
-debian/nvidia-kernel-source.docs debian/nvidia-glx-dev.preinst \
-debian/libcuda1.install debian/libcuda1-ia32.install debian/libcuda1-dev.install \
+debian/nvidia-glx-dev.preinst \
+debian/libcuda1.install \
+debian/libcuda1-ia32.install \
debian/libcuda1.links debian/libcuda1-ia32.links \
debian/libcuda1-ia32.symbols \
debian/nvidia-libvdpau1-ia32.symbols \
-debian/nvidia-vdpau-driver.docs \
debian/nvidia-vdpau-driver-ia32.links \
debian/nvidia-vdpau-driver.links \
-debian/nvidia-vdpau-driver-ia32.docs \
debian.binary/changelog
@@ -68,12 +67,15 @@
configure-stamp: version-clean $(AUTOGEN) ${filename_x86} ${filename_x86_64}
dh_testdir
# extract both so we can fetch the kernel object code for both arches
- ./${filename_x86} --extract-only
- ./${filename_x86_64} --extract-only
+ sh ${filename_x86} --extract-only
+ sh ${filename_x86_64} --extract-only
+ ln -s ${dirname_x86} NVIDIA-Linux-i386
+ ln -s ${dirname_x86_64} NVIDIA-Linux-amd64
+ ln -s NVIDIA-Linux-$(DEB_BUILD_ARCH) NVIDIA-Linux
+ ls -al
if test -d $(CURDIR)/patches; \
then \
pwd; \
- ls -al; \
cd $(dirname)/usr/src/nv; \
# for i in $(CURDIR)/patches/*; \
# do patch -p3 <$$i; \
@@ -125,8 +127,8 @@
rm $(CURDIR)/debian/temp/modules/nvidia-kernel/makefile
# We want both 32 and 64 bit versions of nv-kernel.o
- cp $(CURDIR)/$(dirname_x86)/usr/src/nv/nv-kernel.o $(CURDIR)/debian/temp/modules/nvidia-kernel/nv-kernel.o.i386
- cp $(CURDIR)/$(dirname_x86_64)/usr/src/nv/nv-kernel.o $(CURDIR)/debian/temp/modules/nvidia-kernel/nv-kernel.o.x86_64
+ cp -a $(CURDIR)/NVIDIA-Linux-i386/usr/src/nv/nv-kernel.o $(CURDIR)/debian/temp/modules/nvidia-kernel/nv-kernel.o.i386
+ cp -a $(CURDIR)/NVIDIA-Linux-amd64/usr/src/nv/nv-kernel.o $(CURDIR)/debian/temp/modules/nvidia-kernel/nv-kernel.o.x86_64
rm -f $(CURDIR)/debian/temp/modules/nvidia-kernel/nv-kernel.o
# and then make Makefile.kbuild actually use our names
@@ -151,6 +153,7 @@
rm -f build-stamp build-kernel-stamp configure-stamp
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 debian/temp
@@ -308,7 +311,6 @@
-e 's{#VERSION#}{$(version)}g;' \
-e 's{#NEXTVER#}{$(nextver)}g;' \
-e 's{#UPSTREAMVERSION#}{$(upstreamversion)}g;' \
- -e 's{#DIRNAME#}{$(dirname)}g;' \
-e 's{#FILENAME#}{$(filename)}g;' \
-e 's{#URL#}{$(url)}g' \
< $< > $@
More information about the Pkg-nvidia-devel
mailing list