[pkg-nvidia-devel] r385 - in /packages/nvidia-graphics-drivers/trunk: debian.binary/conf.mk debian.binary/rules debian/changelog debian/nvidia-glx.links.in debian/nvidia-glx.postrm.in debian/rules

[rdonald at users.alioth.debian.org]

Author: rdonald
Date: Sun May 25 02:59:03 2008
New Revision: 385

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=385
Log:
prepare 169.12-2 release

Modified:
    packages/nvidia-graphics-drivers/trunk/debian.binary/conf.mk
    packages/nvidia-graphics-drivers/trunk/debian.binary/rules
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm.in
    packages/nvidia-graphics-drivers/trunk/debian/rules

Modified: packages/nvidia-graphics-drivers/trunk/debian.binary/conf.mk
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian.binary/conf.mk?rev=385&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian.binary/conf.mk (original)
+++ packages/nvidia-graphics-drivers/trunk/debian.binary/conf.mk Sun May 25 02:59:03 2008
@@ -104,6 +104,8 @@
 		cp $(CURDIR)/nv-kernel.o.x86_64 $(CURDIR)/nv-kernel.o ; \
 	fi
 	#patch for XEN
+	patch -p3 < $(CURDIR)/debian/patches/xen.patch
+	
 	touch configure-stamp
 
 

Modified: packages/nvidia-graphics-drivers/trunk/debian.binary/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian.binary/rules?rev=385&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian.binary/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian.binary/rules Sun May 25 02:59:03 2008
@@ -145,7 +145,7 @@
 	   dpatch deapply-all ; \
 	   rm -rf patch-stamp debian/patched ; \
 	fi
-	patch -R debian/patches/xen.patch
+	patch -R -p3 < $(CURDIR)/debian/patches/xen.patch
 	
 	   
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=385&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sun May 25 02:59:03 2008
@@ -1,4 +1,4 @@
-nvidia-graphics-drivers (169.12-2) UNRELEASED; urgency=low
+nvidia-graphics-drivers (169.12-2) unstable; urgency=low
 
   * Add linux-modules-nonfree-2.6 intergration (closes: #446232, #437129)
   * create storage directories for old patches and don't include in binary
@@ -7,7 +7,7 @@
   * Patch for 2.6.25 support
   * Patch to compile on xen enabled kernels (closes: #476504, #481485)
 
- -- Randall Donald <rdonald at debian.org>  Tue, 06 May 2008 22:10:08 -0700
+ -- Randall Donald <rdonald at debian.org>  Sat, 24 May 2008 19:57:18 -0700
 
 nvidia-graphics-drivers (169.12-1) unstable; urgency=low
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links.in?rev=385&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links.in Sun May 25 02:59:03 2008
@@ -4,5 +4,4 @@
 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/xorg/modules/libnvidia-wfb.so.#VERSION# usr/lib/xorg/modules/libwfb.so
 usr/lib/libcuda.so.#VERSION#			usr/lib/libcuda.so

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm.in?rev=385&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm.in Sun May 25 02:59:03 2008
@@ -29,7 +29,6 @@
 	dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libglx.so.xlibmesa /usr/lib/xorg/modules/extensions/libglx.so > /dev/null
 
 	dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
-	dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libwfb.so.xserver-xorg-core /usr/lib/xorg/modules/libwfb.so > /dev/null	
 	rm -f /usr/lib/xorg/modules/extensions/libglx.so.#VERSION# 2> /dev/null || true
 	if [ -d /usr/lib/nvidia ]; then
 		rmdir /usr/lib/nvidia/ || true;

Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=385&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Sun May 25 02:59:03 2008
@@ -59,7 +59,7 @@
 	# extract both so we can fetch the kernel object code for both arches
 	./${filename_x86} --extract-only
 	./${filename_x86_64} --extract-only
-	if false && test -d $(CURDIR)/patches; \
+	if test -d $(CURDIR)/patches; \
 	then \
 		pwd; \
 		ls -al; \