[pkg-nvidia-devel] r684 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog nvidia-libvdpau1-ia32.dirs nvidia-libvdpau1-ia32.links.in nvidia-libvdpau1.dirs nvidia-libvdpau1.links.in rules

[rdonald at users.alioth.debian.org]

Author: rdonald
Date: Thu Jan 21 00:22:12 2010
New Revision: 684

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=684
Log:
haralds patch

Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-ia32.dirs
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-ia32.links.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.dirs
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.links.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=684&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Thu Jan 21 00:22:12 2010
@@ -1,5 +1,11 @@
 nvidia-graphics-drivers (190.53-1) unstable; urgency=low
 
+  [Harald Dunkel]
+  * fix nvidia-libvdpau1.dirs
+  * fix find-and-replace loop to ignore debian.binary/patches directory
+  * fix lib32 path for libvdpau_nvidia and libvdpau_trace
+
+  [Randall Donald]
   * New upstream. (closes: #563022)
   * Add new vdpau directory structure
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-ia32.dirs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-ia32.dirs?rev=684&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-ia32.dirs (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-ia32.dirs Thu Jan 21 00:22:12 2010
@@ -1,1 +1,2 @@
 usr/lib32
+usr/lib32/vdpau

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-ia32.links.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-ia32.links.in?rev=684&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-ia32.links.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-ia32.links.in Thu Jan 21 00:22:12 2010
@@ -1,3 +1,3 @@
 usr/lib32/libvdpau.so.#VERSION#		usr/lib32/libvdpau.so.1
 usr/lib32/libvdpau.so.1			usr/lib32/libvdpau.so
-usr/lib32/libvdpau_trace.so.#VERSION#	usr/lib32/libvdpau_trace.so
+usr/lib32/vdpau/libvdpau_trace.so.#VERSION#	usr/lib32/libvdpau_trace.so

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.dirs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.dirs?rev=684&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.dirs (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.dirs Thu Jan 21 00:22:12 2010
@@ -1,1 +1,1 @@
-usr/lib
+usr/lib/vdpau

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.links.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.links.in?rev=684&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.links.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.links.in Thu Jan 21 00:22:12 2010
@@ -1,2 +1,2 @@
 usr/lib/libvdpau.so.#VERSION#		usr/lib/libvdpau.so.1
-usr/lib/libvdpau_trace.so.#VERSION#	usr/lib/libvdpau_trace.so
+usr/lib/vdpau/libvdpau_trace.so.#VERSION#	usr/lib/libvdpau_trace.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=684&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Thu Jan 21 00:22:12 2010
@@ -112,8 +112,8 @@
 		# Prepare debian files for module package
 	    cp -a $(CURDIR)/debian.binary/* $(CURDIR)/debian/temp/modules/nvidia-kernel/debian
 	    for f in `ls $(CURDIR)/debian.binary` ; do \
-		perl -p \
-		-e 's{#BASE_VERSION#}{$(base_version)}g;' \
+	       test ! -f $(CURDIR)/debian.binary/$$f || perl -p \
+	        -e 's{#BASE_VERSION#}{$(base_version)}g;' \
 		-e 's{#RELEASE#}{$(release)}g;' \
 		-e 's{#VERSION#}{$(version)}g;' \
 		-e 's{#UPSTREAMVERSION#}{$(upstreamversion)}g;' \
@@ -240,10 +240,10 @@
 			$(CURDIR)/debian/nvidia-glx-ia32/usr/lib32 ; \
 		install $(dirname)/usr/lib32/libvdpau.so.${version} \
 			$(CURDIR)/debian/nvidia-vdpau-driver-ia32/usr/lib32 ; \
-		install $(dirname)/usr/lib32/libvdpau_nvidia.so.${version} \
-			$(CURDIR)/debian/nvidia-libvdpau1-ia32/usr/lib32 ; \
-		install $(dirname)/usr/lib32/libvdpau_trace.so.${version} \
-			$(CURDIR)/debian/nvidia-libvdpau1-ia32/usr/lib32 ; \
+		install $(dirname)/usr/lib32/vdpau/libvdpau_nvidia.so.${version} \
+			$(CURDIR)/debian/nvidia-libvdpau1-ia32/usr/lib32/vdpau ; \
+		install $(dirname)/usr/lib32/vdpau/libvdpau_trace.so.${version} \
+			$(CURDIR)/debian/nvidia-libvdpau1-ia32/usr/lib32/vdpau ; \
 		install $(dirname)/usr/lib32/libnvidia-tls.so.${version} \
 			$(CURDIR)/debian/nvidia-glx-ia32/usr/lib32 ; \
 		install $(dirname)/usr/lib32/tls/libnvidia-tls.so.${version} \