[pkg-nvidia-devel] r1150 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog nvidia-libgl1-ia32.lintian-overrides.in nvidia-libgl1.lintian-overrides.in rules

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

Author: anbe-guest
Date: Fri Jun 25 10:56:23 2010
New Revision: 1150

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1150
Log:
* Fix the dpkg-shlibdeps generation of packages built while nvidia-glx is
  installed: add back a special shlibs entry for libGL.so.1 and remove
  libGL.so.1 from the symbols file to ensure to generate a dependency on
  libgl1-mesa-glx | libgl1 only.  (Closes: #587091)

Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1-ia32.lintian-overrides.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.lintian-overrides.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=1150&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Fri Jun 25 10:56:23 2010
@@ -4,6 +4,10 @@
   * New upstream release.
     - Drop patch NVIDIA_kernel-195.36.24-682377.diff, now included.
   * Update nvidia.ids.
+  * Fix the dpkg-shlibdeps generation of packages built while nvidia-glx is
+    installed: add back a special shlibs entry for libGL.so.1 and remove
+    libGL.so.1 from the symbols file to ensure to generate a dependency on
+    libgl1-mesa-glx | libgl1 only.  (Closes: #587091)
   * Add /usr/share/X11/xorg.conf.d/99-nvidia-glx.conf for autoconfiguration of
     Xorg in single-GPU setups.  (Closes: #586502)
   * Split the nvidia-glx{,-ia32} packages, move the runtime libraries to

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1-ia32.lintian-overrides.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1-ia32.lintian-overrides.in?rev=1150&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1-ia32.lintian-overrides.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1-ia32.lintian-overrides.in Fri Jun 25 10:56:23 2010
@@ -13,3 +13,10 @@
 # In order to retain its functionality (i.e. pointing the MESA libGL.so.1)
 # we ship a link pointing to the diverted library.
 nvidia-libgl1#LEGACY#-ia32: non-dev-pkg-with-shlib-symlink
+
+# Packages built against the NVIDIA libGL should declare dependencies on
+# the free version for Debian's purposes.  Therefore we use a special
+# combination of shlibs files (for libGL.so.1) and symbols files (for all
+# other libraries).
+nvidia-libgl1#LEGACY#-ia32: shlibs-declares-dependency-on-other-package ia32-libs (>= 20090804)
+nvidia-libgl1#LEGACY#-ia32: shlib-missing-in-symbols-control-file libGL 1 for usr/lib32/libGL.so.#VERSION#

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.lintian-overrides.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.lintian-overrides.in?rev=1150&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.lintian-overrides.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.lintian-overrides.in Fri Jun 25 10:56:23 2010
@@ -14,6 +14,13 @@
 # The diversions are placed here.
 nvidia-libgl1#LEGACY#: package-contains-empty-directory usr/lib/nvidia/
 
+# Packages built against the NVIDIA libGL should declare dependencies on
+# the free version for Debian's purposes.  Therefore we use a special
+# combination of shlibs files (for libGL.so.1) and symbols files (for all
+# other libraries).
+nvidia-libgl1#LEGACY#: shlibs-declares-dependency-on-other-package libgl1-mesa-glx | libgl1
+nvidia-libgl1#LEGACY#: shlib-missing-in-symbols-control-file libGL 1 for usr/lib/libGL.so.#VERSION#
+
 # This package is a strange special case since it overrides standard
 # libraries and diverts them, so the package name won't ever be able to
 # match the library names it provides.

Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=1150&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Fri Jun 25 10:56:23 2010
@@ -147,6 +147,12 @@
 
 override_dh_makeshlibs:
 	dh_makeshlibs -Xusr/lib/vdpau -Xusr/lib32/vdpau
+	# Redirect shlibs for libGL.so.1 to libgl1-mesa-glx | libgl1.
+	sed -i -e '/^libGL 1 /s/.*/libGL 1 libgl1-mesa-glx | libgl1/' debian/nvidia-libgl1$(legacy)/DEBIAN/shlibs
+	sed -i -e '/^libGL 1 /s/.*/libGL 1 ia32-libs (>= 20090804)/' debian/nvidia-libgl1$(legacy)-ia32/DEBIAN/shlibs
+	# Remove libGL.so from symbols files in order not to override our special shlibs files.
+	sed -i -e '/^libGL\.so/,/^lib/{/^libGL\.so\|^ /d}' debian/nvidia-libgl1$(legacy)/DEBIAN/symbols
+	sed -i -e '/^libGL\.so/,/^lib/{/^libGL\.so\|^ /d}' debian/nvidia-libgl1$(legacy)-ia32/DEBIAN/symbols
 
 override_dh_gencontrol:
 	dh_gencontrol -- -V'nvidia:Version=$(version)' -V'nvidia:Legacy=$(legacy)' \