[pkg-nvidia-devel] r1424 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog compat control module/debian/compat module/debian/control.template.in rules

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

Author: anbe-guest
Date: Wed Aug 25 00:01:59 2010
New Revision: 1424

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1424
Log:
debhelper 8

Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/compat
    packages/nvidia-graphics-drivers/trunk/debian/control
    packages/nvidia-graphics-drivers/trunk/debian/module/debian/compat
    packages/nvidia-graphics-drivers/trunk/debian/module/debian/control.template.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=1424&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Wed Aug 25 00:01:59 2010
@@ -6,6 +6,8 @@
     the diversion of libglx.so to new package libglx-nvidia-alternatives and
     use a trigger there to create the alternatives.
   * Divert the debug symbols of libglx.so from Xorg, too.
+  * Update main and module source packages to debhelper 8.
+    - dh_makeshlibs automatically picks up libraries in /usr/lib/nvidia etc.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Tue, 24 Aug 2010 19:27:52 +0200
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/compat?rev=1424&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/compat (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/compat Wed Aug 25 00:01:59 2010
@@ -1,1 +1,1 @@
-7
+8

Modified: packages/nvidia-graphics-drivers/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=1424&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Wed Aug 25 00:01:59 2010
@@ -8,7 +8,7 @@
 Vcs-Svn: svn://svn.debian.org/svn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/
 Build-Depends:
- debhelper (>= 7.4.16~),
+ debhelper (>= 8),
  bzip2,
  dkms (>= 2.1.1.1),
  libxext6,
@@ -217,7 +217,7 @@
 Package: nvidia-kernel-source
 Section: non-free/kernel
 Architecture: i386 amd64
-Depends: ${misc:Depends}, debhelper (>= 7.2.3~), make, quilt (>= 0.46-7~)
+Depends: ${misc:Depends}, debhelper (>= 8), make, quilt (>= 0.46-7~)
 Recommends: module-assistant | kernel-package,
  nvidia-glx${nvidia:Legacy} (>= ${nvidia:Version}), nvidia-kernel-common
 Conflicts: binutils-gold (>> 2.20.51)

Modified: packages/nvidia-graphics-drivers/trunk/debian/module/debian/compat
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/module/debian/compat?rev=1424&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/module/debian/compat (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/module/debian/compat Wed Aug 25 00:01:59 2010
@@ -1,1 +1,1 @@
-7
+8

Modified: packages/nvidia-graphics-drivers/trunk/debian/module/debian/control.template.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/module/debian/control.template.in?rev=1424&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/module/debian/control.template.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/module/debian/control.template.in Wed Aug 25 00:01:59 2010
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-devel at lists.alioth.debian.org>
 Uploaders: Russ Allbery <rra at debian.org>
-Build-Depends: debhelper (>= 7.2.3~), quilt (>= 0.46-7~)
+Build-Depends: debhelper (>= 8), quilt (>= 0.46-7~)
 Standards-Version: 3.9.0
 Homepage: http://www.nvidia.com/
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=1424&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Wed Aug 25 00:01:59 2010
@@ -169,15 +169,7 @@
 	dh_bugfiles -A
 
 override_dh_makeshlibs:
-	test ! -d debian/libgl1-nvidia$(legacy)-glx/usr/lib/nvidia || \
-		ln -s nvidia/libGL.so.1 debian/libgl1-nvidia$(legacy)-glx/usr/lib/
-	test ! -d debian/libgl1-nvidia$(legacy)-glx-ia32/usr/lib32/nvidia || \
-		ln -s nvidia/libGL.so.1 debian/libgl1-nvidia$(legacy)-glx-ia32/usr/lib32/
-	dh_makeshlibs -Xvdpau/libvdpau_nvidia.so
-	test ! -d debian/libgl1-nvidia$(legacy)-glx || \
-		rm -f debian/libgl1-nvidia$(legacy)-glx/usr/lib/libGL.so.1
-	test ! -d debian/libgl1-nvidia$(legacy)-glx-ia32 || \
-		rm -f debian/libgl1-nvidia$(legacy)-glx-ia32/usr/lib32/libGL.so.1
+	dh_makeshlibs -Xvdpau/libvdpau_nvidia.so -Xtls/libnvidia-tls.so
 	# Redirect shlibs for libGL.so.1 to libgl1-mesa-glx | libgl1.
 	test ! -d debian/libgl1-nvidia$(legacy)-glx || \
 		sed -i -e '/^libGL 1 /s/.*/libGL 1 libgl1-mesa-glx | libgl1/' debian/libgl1-nvidia$(legacy)-glx/DEBIAN/shlibs