r8017 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog control libnvidia-egl-wayland1.install.in libnvidia-egl-wayland1.links.in nvidia-alternative.postinst.in

[anbe at users.alioth.debian.org]

Author: anbe
Date: Sat Apr 21 21:27:32 2018
New Revision: 8017

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=8017
Log:
support renamed variants of libnvidia-egl-wayland1/nvidia-egl-wayland-icd

Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/control
    packages/nvidia-graphics-drivers/trunk/debian/libnvidia-egl-wayland1.install.in
    packages/nvidia-graphics-drivers/trunk/debian/libnvidia-egl-wayland1.links.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-alternative.postinst.in

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=8017&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog	(original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog	Sat Apr 21 21:27:32 2018
@@ -2,6 +2,8 @@
 
   * Prepare nvidia-detect for the upcoming nvidia-legacy-390xx packages.
   * Prepare for the removal of i386/armhf support in 396.xx.
+  * Support renamed variants of libnvidia-egl-wayland1/nvidia-egl-wayland-icd
+    in legacy drivers.
   * Restrict watch file to releases from the 390.xx legacy branch.
 
  -- Andreas Beckmann <anbe at debian.org>  Sat, 21 Apr 2018 16:38:57 +0200

Modified: packages/nvidia-graphics-drivers/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=8017&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control	(original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control	Sat Apr 21 21:27:32 2018
@@ -109,7 +109,7 @@
 # libgles-${nvidia}1 (= ${binary:Version}),
  libgles-${nvidia}2 (= ${binary:Version}),
  lib${nvidia}-cfg1 (= ${binary:Version}),
- nvidia-egl-wayland-icd (= ${binary:Version}),
+ ${nvidia}-egl-wayland-icd (= ${binary:Version}),
  ${nvidia}-vulkan-icd (= ${binary:Version}) [amd64 i386],
 Conflicts:
  libglvnd0-nvidia,
@@ -157,7 +157,7 @@
  libgles-${nvidia}1 (= ${binary:Version}),
  libgles-${nvidia}2 (= ${binary:Version}),
  lib${nvidia}-cfg1 (= ${binary:Version}),
- nvidia-egl-wayland-icd (= ${binary:Version}),
+ ${nvidia}-egl-wayland-icd (= ${binary:Version}),
  ${nvidia}-nonglvnd-vulkan-icd (= ${binary:Version}) [amd64 i386],
 Conflicts:
  libglvnd0-nvidia,
@@ -710,12 +710,14 @@
  This metapackage provides the NVIDIA installable client driver (ICD) for
  EGL via GLVND which supports NVIDIA GPUs.
 
+#Package: lib${nvidia}-egl-wayland1
 Package: libnvidia-egl-wayland1
 Architecture: i386 amd64 armhf
 Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends}
 Depends:
+ ${nvidia}-alternative (= ${binary:Version}),
  ${shlibs:Depends}, ${misc:Depends}
 Breaks:
  libnvidia-egl-wayland,
@@ -742,13 +744,14 @@
  This package provides the common files for the NVIDIA implementation
  of Wayland as an EGL external platform.
 
+#Package: ${nvidia}-egl-wayland-icd
 Package: nvidia-egl-wayland-icd
 Architecture: i386 amd64 armhf
 Multi-Arch: same
 Depends:
  nvidia-egl-wayland-common,
  libegl1+eglexternalplatform | libegl-${nvidia}0 (= ${binary:Version}),
- libnvidia-egl-wayland1 (= ${binary:Version}),
+ lib${nvidia}-egl-wayland1 (= ${binary:Version}),
  ${misc:Depends}
 Enhances:
  libegl1+eglexternalplatform,

Modified: packages/nvidia-graphics-drivers/trunk/debian/libnvidia-egl-wayland1.install.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libnvidia-egl-wayland1.install.in?rev=8017&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libnvidia-egl-wayland1.install.in	(original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libnvidia-egl-wayland1.install.in	Sat Apr 21 21:27:32 2018
@@ -1 +1 @@
-libnvidia-egl-wayland.so.1.0.2	#LIBDIR#/
+libnvidia-egl-wayland.so.1.0.2	#LIBDIR#/#PRIVATE#/

Modified: packages/nvidia-graphics-drivers/trunk/debian/libnvidia-egl-wayland1.links.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libnvidia-egl-wayland1.links.in?rev=8017&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libnvidia-egl-wayland1.links.in	(original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libnvidia-egl-wayland1.links.in	Sat Apr 21 21:27:32 2018
@@ -1 +1 @@
-#LIBDIR#/libnvidia-egl-wayland.so.1.0.2	#LIBDIR#/libnvidia-egl-wayland.so.1
+#LIBDIR#/#PRIVATE#/libnvidia-egl-wayland.so.1.0.2	#LIBDIR#/#PRIVATE#/libnvidia-egl-wayland.so.1

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-alternative.postinst.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-alternative.postinst.in?rev=8017&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-alternative.postinst.in	(original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-alternative.postinst.in	Sat Apr 21 21:27:32 2018
@@ -53,6 +53,7 @@
 		$(add_multiarch_slave /usr/lib "" libGLX_nvidia.so.0 /usr/lib #PRIVATE#/)
 		$(add_multiarch_slave /usr/lib "" libGLX_indirect.so.0 /usr/lib #PRIVATE#/)
 		$(add_multiarch_slave /usr/lib "" libEGL_nvidia.so.0 /usr/lib #PRIVATE#/)
+		$(add_multiarch_slave /usr/lib "" libnvidia-egl-wayland.so.1 /usr/lib #PRIVATE#/)
 		$(add_multiarch_slave /usr/lib "" libGLESv1_CM_nvidia.so.1 /usr/lib #PRIVATE#/)
 		$(add_multiarch_slave /usr/lib "" libGLESv2_nvidia.so.2 /usr/lib #PRIVATE#/)
 		$(add_multiarch_slave /usr/lib "" libcuda.so.1 /usr/lib #PRIVATE#/)