[pkg-nvidia-devel] r580 - in /packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian: changelog control.in nvidia-glx-legacy-173xx-ia32.dirs nvidia-glx-legacy-173xx-ia32.links.in nvidia-glx-legacy-173xx.links.in rules
rdonald at users.alioth.debian.org
rdonald at users.alioth.debian.org
Mon Aug 3 22:32:11 UTC 2009
Author: rdonald
Date: Mon Aug 3 22:32:11 2009
New Revision: 580
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=580
Log:
Beckmann patch2
Modified:
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/control.in
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx-ia32.dirs
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx-ia32.links.in
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.links.in
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/rules
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog?rev=580&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog Mon Aug 3 22:32:11 2009
@@ -25,8 +25,9 @@
* debian/nvidia-kernel-legacy-173xx-source.README.Debian.in: fix typo
* use Section: non-free/kernel for source and modules
* debian/watch: new dummy file, website is not parsable
-
- -- Andreas Beckmann <debian at abeckmann.de> Thu, 23 Jul 2009 11:35:11 +0200
+ * ia32 transition: move from /emul/ia32-linux to /usr/lib32
+
+ -- Andreas Beckmann <debian at abeckmann.de> Thu, 23 Jul 2009 22:32:47 +0200
nvidia-graphics-drivers-legacy-173xx (173.14.20-1) unstable; urgency=low
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/control.in?rev=580&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/control.in (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/control.in Mon Aug 3 22:32:11 2009
@@ -13,7 +13,7 @@
Package: nvidia-glx-legacy-173xx-ia32
Architecture: amd64
-#Pre-Depends: libc6-i386 (>= 2.9-18)
+Pre-Depends: libc6-i386 (>= 2.9-18)
Depends: nvidia-kernel-legacy-173xx-#VERSION#, ${shlibs:Depends}, ${misc:Depends}
Suggests: nvidia-kernel-legacy-173xx-source (>= #VERSION#)
Conflicts: nvidia-glx-src, libcuda1-ia32
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx-ia32.dirs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx-ia32.dirs?rev=580&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx-ia32.dirs (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx-ia32.dirs Mon Aug 3 22:32:11 2009
@@ -1,2 +1,2 @@
-emul/ia32-linux/usr/lib
-emul/ia32-linux/usr/lib/tls
+usr/lib32
+usr/lib32/tls
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx-ia32.links.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx-ia32.links.in?rev=580&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx-ia32.links.in (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx-ia32.links.in Mon Aug 3 22:32:11 2009
@@ -1,7 +1,7 @@
-emul/ia32-linux/usr/lib/libGL.so.#VERSION# emul/ia32-linux/usr/lib/libGL.so.1
-emul/ia32-linux/usr/lib/libGL.so.#VERSION# emul/ia32-linux/usr/lib/libGL.so
-emul/ia32-linux/usr/lib/libGLcore.so.#VERSION# emul/ia32-linux/usr/lib/libGLcore.so
-emul/ia32-linux/usr/lib/libGLcore.so.#VERSION# emul/ia32-linux/usr/lib/libGLcore.so.1
-emul/ia32-linux/usr/lib/libnvidia-tls.so.#VERSION# emul/ia32-linux/usr/lib/libnvidia-tls.so.1
-emul/ia32-linux/usr/lib/libcuda.so.#VERSION# emul/ia32-linux/usr/lib/libcuda.so
-emul/ia32-linux/usr/lib/libcuda.so.#VERSION# emul/ia32-linux/usr/lib/libcuda.so.1
+usr/lib32/libGL.so.#VERSION# usr/lib32/libGL.so.1
+usr/lib32/libGL.so.1 usr/lib32/libGL.so
+usr/lib32/libGLcore.so.#VERSION# usr/lib32/libGLcore.so.1
+usr/lib32/libnvidia-tls.so.#VERSION# usr/lib32/libnvidia-tls.so.1
+usr/lib32/tls/libnvidia-tls.so.#VERSION# usr/lib32/tls/libnvidia-tls.so.1
+usr/lib32/libcuda.so.#VERSION# usr/lib32/libcuda.so.1
+usr/lib32/libcuda.so.1 usr/lib32/libcuda.so
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.links.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.links.in?rev=580&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.links.in (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.links.in Mon Aug 3 22:32:11 2009
@@ -1,8 +1,9 @@
usr/lib/libGL.so.#VERSION# usr/lib/libGL.so.1
usr/lib/libGLcore.so.#VERSION# usr/lib/libGLcore.so.1
usr/lib/libnvidia-tls.so.#VERSION# usr/lib/libnvidia-tls.so.1
+usr/lib/tls/libnvidia-tls.so.#VERSION# usr/lib/tls/libnvidia-tls.so.1
usr/lib/xorg/modules/extensions/libglx.so.#VERSION# usr/lib/xorg/modules/extensions/libglx.so
usr/lib/libXvMCNVIDIA.so.#VERSION# usr/lib/libXvMCNVIDIA.so.1
usr/lib/libXvMCNVIDIA.so.#VERSION# usr/lib/libXvMCNVIDIA_dynamic.so.1
-usr/lib/libcuda.so.#VERSION# usr/lib/libcuda.so
usr/lib/libcuda.so.#VERSION# usr/lib/libcuda.so.1
+usr/lib/libcuda.so.1 usr/lib/libcuda.so
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/rules?rev=580&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/rules Mon Aug 3 22:32:11 2009
@@ -35,6 +35,9 @@
debian/nvidia-glx$(LEGACY).override debian/nvidia-glx$(LEGACY).docs debian/nvidia-glx$(LEGACY).examples \
debian/nvidia-glx$(LEGACY).postrm debian/nvidia-glx$(LEGACY).init \
debian/nvidia-glx$(LEGACY)-ia32.override debian/nvidia-glx$(LEGACY)-ia32.links \
+debian/nvidia-glx$(LEGACY)-ia32.preinst \
+debian/nvidia-glx$(LEGACY)-ia32.postinst \
+debian/nvidia-glx$(LEGACY)-ia32.postrm \
debian/nvidia-kernel$(LEGACY)-source.docs debian/nvidia-glx$(LEGACY)-dev.preinst \
debian.binary/changelog
@@ -206,15 +209,15 @@
if [ "$(DEB_BUILD_ARCH)" = "amd64" ] ; then \
install $(dirname)/usr/lib32/libGLcore.so.${version} \
- $(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/emul/ia32-linux/usr/lib ; \
+ $(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/usr/lib32 ; \
install $(dirname)/usr/lib32/libGL.so.${version} \
- $(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/emul/ia32-linux/usr/lib ; \
+ $(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/usr/lib32 ; \
install $(dirname)/usr/lib32/libcuda.so.${version} \
- $(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/emul/ia32-linux/usr/lib ; \
+ $(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/usr/lib32 ; \
install $(dirname)/usr/lib32/libnvidia-tls.so.${version} \
- $(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/emul/ia32-linux/usr/lib ; \
+ $(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/usr/lib32 ; \
install $(dirname)/usr/lib32/tls/libnvidia-tls.so.${version} \
- $(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/emul/ia32-linux/usr/lib/tls ; \
+ $(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/usr/lib32/tls ; \
fi
install -m 755 $(dirname)/usr/bin/nvidia-bug-report.sh $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/bin/
@@ -269,6 +272,7 @@
# Generating control files
%: %.in debian/upstream_info
perl -p \
+ -e 's{#LEGACY#}{$(LEGACY)}g;' \
-e 's{#BASE_VERSION#}{$(base_version)}g;' \
-e 's{#RELEASE#}{$(release)}g;' \
-e 's{#VERSION#}{$(version)}g;' \
@@ -276,7 +280,7 @@
-e 's{#UPSTREAMVERSION#}{$(upstreamversion)}g;' \
-e 's{#DIRNAME#}{$(dirname)}g;' \
-e 's{#FILENAME#}{$(filename)}g;' \
- -e 's{#URL#}{$(url)}g' \
+ -e 's{#URL#}{$(url)}g;' \
< $< > $@
debian.binary/changelog: debian/changelog
More information about the Pkg-nvidia-devel
mailing list