[pkg-nvidia-devel] r430 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog copyright nvidia-glx.docs nvidia-glx.examples nvidia-glx.init nvidia-glx.init.in nvidia-kernel-source.docs rules
rdonald at users.alioth.debian.org
rdonald at users.alioth.debian.org
Wed Jul 23 17:57:04 UTC 2008
Author: rdonald
Date: Wed Jul 23 17:57:04 2008
New Revision: 430
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=430
Log:
install tls libs
Modified:
packages/nvidia-graphics-drivers/trunk/debian/changelog
packages/nvidia-graphics-drivers/trunk/debian/copyright
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-glx.init
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.init.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.docs
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=430&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Wed Jul 23 17:57:04 2008
@@ -1,3 +1,9 @@
+nvidia-graphics-drivers (173.14.09-3) unstable; urgency=low
+
+ * Only ship TLS libs (closes: #441975)
+
+ -- Randall Donald <rdonald at debian.org> Wed, 23 Jul 2008 09:41:44 -0700
+
nvidia-graphics-drivers (173.14.09-2) unstable; urgency=low
* comment out chmod on missing patch directory. (closes: #487624, #487350)
Modified: packages/nvidia-graphics-drivers/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/copyright?rev=430&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/copyright (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/copyright Wed Jul 23 17:57:04 2008
@@ -2,7 +2,7 @@
Mon, 31 Mar 2003 23:40:05 -0800.
It was downloaded from
-ftp://download.nvidia.com/XFree86/Linux-x86_64/173.14.09/NVIDIA-Linux-x86_64-173.14.09-pkg2.run
+ftp://download.nvidia.com/XFree86/Linux-x86/173.14.09/NVIDIA-Linux-x86-173.14.09-pkg0.run
Upstream Author: NVIDIA <linux-bugs at nvidia.com>
Modified: 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=430&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.docs (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.docs Wed Jul 23 17:57:04 2008
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86_64-173.14.09-pkg2/usr/share/doc/NVIDIA_Changelog
-NVIDIA-Linux-x86_64-173.14.09-pkg2/usr/share/doc/README.txt
+NVIDIA-Linux-x86-173.14.09-pkg0/usr/share/doc/NVIDIA_Changelog
+NVIDIA-Linux-x86-173.14.09-pkg0/usr/share/doc/README.txt
Modified: 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=430&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.examples (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.examples Wed Jul 23 17:57:04 2008
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86_64-173.14.09-pkg2/usr/share/doc/XF86Config.sample
+NVIDIA-Linux-x86-173.14.09-pkg0/usr/share/doc/XF86Config.sample
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.init
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.init?rev=430&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.init (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.init Wed Jul 23 17:57:04 2008
@@ -20,8 +20,15 @@
. /lib/lsb/init-functions
+
+
+
# to force usage or non-usage of TLS libs edit /etc/defaults/nvidia-glx
[ -e /etc/default/nvidia-glx ] && . /etc/default/nvidia-glx
+
+
+
+
# test if /usr/lib is writable.
if [ ! -w /usr/lib ]; then
@@ -89,13 +96,6 @@
case "$1" in
start|restart|reload|force-reload)
- if [ "$USE_TLS" = "1" ]
- then
- setup_links
- elif [ "$USE_TLS" = "0" ]
- then
- remove_links
- fi
rm -f /usr/lib/libGL.so || true
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
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=430&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.init.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.init.in Wed Jul 23 17:57:04 2008
@@ -20,8 +20,15 @@
. /lib/lsb/init-functions
+
+
+
# to force usage or non-usage of TLS libs edit /etc/defaults/nvidia-glx
[ -e /etc/default/nvidia-glx ] && . /etc/default/nvidia-glx
+
+
+
+
# test if /usr/lib is writable.
if [ ! -w /usr/lib ]; then
@@ -89,13 +96,6 @@
case "$1" in
start|restart|reload|force-reload)
- if [ "$USE_TLS" = "1" ]
- then
- setup_links
- elif [ "$USE_TLS" = "0" ]
- then
- remove_links
- fi
rm -f /usr/lib/libGL.so || true
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
Modified: 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=430&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.docs (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.docs Wed Jul 23 17:57:04 2008
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86_64-173.14.09-pkg2/usr/share/doc/NVIDIA_Changelog
-NVIDIA-Linux-x86_64-173.14.09-pkg2/usr/share/doc/README.txt
+NVIDIA-Linux-x86-173.14.09-pkg0/usr/share/doc/NVIDIA_Changelog
+NVIDIA-Linux-x86-173.14.09-pkg0/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=430&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Wed Jul 23 17:57:04 2008
@@ -173,9 +173,12 @@
# install -m 0644 $(dirname)/usr/lib/libGL.la $(CURDIR)/debian/nvidia-glx/usr/lib/libGL.la
# TLS (nvidia-tls new for 6106)
+ #install $(dirname)/usr/lib/libnvidia-tls.so.${version} $(CURDIR)/debian/nvidia-glx/usr/lib/
install $(dirname)/usr/lib/libnvidia-tls.so.${version} $(CURDIR)/debian/nvidia-glx/usr/lib/
- install $(dirname)/usr/lib/tls/libnvidia-tls.so.${version} $(CURDIR)/debian/nvidia-glx/usr/lib/nvidia
+ #install $(dirname)/usr/lib/tls/libnvidia-tls.so.${version} $(CURDIR)/debian/nvidia-glx/usr/lib/nvidia
+ install $(dirname)/usr/lib/tls/libnvidia-tls.so.${version} $(CURDIR)/debian/nvidia-glx/usr/lib/tls/
+
#sed "s/__GENERATED_BY__/Debian nvidia-graphics-drivers/" $(dirname)/usr/lib/tls/libGL.la | sed "s/__LIBGL_PATH__/\/usr\/lib\/tls/" > $(CURDIR)/debian/nvidia-glx-dev/usr/lib/nvidia/libGL.la
# install -m 0644 $(dirname)/usr/lib/tls/libGL.la $(CURDIR)/debian/nvidia-glx/usr/lib/nvidia/libGL.la
More information about the Pkg-nvidia-devel
mailing list