r8024 - in /packages/nvidia-graphics-drivers-legacy-390xx/trunk: ./ debian/
anbe at users.alioth.debian.org
anbe at users.alioth.debian.org
Sun Apr 22 01:24:26 BST 2018
Author: anbe
Date: Sun Apr 22 00:24:26 2018
New Revision: 8024
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=8024
Log:
merge changes from n-g-d 390.48-3 (UNRELEASED)
Modified:
packages/nvidia-graphics-drivers-legacy-390xx/trunk/ (props changed)
packages/nvidia-graphics-drivers-legacy-390xx/trunk/debian/changelog
packages/nvidia-graphics-drivers-legacy-390xx/trunk/debian/control
packages/nvidia-graphics-drivers-legacy-390xx/trunk/debian/libnvidia-egl-wayland1.install.in
packages/nvidia-graphics-drivers-legacy-390xx/trunk/debian/libnvidia-egl-wayland1.links.in
packages/nvidia-graphics-drivers-legacy-390xx/trunk/debian/libnvidia-egl-wayland1.lintian-overrides.in
packages/nvidia-graphics-drivers-legacy-390xx/trunk/debian/nvidia-alternative.postinst.in
Propchange: packages/nvidia-graphics-drivers-legacy-390xx/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 22 00:24:26 2018
@@ -29,4 +29,4 @@
/packages/nvidia-graphics-drivers/branches/387:7561-7901
/packages/nvidia-graphics-drivers/branches/390:7733-7905
/packages/nvidia-graphics-drivers/branches/jessie:5163-5181
-/packages/nvidia-graphics-drivers/trunk:7130-7901
+/packages/nvidia-graphics-drivers/trunk:7130-7901,8000-8023
Modified: packages/nvidia-graphics-drivers-legacy-390xx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-390xx/trunk/debian/changelog?rev=8024&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-390xx/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers-legacy-390xx/trunk/debian/changelog Sun Apr 22 00:24:26 2018
@@ -1,4 +1,4 @@
-nvidia-graphics-drivers-legacy-390xx (390.48-3) UNRELEASED; urgency=medium
+nvidia-graphics-drivers-legacy-390xx (390.48-4) UNRELEASED; urgency=medium
* Fork as new legacy-390xx source package.
* Do not build packages nvidia-detect, nvidia-legacy-check, nvidia-cuda-mps,
@@ -7,6 +7,18 @@
* Switch to debhelper compat level 11.
-- Andreas Beckmann <anbe at debian.org> Tue, 17 Apr 2018 15:23:18 +0200
+
+
+
+nvidia-graphics-drivers (390.48-3) UNRELEASED; urgency=medium
+
+ * 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
nvidia-graphics-drivers (390.48-2) unstable; urgency=medium
Modified: packages/nvidia-graphics-drivers-legacy-390xx/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-390xx/trunk/debian/control?rev=8024&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-390xx/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers-legacy-390xx/trunk/debian/control Sun Apr 22 00:24:26 2018
@@ -99,7 +99,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,
@@ -147,7 +147,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,
@@ -161,7 +161,7 @@
${nvidia}-driver-libs,
libgl1-${nvidia}-glvnd-glx,
${nvidia}-vulkan-icd,
-Description: NVIDIA metapackage (non-GLVND OpenGL/GLX/EGL/GLES libraries)${nvidia:LegacyDesc}
+Description: NVIDIA metapackage (non-GLVND OpenGL/GLX/EGL/GLES libraries)${nvidia:LegacyDescShort}
This metapackage depends on the (non-GLVND) NVIDIA binary libraries
that provide optimized hardware acceleration of
OpenGL/GLX/EGL/GLES applications via a direct-rendering X Server.
@@ -175,9 +175,10 @@
${misc:Depends}
Conflicts:
libgl1-${nvidia}-glx-i386,
-Description: NVIDIA metapackage (non-GLVND OpenGL/GLX/EGL/GLES 32-bit libraries)${nvidia:LegacyDescShort}
+Description: NVIDIA metapackage (non-GLVND OpenGL/EGL/etc. 32-bit libraries)${nvidia:LegacyDescShort}
This metapackage helps the automatic installation of the 32-bit NVIDIA
- OpenGL/GLX/EGL/GLES libraries when installing ${nvidia}-driver-libs-nonglvnd
+ OpenGL/GLX/EGL/GLES libraries when installing
+ ${nvidia}-driver-libs-nonglvnd
on amd64 with foreign architecture i386 enabled.
#Package: xserver-xorg-video-${nvidia}
@@ -622,12 +623,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,
@@ -640,16 +643,18 @@
This package contains the private libraries used by 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}),
- ${misc:Depends}
-Enhances:
- libegl1+eglexternalplatform,
+# libegl1+eglexternalplatform |
+ libegl-${nvidia}0 (= ${binary:Version}),
+ lib${nvidia}-egl-wayland1 (= ${binary:Version}),
+ ${misc:Depends}
+#Enhances:
+# libegl1+eglexternalplatform,
Provides:
egl-wayland-icd,
Description: NVIDIA Wayland EGL external platform library (ICD)
@@ -699,7 +704,7 @@
vulkan-icd,
Conflicts:
${nvidia}-vulkan-icd,
-Description: NVIDIA Vulkan installable client driver (ICD) (non-GLVND variant)${nvidia:LegacyDesc}
+Description: NVIDIA Vulkan ICD (non-GLVND variant)${nvidia:LegacyDesc}
Vulkan is a multivendor open standard by the Khronos Group for 3D graphics.
.
This metapackage provides the NVIDIA installable client driver (ICD) for
Modified: packages/nvidia-graphics-drivers-legacy-390xx/trunk/debian/libnvidia-egl-wayland1.install.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-390xx/trunk/debian/libnvidia-egl-wayland1.install.in?rev=8024&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-390xx/trunk/debian/libnvidia-egl-wayland1.install.in (original)
+++ packages/nvidia-graphics-drivers-legacy-390xx/trunk/debian/libnvidia-egl-wayland1.install.in Sun Apr 22 00:24:26 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-legacy-390xx/trunk/debian/libnvidia-egl-wayland1.links.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-390xx/trunk/debian/libnvidia-egl-wayland1.links.in?rev=8024&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-390xx/trunk/debian/libnvidia-egl-wayland1.links.in (original)
+++ packages/nvidia-graphics-drivers-legacy-390xx/trunk/debian/libnvidia-egl-wayland1.links.in Sun Apr 22 00:24:26 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-legacy-390xx/trunk/debian/libnvidia-egl-wayland1.lintian-overrides.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-390xx/trunk/debian/libnvidia-egl-wayland1.lintian-overrides.in?rev=8024&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-390xx/trunk/debian/libnvidia-egl-wayland1.lintian-overrides.in (original)
+++ packages/nvidia-graphics-drivers-legacy-390xx/trunk/debian/libnvidia-egl-wayland1.lintian-overrides.in Sun Apr 22 00:24:26 2018
@@ -3,3 +3,6 @@
hardening-no-fortify-functions
hardening-no-relro
hardening-no-stackprotector
+
+# Lintian and debhelper disagree w.r.t. a library in a private directory.
+package-has-unnecessary-activation-of-ldconfig-trigger
Modified: packages/nvidia-graphics-drivers-legacy-390xx/trunk/debian/nvidia-alternative.postinst.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-390xx/trunk/debian/nvidia-alternative.postinst.in?rev=8024&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-390xx/trunk/debian/nvidia-alternative.postinst.in (original)
+++ packages/nvidia-graphics-drivers-legacy-390xx/trunk/debian/nvidia-alternative.postinst.in Sun Apr 22 00:24:26 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#/)
More information about the pkg-nvidia-devel
mailing list