[pkg-nvidia-devel] r913 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog rules

[anbe-guest at users.alioth.debian.org]

Author: anbe-guest
Date: Fri May 21 10:03:57 2010
New Revision: 913

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=913
Log:
prepare for running dh_install --list-missing

Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    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=913&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Fri May 21 10:03:57 2010
@@ -16,6 +16,7 @@
     old versions of the nvidia-libvdpau* packages
   * nvidia-glx: cleanup /etc/default/nvidia-glx.dpkg-new that might be left
     over from previous upgrades
+  * run dh_install --list-missing
 
  -- Andreas Beckmann <debian at abeckmann.de>  Thu, 20 May 2010 09:52:43 +0200
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=913&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Fri May 21 10:03:57 2010
@@ -39,7 +39,6 @@
 	sh ${filename_x86_64} --extract-only
 	ln -s ${dirname_x86} NVIDIA-Linux-i386
 	ln -s ${dirname_x86_64} NVIDIA-Linux-amd64
-	ln -s NVIDIA-Linux-$(DEB_BUILD_ARCH) NVIDIA-Linux
 	ls -al
 	touch $@
 
@@ -49,7 +48,7 @@
 	dh $@
 
 override_dh_auto_clean:
-	rm -f NVIDIA-Linux NVIDIA-Linux-i386 NVIDIA-Linux-amd64
+	rm -f NVIDIA-Linux-i386 NVIDIA-Linux-amd64
 	rm -fr $(dirname_x86) $(dirname_x86_64)
 	rm -fr debian/temp
 
@@ -64,9 +63,13 @@
 #  - module-assistant and make-kpkg
 #  - dkms
 override_dh_auto_install:
+	# "Install" into debian/tmp.
+	cp -al NVIDIA-Linux-$(DEB_BUILD_ARCH)/ debian/tmp
+
+	# Build the nvidia-kernel-source tree.
 	mkdir -p $(module_source)
-	cp -a NVIDIA-Linux/usr/src/nv/* $(module_source)/
-	cp -a NVIDIA-Linux/usr/share/doc/NVIDIA_Changelog $(module_source)/
+	mv debian/tmp/usr/src/nv/* $(module_source)/
+	cp -a debian/tmp/usr/share/doc/NVIDIA_Changelog $(module_source)/
 
 	# We don't want these makefiles that don't work with kbuild.
 	rm $(module_source)/makefile
@@ -109,8 +112,11 @@
 	ls -la $(dkms_source)
 	dh_dkms -V $(version)
 
+override_dh_install:
+	dh_install --list-missing
+
 override_dh_installchangelogs:
-	dh_installchangelogs NVIDIA-Linux/usr/share/doc/NVIDIA_Changelog
+	dh_installchangelogs debian/tmp/usr/share/doc/NVIDIA_Changelog
 
 override_dh_installinit:
 	dh_installinit -- start 20 2 3 4 5 .