[pkg-nvidia-devel] r919 - /packages/nvidia-graphics-drivers/trunk/debian/
anbe-guest at users.alioth.debian.org
anbe-guest at users.alioth.debian.org
Fri May 21 10:58:55 UTC 2010
Author: anbe-guest
Date: Fri May 21 10:58:55 2010
New Revision: 919
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=919
Log:
debian/nvidia-{glx,kernel}*.in: add #LEGACY# where appropriate
Modified:
packages/nvidia-graphics-drivers/trunk/debian/changelog
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.lintian-overrides.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.shlibs.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.README.Debian.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.init.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.lintian-overrides.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.shlibs.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-dkms.lintian-overrides.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian.in
Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=919&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Fri May 21 10:58:55 2010
@@ -23,6 +23,7 @@
(ICD): nvidia-opencl-common, nvidia-opencl-icd, nvidia-opencl-icd-ia32,
nvidia-libopencl1, nvidia-libopencl1-ia32, nvidia-libopencl1-dev
* module source tarball generation: add legacy support
+ * debian/nvidia-{glx,kernel}*.in: add #LEGACY# where appropriate
[ Jordi Pujol ]
* simplify installation by using debian/tmp as intermediate directory
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.lintian-overrides.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.lintian-overrides.in?rev=919&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.lintian-overrides.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.lintian-overrides.in Fri May 21 10:58:55 2010
@@ -1,21 +1,21 @@
# The NVIDIA license does not allow any form of modification.
-nvidia-glx-ia32: binary-has-unneeded-section
-nvidia-glx-ia32: embedded-libpng
-nvidia-glx-ia32: shared-lib-without-dependency-information
-nvidia-glx-ia32: shlib-with-non-pic-code
-nvidia-glx-ia32: shlib-without-PT_GNU_STACK-section
-nvidia-glx-ia32: spelling-error-in-binary
+nvidia-glx#LEGACY#-ia32: binary-has-unneeded-section
+nvidia-glx#LEGACY#-ia32: embedded-libpng
+nvidia-glx#LEGACY#-ia32: shared-lib-without-dependency-information
+nvidia-glx#LEGACY#-ia32: shlib-with-non-pic-code
+nvidia-glx#LEGACY#-ia32: shlib-without-PT_GNU_STACK-section
+nvidia-glx#LEGACY#-ia32: spelling-error-in-binary
# We divert a bunch of files not provided by this package to ensure that
# programs don't pick up the wrong libGL by mistake.
-nvidia-glx-ia32: diversion-for-unknown-file
+nvidia-glx#LEGACY#-ia32: diversion-for-unknown-file
# The diversions are placed here.
-nvidia-glx-ia32: package-contains-empty-directory usr/lib32/nvidia/
+nvidia-glx#LEGACY#-ia32: package-contains-empty-directory usr/lib32/nvidia/
# Packages built against the NVIDIA libGL should declare dependencies on
# the free version for Debian's purposes.
-nvidia-glx-ia32: shlibs-declares-dependency-on-other-package ia32-libs*
+nvidia-glx#LEGACY#-ia32: shlibs-declares-dependency-on-other-package ia32-libs*
# A single symbolic link does not justify the creation of a new package.
-nvidia-glx-ia32: non-dev-pkg-with-shlib-symlink
+nvidia-glx#LEGACY#-ia32: non-dev-pkg-with-shlib-symlink
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.shlibs.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.shlibs.in?rev=919&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.shlibs.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.shlibs.in Fri May 21 10:58:55 2010
@@ -1,3 +1,3 @@
libGL 1 ia32-libs (>= 20090804)
-libGLcore 1 nvidia-glx-ia32
-libnvidia-tls 1 nvidia-glx-ia32
+libGLcore 1 nvidia-glx#LEGACY#-ia32
+libnvidia-tls 1 nvidia-glx#LEGACY#-ia32
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.README.Debian.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.README.Debian.in?rev=919&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.README.Debian.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.README.Debian.in Fri May 21 10:58:55 2010
@@ -1,4 +1,4 @@
-nvidia-graphics-drivers for Debian
+nvidia-graphics-drivers#LEGACY# for Debian
----------------------------------
@@ -9,7 +9,8 @@
X Server and GL libraries of the NVIDIA driver offering.
-For any news on this package check http://bugs.debian.org/nvidia-glx
+For any news on this package check
+http://bugs.debian.org/nvidia-glx#LEGACY#
NOTES ABOUT GLX DRIVER AND OPENGL:
@@ -27,8 +28,8 @@
In Section "Device"
Change Driver "nv" to Driver "nvidia"
- See /usr/share/doc/nvidia-glx/README.txt.gz and
- /usr/share/doc/nvidia-glx/examples/XF86Config.sample.gz
+ See /usr/share/doc/nvidia-glx#LEGACY#/README.txt.gz and
+ /usr/share/doc/nvidia-glx#LEGACY#/examples/XF86Config.sample.gz
for descriptions of all supported options.
Chapter 12: Configuring AGP is an important section.
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.init.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.init.in?rev=919&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.init.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.init.in Fri May 21 10:58:55 2010
@@ -1,7 +1,7 @@
#!/bin/sh
### BEGIN INIT INFO
-# Provides: nvidia-glx
+# Provides: nvidia-glx#LEGACY#
# Required-Start: $remote_fs
# Required-Stop: $remote_fs
# Default-Start: 2 3 4 5
@@ -33,7 +33,7 @@
if [ -L /usr/lib/nvidia/libGL.so.xlibmesa ] && [ -d /usr/share/doc/libgl1-mesa-dev ] ; then
ln -s /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so
fi
- if [ -d /usr/share/doc/nvidia-glx-dev ] ; then
+ if [ -d /usr/share/doc/nvidia-glx#LEGACY#-dev ] ; then
ln -s /usr/lib/libGL.so.#VERSION# /usr/lib/libGL.so
fi
;;
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.lintian-overrides.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.lintian-overrides.in?rev=919&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.lintian-overrides.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.lintian-overrides.in Fri May 21 10:58:55 2010
@@ -1,22 +1,22 @@
# The NVIDIA license does not allow any form of modification.
-nvidia-glx: binary-has-unneeded-section
-nvidia-glx: embedded-libpng
-nvidia-glx: shared-lib-without-dependency-information
-nvidia-glx: shlib-with-executable-stack
-nvidia-glx: shlib-with-non-pic-code
-nvidia-glx: shlib-without-PT_GNU_STACK-section
-nvidia-glx: spelling-error-in-binary
+nvidia-glx#LEGACY#: binary-has-unneeded-section
+nvidia-glx#LEGACY#: embedded-libpng
+nvidia-glx#LEGACY#: shared-lib-without-dependency-information
+nvidia-glx#LEGACY#: shlib-with-executable-stack
+nvidia-glx#LEGACY#: shlib-with-non-pic-code
+nvidia-glx#LEGACY#: shlib-without-PT_GNU_STACK-section
+nvidia-glx#LEGACY#: spelling-error-in-binary
# We divert a bunch of files not provided by this package to ensure that
# programs don't pick up the wrong libGL by mistake.
-nvidia-glx: diversion-for-unknown-file
+nvidia-glx#LEGACY#: diversion-for-unknown-file
# The diversions are placed here.
-nvidia-glx: package-contains-empty-directory usr/lib/nvidia/
+nvidia-glx#LEGACY#: package-contains-empty-directory usr/lib/nvidia/
# Packages built against the NVIDIA libGL should declare dependencies on
# the free version for Debian's purposes.
-nvidia-glx: shlibs-declares-dependency-on-other-package libgl1-mesa-glx | libgl1
+nvidia-glx#LEGACY#: shlibs-declares-dependency-on-other-package libgl1-mesa-glx | libgl1
# Referenced by upstream documentation.
-nvidia-glx: script-with-language-extension usr/bin/nvidia-bug-report.sh
+nvidia-glx#LEGACY#: script-with-language-extension usr/bin/nvidia-bug-report.sh
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.shlibs.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.shlibs.in?rev=919&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.shlibs.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.shlibs.in Fri May 21 10:58:55 2010
@@ -1,5 +1,5 @@
libGL 1 libgl1-mesa-glx | libgl1
-libGLcore 1 nvidia-glx
-libXvMCNVIDIA_dynamic 1 nvidia-glx
-libnvidia-tls 1 nvidia-glx
-libnvidia-cfg 1 nvidia-glx
+libGLcore 1 nvidia-glx#LEGACY#
+libXvMCNVIDIA_dynamic 1 nvidia-glx#LEGACY#
+libnvidia-tls 1 nvidia-glx#LEGACY#
+libnvidia-cfg 1 nvidia-glx#LEGACY#
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-dkms.lintian-overrides.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-dkms.lintian-overrides.in?rev=919&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-dkms.lintian-overrides.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-dkms.lintian-overrides.in Fri May 21 10:58:55 2010
@@ -1,5 +1,5 @@
# This is the upstream binary module, which we're not allowed (by the
# NVIDIA license) to change in any way. Both architectures are included
# so that (on i386) we can build the kernel module for the amd64 kernel.
-nvidia-kernel-dkms: binary-from-other-architecture
-nvidia-kernel-dkms: unstripped-binary-or-object
+nvidia-kernel#LEGACY#-dkms: binary-from-other-architecture
+nvidia-kernel#LEGACY#-dkms: unstripped-binary-or-object
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian.in?rev=919&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian.in Fri May 21 10:58:55 2010
@@ -1,4 +1,4 @@
-nvidia-graphics-drivers for Debian
+nvidia-graphics-drivers#LEGACY# for Debian
----------------------------------
@@ -17,8 +17,8 @@
* Easiest and recommended method.
* DKMS will take care of building a new module whenever the driver
or your kernel is updated.
- * Install the package nvidia-kernel-dkms instead of
- nvidia-kernel-source.
+ * Install the package nvidia-kernel#LEGACY#-dkms instead of
+ nvidia-kernel#LEGACY#-source.
* STOP reading this file.
METHOD #2: manually, using module-assistant
@@ -27,7 +27,7 @@
corresponding linux-headers-KVERS package.
* Run this command every time your kernel or the driver was updated:
- module-assistant auto-install nvidia
+ module-assistant auto-install nvidia#LEGACY#
* For more information on module-assistant, see its man page and package
documentation.
@@ -67,10 +67,10 @@
As root (or using fakeroot)
1. cd /usr/src
- tar xjvf nvidia-kernel.tar.bz2 -C <YOUR BUILD LOCATION>
+ tar xjvf nvidia-kernel#LEGACY#.tar.bz2 -C <YOUR BUILD LOCATION>
(It will install in <YOUR BUILD LOCATION>/modules)
- or -
- tar xjvf nvidia-kernel.tar.bz2 (if building in /usr/src)
+ tar xjvf nvidia-kernel#LEGACY#.tar.bz2 (if building in /usr/src)
The standard build location is /usr/src
@@ -91,7 +91,7 @@
5. Then build nvidia-kernel package:
- cd <YOUR BUILD LOCATION>/modules/nvidia-kernel
+ cd <YOUR BUILD LOCATION>/modules/nvidia-kernel#LEGACY#
debian/rules binary_modules
(You can also combine step 4 and 5 into one line:
@@ -105,7 +105,7 @@
7. Install the nvidia-kernel package:
- dpkg -i ../nvidia-kernel-2.6.14-2-k7_#VERSION#-1+_.Custom_i386.deb
+ dpkg -i ../nvidia-kernel#LEGACY#-2.6.14-2-k7_#VERSION#-1+_.Custom_i386.deb
( or similar filename )
Now see GENERAL NOTES below method #4
@@ -113,15 +113,15 @@
METHOD #4: Using your own kernel source headers
***********************************************************************
-To build the nvidia-kernel deb you need to first make sure you have
+To build the nvidia-kernel#LEGACY# deb you need to first make sure you have
kernel-package installed, then do the following:
As root
1. cd /usr/src
- tar xjvf nvidia-kernel.tar.bz2 -C <YOUR BUILD LOCATION>
+ tar xjvf nvidia-kernel#LEGACY#.tar.bz2 -C <YOUR BUILD LOCATION>
(It will install in <YOUR BUILD LOCATION>/modules)
- or -
- tar xjvf nvidia-kernel.tar.bz2 (if building in /usr/src)
+ tar xjvf nvidia-kernel#LEGACY#.tar.bz2 (if building in /usr/src)
2. If you are NOT using the default modules location /usr/src/modules
then you must set an environment variable that points to your modules
@@ -145,7 +145,7 @@
5. Install the nvidia-kernel package:
cd <YOUR BUILD LOCATION> (e.g. /usr/src)
- dpkg -i nvidia-kernel-KVER*.deb
+ dpkg -i nvidia-kernel#LEGACY#-KVER*.deb
Notes for method #2:
@@ -165,13 +165,14 @@
adduser username video
Also note for AGP issues and further information please see the NVIDIA
-README file (README.gz) in the nvidia-glx package
+README file (README.gz) in the nvidia-glx#LEGACY# package
An old nvidia.ko might be already loaded (run 'lsmod' to check) so
do 'rmmod nvidia' to remove the module from memory.
-For any news on this package check http://bugs.debian.org/nvidia-kernel-source
+For any news on this package check
+http://bugs.debian.org/nvidia-kernel#LEGACY#-source
-- Randall Donald <rdonald at debian.org>, Fri, 30 Apr 2004 19:02:04 -0700
More information about the Pkg-nvidia-devel
mailing list