[Pkg-fglrx-devel] r1437 - fglrx-driver/trunk/debian
Andreas Beckmann
anbe at moszumanska.debian.org
Mon Oct 13 08:43:53 UTC 2014
Author: anbe
Date: 2014-10-13 08:43:52 +0000 (Mon, 13 Oct 2014)
New Revision: 1437
Modified:
fglrx-driver/trunk/debian/amd-libopencl1.lintian-overrides
fglrx-driver/trunk/debian/amd-libopencl1.symbols
fglrx-driver/trunk/debian/changelog
Log:
rewrite the amd-libopencl1 symbols file
Modified: fglrx-driver/trunk/debian/amd-libopencl1.lintian-overrides
===================================================================
--- fglrx-driver/trunk/debian/amd-libopencl1.lintian-overrides 2014-10-13 00:18:47 UTC (rev 1436)
+++ fglrx-driver/trunk/debian/amd-libopencl1.lintian-overrides 2014-10-13 08:43:52 UTC (rev 1437)
@@ -8,3 +8,5 @@
# The free libOpenCL.so.1 library is preferred.
symbols-declares-dependency-on-other-package ocl-icd-libopencl1
+symbols-declares-dependency-on-other-package ocl-icd-libopencl1 (>= 1.0)
+symbols-declares-dependency-on-other-package ocl-icd-libopencl1 (>= 2.2.0)
Modified: fglrx-driver/trunk/debian/amd-libopencl1.symbols
===================================================================
--- fglrx-driver/trunk/debian/amd-libopencl1.symbols 2014-10-13 00:18:47 UTC (rev 1436)
+++ fglrx-driver/trunk/debian/amd-libopencl1.symbols 2014-10-13 08:43:52 UTC (rev 1437)
@@ -1,21 +1,36 @@
-# We use alternative dependencies:
-# * the first one (default one) is for symbols specific to this implementation
-# There should be none
-# * the following ones are for symbols from OpenCL 1.0, 1.1 and 1.2
-# They all provoke a dependency against two virtual packages: the "libopencl"
-# one and and versionned virtual package "libopencl-VERSION-SOVERSION"
-# Note: no #MINVER# is used here, so the "version" field for these dependencies
-# is irrelevant
-# Note bis: as OpenCL 1.0 does not really support ICD and as OpenCL 1.1 is
-# supported by all current implementation, OpenCL 1.0 and 1.1 are merged
-# with respect to dependencies
-libOpenCL.so.1 #PACKAGE# #MINVER#
-| ocl-icd-libopencl1 | libopencl1, libopencl-1.1-1
-| ocl-icd-libopencl1 | libopencl1, libopencl-1.2-1
-| ocl-icd-libopencl1 | libopencl1, libopencl-2.0-1
-# As ocl-icd use versionned symbols, we use this information instead of
+# We use alternative dependency templates:
+# * In each template "ocl-icd-libopencl1" (maybe versioned) is used as the
+# first alternative so that, by default, the free ICD Loader will be
+# installed on a Debian system
+# We use it on all parts as dependencies can be reordered (see #739409)
+# * The first template (default template) is in fact always added (see #737731)
+# by dpkg-shlibdeps
+# This always generates an alternate dependency on the virtual package
+# "libopencl1"
+# * The next template is for symbols specific to this implementation
+# There should be none, as their usage would prevent using alternate
+# implementations of libOpenCL.so.1
+# This is the only exception as there will be neither an "ocl-icd-libopencl1"
+# nor any other alternative to "#PACKAGE# #MINVER#"
+# * the following ones are for symbols from OpenCL 1.0, 1.1, 1.2, 2.0, ...
+# They all generate a dependency on the versioned virtual package
+# "libopencl-VERSION-1" (the last -1 is the soname of current libopencl)
+# Note: as OpenCL 1.0 does not really support ICD and as OpenCL 1.1 is
+# supported by all current implementation, OpenCL 1.0 is treated as
+# OpenCL 1.1 with respect to dependencies
+# Note bis: #MINVER# is used with the real package, however, as
+# ocl-icd-libopencl1 and #PACKAGE# provides the virtual packages, this
+# version enforcement is purely cosmetic
+libOpenCL.so.1 ocl-icd-libopencl1 | #PACKAGE# #MINVER# | libopencl1
+# symbols specific to this implementation - would forbid using alternate implementations
+| #PACKAGE# #MINVER#
+# symbols conforming to the OpenCL standards - can use alternate implementations
+| ocl-icd-libopencl1 (>= 1.0) | #PACKAGE# #MINVER# | libopencl-1.1-1
+| ocl-icd-libopencl1 (>= 1.0) | #PACKAGE# #MINVER# | libopencl-1.2-1
+| ocl-icd-libopencl1 (>= 2.2.0) | #PACKAGE# #MINVER# | libopencl-2.0-1
+# As AMD uses versioned symbols, we use this information instead of
# listing all symbols.
- (symver|optional)OPENCL_1.0 1.0 1
- (symver|optional)OPENCL_1.1 1.1 1
- (symver|optional)OPENCL_1.2 1.2 2
- (symver|optional)OPENCL_2.0 2.0 3
+ (symver|optional)OPENCL_1.0 0 2
+ (symver|optional)OPENCL_1.1 0 2
+ (symver|optional)OPENCL_1.2 0 3
+ (symver|optional)OPENCL_2.0 1:14 4
Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog 2014-10-13 00:18:47 UTC (rev 1436)
+++ fglrx-driver/trunk/debian/changelog 2014-10-13 08:43:52 UTC (rev 1437)
@@ -1,3 +1,9 @@
+fglrx-driver (1:14.9+ga14.201-2) UNRELEASED; urgency=medium
+
+ * amd-libopencl1: Fix symbols file. (Closes: #763636)
+
+ -- Andreas Beckmann <anbe at debian.org> Mon, 13 Oct 2014 02:18:50 +0200
+
fglrx-driver (1:14.9+ga14.201-1) unstable; urgency=medium
* This release is made of 14.6~ga14.201-1. The upload of 14.9-1 was an error
More information about the Pkg-fglrx-devel
mailing list