[pkg-nvidia-devel] r562 - in /packages/nvidia-graphics-drivers/trunk: debian.binary/ debian/

rdonald at users.alioth.debian.org rdonald at users.alioth.debian.org
Wed Jul 1 22:10:13 UTC 2009


Author: rdonald
Date: Wed Jul  1 22:10:13 2009
New Revision: 562

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=562
Log:
ia32 transition

Modified:
    packages/nvidia-graphics-drivers/trunk/debian.binary/changelog
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/control
    packages/nvidia-graphics-drivers/trunk/debian/control.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.dirs
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.postinst
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.postrm
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.preinst
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.dirs
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.links
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.links.in
    packages/nvidia-graphics-drivers/trunk/debian/rules

Modified: packages/nvidia-graphics-drivers/trunk/debian.binary/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian.binary/changelog?rev=562&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian.binary/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian.binary/changelog Wed Jul  1 22:10:13 2009
@@ -1,3 +1,15 @@
+nvidia-kernel (185.18.14-1) unstable; urgency=low
+
+  [ Randall Donald ]
+  * New upstream: (closes: #532568, #532568, #532774)
+  * still only builds via module-assistant
+  
+  [ Harald Dunkel ]
+  * create empty patches.h
+  * new nvidia-libvdpau, nvidia-libvdpau-ia32, nvidia-libvdpau-dev: (closes: #519792)
+
+ -- Randall Donald <rdonald at debian.org>  Wed, 10 Jun 2009 15:35:55 -0700
+
 nvidia-kernel (180.44-2) unstable; urgency=low
 
   * Fix the dh_clean issue that just showed up now for some reason

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=562&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Wed Jul  1 22:10:13 2009
@@ -1,3 +1,11 @@
+nvidia-graphics-drivers (185.18.14-2) UNRELEASED; urgency=low
+
+  * /emul/ia32-linux/usr/lib to /usr/lib32 transition (closes: 534873)
+  * cleanup /emul/ia32-linux/usr/lib/tls/libnvidia-tls.so.1
+  * Thanks to Andreas Beckmann <debian at abeckmann.de> for ias32 work
+  
+ -- Randall Donald <rdonald at debian.org>  Wed, 01 Jul 2009 15:04:38 -0700
+
 nvidia-graphics-drivers (185.18.14-1) unstable; urgency=low
 
   [ Randall Donald ]

Modified: packages/nvidia-graphics-drivers/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=562&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Wed Jul  1 22:10:13 2009
@@ -11,6 +11,7 @@
 
 Package: nvidia-glx-ia32
 Architecture: amd64
+Pre-Depends: libc6-i386 (>= 2.9-18)
 Depends: nvidia-kernel-185.18.14, ia32-libs, ${shlibs:Depends}
 Suggests: nvidia-settings, nvidia-kernel-source (>= 185.18.14)
 Conflicts: nvidia-glx-src
@@ -63,6 +64,7 @@
 
 Package: nvidia-libvdpau-ia32
 Architecture: amd64
+Pre-Depends: libc6-i386 (>= 2.9-18)
 Depends: ia32-libs, ${shlibs:Depends}
 Suggests: nvidia-settings, nvidia-kernel-source (>= 185.18.14)
 Replaces: nvidia-glx-ia32 (< 180.51)

Modified: packages/nvidia-graphics-drivers/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control.in?rev=562&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control.in Wed Jul  1 22:10:13 2009
@@ -11,6 +11,7 @@
 
 Package: nvidia-glx-ia32
 Architecture: amd64
+Pre-Depends: libc6-i386 (>= 2.9-18)
 Depends: nvidia-kernel-#VERSION#, ia32-libs, ${shlibs:Depends}
 Suggests: nvidia-settings, nvidia-kernel-source (>= #VERSION#)
 Conflicts: nvidia-glx-src
@@ -63,6 +64,7 @@
 
 Package: nvidia-libvdpau-ia32
 Architecture: amd64
+Pre-Depends: libc6-i386 (>= 2.9-18)
 Depends: ia32-libs, ${shlibs:Depends}
 Suggests: nvidia-settings, nvidia-kernel-source (>= #VERSION#)
 Replaces: nvidia-glx-ia32 (< 180.51)

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.dirs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.dirs?rev=562&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.dirs (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.dirs Wed Jul  1 22:10:13 2009
@@ -1,2 +1,2 @@
-emul/ia32-linux/usr/lib
-emul/ia32-linux/usr/lib/tls
+usr/lib32/nvidia
+usr/lib32/tls

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links?rev=562&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links Wed Jul  1 22:10:13 2009
@@ -1,5 +1,6 @@
-emul/ia32-linux/usr/lib/libGL.so.185.18.14 emul/ia32-linux/usr/lib/libGL.so.1
-emul/ia32-linux/usr/lib/libGL.so.185.18.14 emul/ia32-linux/usr/lib/libGL.so
-emul/ia32-linux/usr/lib/libGLcore.so.185.18.14 emul/ia32-linux/usr/lib/libGLcore.so
-emul/ia32-linux/usr/lib/libnvidia-tls.so.185.18.14 emul/ia32-linux/usr/lib/libnvidia-tls.so.1
-emul/ia32-linux/usr/lib/libcuda.so.185.18.14  emul/ia32-linux/usr/lib/libcuda.so
+usr/lib32/libGL.so.185.18.14 usr/lib32/libGL.so.1
+usr/lib32/libGL.so.185.18.14 usr/lib32/libGL.so
+usr/lib32/libGLcore.so.185.18.14 usr/lib32/libGLcore.so
+usr/lib32/libnvidia-tls.so.185.18.14 usr/lib32/libnvidia-tls.so.1
+usr/lib32/tls/libnvidia-tls.so.185.18.14 usr/lib32/tls/libnvidia-tls.so.1
+usr/lib32/libcuda.so.185.18.14  usr/lib32/libcuda.so

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links.in?rev=562&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links.in Wed Jul  1 22:10:13 2009
@@ -1,5 +1,6 @@
-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/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
+usr/lib32/libGL.so.#VERSION# usr/lib32/libGL.so.1
+usr/lib32/libGL.so.#VERSION# usr/lib32/libGL.so
+usr/lib32/libGLcore.so.#VERSION# usr/lib32/libGLcore.so
+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

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.postinst?rev=562&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.postinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.postinst Wed Jul  1 22:10:13 2009
@@ -1,14 +1,55 @@
 #!/bin/sh
+# postinst script for nvidia-glx-ia32
+#
+# see: dh_installdeb(1)
 
 set -e
 
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
 
 
+case "$1" in
+    configure)
 
+	# remove diversion created before the
+	# /emul/ia32-linux/usr/lib => /usr/lib32 transition
+	dpkg-divert --remove --rename --package nvidia-glx-ia32 --divert \
+		/emul/ia32-linux/usr/lib/nvidia/libGL.so.ia32-libs \
+		/emul/ia32-linux/usr/lib/libGL.so > /dev/null
+	dpkg-divert --remove --rename --package nvidia-glx-ia32 --divert \
+		/emul/ia32-linux/usr/lib/nvidia/libGL.so.1.ia32-libs \
+		/emul/ia32-linux/usr/lib/libGL.so.1 > /dev/null
+	dpkg-divert --remove --rename --package nvidia-glx-ia32 --divert \
+		/emul/ia32-linux/usr/lib/nvidia/libGL.so.1.2.ia32-libs \
+		/emul/ia32-linux/usr/lib/libGL.so.1.2 > /dev/null
 
+	test -d /emul/ia32-linux/usr/lib/nvidia && \
+		rmdir /emul/ia32-linux/usr/lib/nvidia || true;
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
 
 #DEBHELPER#
 
-
-
-ldconfig
+exit 0

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.postrm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.postrm?rev=562&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.postrm (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.postrm Wed Jul  1 22:10:13 2009
@@ -13,48 +13,38 @@
 #        * <new-postrm> `abort-install'
 #        * <new-postrm> `abort-install' <old-version>
 #        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
-# for details, see /usr/share/doc/packaging-manual/
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
 
 case "$1" in
     remove|purge)
 
+	# restore libGL.so* from ia32-libs, diverted to /usr/lib32/nvidia
 	dpkg-divert --remove --rename --package nvidia-glx-ia32 --divert \
-		/emul/ia32-linux/usr/lib/nvidia/libGL.so.1.ia32-libs \
-		/emul/ia32-linux/usr/lib/libGL.so.1 > /dev/null
+		/usr/lib32/nvidia/libGL.so.ia32-libs \
+		/usr/lib32/libGL.so > /dev/null
 	dpkg-divert --remove --rename --package nvidia-glx-ia32 --divert \
-		/emul/ia32-linux/usr/lib/nvidia/libGL.so.1.2.ia32-libs \
-		/emul/ia32-linux/usr/lib/libGL.so.1.2 > /dev/null
+		/usr/lib32/nvidia/libGL.so.1.ia32-libs \
+		/usr/lib32/libGL.so.1 > /dev/null
 	dpkg-divert --remove --rename --package nvidia-glx-ia32 --divert \
-		/emul/ia32-linux/usr/lib/nvidia/libGL.so.ia32-libs \
-		/emul/ia32-linux/usr/lib/libGL.so > /dev/null
+		/usr/lib32/nvidia/libGL.so.1.2.ia32-libs \
+		/usr/lib32/libGL.so.1.2 > /dev/null
 
-	dpkg-divert --remove --rename --package nvidia-glx-ia32 --divert \
-		/emul/ia32-linux/usr/lib/nvidia/libGL.so.1.ia32-libs \
-		/emul/ia32-linux/usr/lib/libGL.so.1 > /dev/null
-	dpkg-divert --remove --rename --package nvidia-glx-ia32 --divert \
-		/emul/ia32-linux/usr/lib/nvidia/libGL.so.1.2.ia32-libs \
-		/emul/ia32-linux/usr/lib/libGL.so.1.2 > /dev/null
-	dpkg-divert --remove --rename --package nvidia-glx-ia32 --divert \
-		/emul/ia32-linux/usr/lib/nvidia/libGL.so.ia32-libs \
-		/emul/ia32-linux/usr/lib/libGL.so > /dev/null
+	test -d /usr/lib32/nvidia && \
+		rmdir /usr/lib32/nvidia || true;
 
-	test -d /emul/ia32-linux/usr/lib/nvidia && \
-		rmdir /emul/ia32-linux/usr/lib/nvidia || true;
+    ;;
 
-	ldconfig
-		
+    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
     ;;
-    
-    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
-
-        ;;
 
     *)
         echo "postrm called with unknown argument \`$1'" >&2
         exit 0
-
+    ;;
 esac
 
 
@@ -62,3 +52,5 @@
 # generated by other debhelper scripts.
 
 #DEBHELPER#
+
+exit 0

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.preinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.preinst?rev=562&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.preinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.preinst Wed Jul  1 22:10:13 2009
@@ -10,36 +10,30 @@
 #        * <new-preinst> `install' <old-version>
 #        * <new-preinst> `upgrade' <old-version>
 #        * <old-preinst> `abort-upgrade' <new-version>
-#
-# For details see /usr/share/doc/packaging-manual/
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
 
 case "$1" in
     install|upgrade)
-	
-	# create new diversion directories
-	test -d /emul/ia32-linux/usr/lib/nvidia || \
-		mkdir -p /emul/ia32-linux/usr/lib/nvidia || true
-	
-	# make diversions
-	dpkg-divert --add --rename --package nvidia-glx-ia32 --divert \
-		/emul/ia32-linux/usr/lib/nvidia/libGL.so.1.ia32-libs \
-		/emul/ia32-linux/usr/lib/libGL.so.1 > /dev/null
-	dpkg-divert --add --rename --package nvidia-glx-ia32 --divert \
-		/emul/ia32-linux/usr/lib/nvidia/libGL.so.1.2.ia32-libs \
-		/emul/ia32-linux/usr/lib/libGL.so.1.2 > /dev/null
-	dpkg-divert --add --rename --package nvidia-glx-ia32 --divert \
-		/emul/ia32-linux/usr/lib/nvidia/libGL.so.ia32-libs \
-		/emul/ia32-linux/usr/lib/libGL.so > /dev/null
+
+	# divert libGL.so* from ia32-libs to /usr/lib32/nvidia
+	test -d /usr/lib32/nvidia || \
+		mkdir -p /usr/lib32/nvidia || true
 
 	dpkg-divert --add --rename --package nvidia-glx-ia32 --divert \
-		/emul/ia32-linux/usr/lib/nvidia/libGL.so.1.ia32-libs \
-		/emul/ia32-linux/usr/lib/libGL.so.1 > /dev/null
+		/usr/lib32/nvidia/libGL.so.ia32-libs \
+		/usr/lib32/libGL.so > /dev/null
 	dpkg-divert --add --rename --package nvidia-glx-ia32 --divert \
-		/emul/ia32-linux/usr/lib/nvidia/libGL.so.1.2.ia32-libs \
-		/emul/ia32-linux/usr/lib/libGL.so.1.2 > /dev/null
+		/usr/lib32/nvidia/libGL.so.1.ia32-libs \
+		/usr/lib32/libGL.so.1 > /dev/null
 	dpkg-divert --add --rename --package nvidia-glx-ia32 --divert \
-		/emul/ia32-linux/usr/lib/nvidia/libGL.so.ia32-libs \
-		/emul/ia32-linux/usr/lib/libGL.so > /dev/null
+		/usr/lib32/nvidia/libGL.so.1.2.ia32-libs \
+		/usr/lib32/libGL.so.1.2 > /dev/null
+
+	# this file was not shipped in the package but generated by ldconfig
+	test ! -L /emul/ia32-linux/usr/lib/tls/libnvidia-tls.so.1 || \
+		rm /emul/ia32-linux/usr/lib/tls/libnvidia-tls.so.1 || true
 
     ;;
 
@@ -53,7 +47,6 @@
 esac
 
 
-
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.dirs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.dirs?rev=562&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.dirs (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.dirs Wed Jul  1 22:10:13 2009
@@ -1,1 +1,1 @@
-emul/ia32-linux/usr/lib
+usr/lib32

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.links
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.links?rev=562&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.links (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.links Wed Jul  1 22:10:13 2009
@@ -1,1 +1,1 @@
-emul/ia32-linux/usr/lib/libvdpau.so.185.18.14 emul/ia32-linux/usr/lib/libvdpau.so
+usr/lib32/libvdpau.so.185.18.14		usr/lib32/libvdpau.so

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.links.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.links.in?rev=562&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.links.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.links.in Wed Jul  1 22:10:13 2009
@@ -1,1 +1,1 @@
-emul/ia32-linux/usr/lib/libvdpau.so.#VERSION# emul/ia32-linux/usr/lib/libvdpau.so
+usr/lib32/libvdpau.so.#VERSION#		usr/lib32/libvdpau.so

Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=562&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Wed Jul  1 22:10:13 2009
@@ -228,21 +228,21 @@
 
 	if [ "$(DEB_BUILD_ARCH)" = "amd64" ] ; then \
 		install $(dirname)/usr/lib32/libGLcore.so.${version} \
-			$(CURDIR)/debian/nvidia-glx-ia32/emul/ia32-linux/usr/lib ; \
+			$(CURDIR)/debian/nvidia-glx-ia32/usr/lib32 ; \
 		install $(dirname)/usr/lib32/libGL.so.${version} \
-			$(CURDIR)/debian/nvidia-glx-ia32/emul/ia32-linux/usr/lib ; \
+			$(CURDIR)/debian/nvidia-glx-ia32/usr/lib32 ; \
 		install $(dirname)/usr/lib32/libcuda.so.${version} \
-			$(CURDIR)/debian/nvidia-glx-ia32/emul/ia32-linux/usr/lib ; \
+			$(CURDIR)/debian/nvidia-glx-ia32/usr/lib32 ; \
 		install $(dirname)/usr/lib32/libvdpau.so.${version} \
-			$(CURDIR)/debian/nvidia-libvdpau-ia32/emul/ia32-linux/usr/lib ; \
+			$(CURDIR)/debian/nvidia-libvdpau-ia32/usr/lib32 ; \
 		install $(dirname)/usr/lib32/libvdpau_nvidia.so.${version} \
-			$(CURDIR)/debian/nvidia-libvdpau-ia32/emul/ia32-linux/usr/lib ; \
+			$(CURDIR)/debian/nvidia-libvdpau-ia32/usr/lib32 ; \
 		install $(dirname)/usr/lib32/libvdpau_trace.so.${version} \
-			$(CURDIR)/debian/nvidia-libvdpau-ia32/emul/ia32-linux/usr/lib ; \
+			$(CURDIR)/debian/nvidia-libvdpau-ia32/usr/lib32 ; \
 		install $(dirname)/usr/lib32/libnvidia-tls.so.${version} \
-			$(CURDIR)/debian/nvidia-glx-ia32/emul/ia32-linux/usr/lib ; \
+			$(CURDIR)/debian/nvidia-glx-ia32/usr/lib32 ; \
 		install $(dirname)/usr/lib32/tls/libnvidia-tls.so.${version} \
-			$(CURDIR)/debian/nvidia-glx-ia32/emul/ia32-linux/usr/lib/tls ; \
+			$(CURDIR)/debian/nvidia-glx-ia32/usr/lib32/tls ; \
 	fi
 
 	install -m 755 $(dirname)/usr/bin/nvidia-bug-report.sh $(CURDIR)/debian/nvidia-glx/usr/bin/




More information about the Pkg-nvidia-devel mailing list