[Pkg-fglrx-devel] r1261 - fglrx-driver/trunk/debian

[Andreas Beckmann]

Author: anbe
Date: 2013-08-03 17:28:50 +0000 (Sat, 03 Aug 2013)
New Revision: 1261

Added:
   fglrx-driver/trunk/debian/amd-opencl-dev.links.in
Removed:
   fglrx-driver/trunk/debian/amd-libopencl1.links.in
Modified:
   fglrx-driver/trunk/debian/amd-libopencl1.lintian-overrides
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/control
Log:
move the libOpenCL.so symlink from amd-libopencl1 to amd-opencl-dev

Deleted: fglrx-driver/trunk/debian/amd-libopencl1.links.in
===================================================================
--- fglrx-driver/trunk/debian/amd-libopencl1.links.in	2013-07-29 09:52:57 UTC (rev 1260)
+++ fglrx-driver/trunk/debian/amd-libopencl1.links.in	2013-08-03 17:28:50 UTC (rev 1261)
@@ -1 +0,0 @@
-_LIBDIR_/libOpenCL.so.1         _LIBDIR_/libOpenCL.so

Modified: fglrx-driver/trunk/debian/amd-libopencl1.lintian-overrides
===================================================================
--- fglrx-driver/trunk/debian/amd-libopencl1.lintian-overrides	2013-07-29 09:52:57 UTC (rev 1260)
+++ fglrx-driver/trunk/debian/amd-libopencl1.lintian-overrides	2013-08-03 17:28:50 UTC (rev 1261)
@@ -6,6 +6,3 @@
 
 # There are multiple vendors providing this library.
 package-name-doesnt-match-sonames libOpenCL1
-
-# A single symbolic link does not justify the creation of a new package.
-non-dev-pkg-with-shlib-symlink

Copied: fglrx-driver/trunk/debian/amd-opencl-dev.links.in (from rev 1260, fglrx-driver/trunk/debian/amd-libopencl1.links.in)
===================================================================
--- fglrx-driver/trunk/debian/amd-opencl-dev.links.in	                        (rev 0)
+++ fglrx-driver/trunk/debian/amd-opencl-dev.links.in	2013-08-03 17:28:50 UTC (rev 1261)
@@ -0,0 +1 @@
+_LIBDIR_/libOpenCL.so.1         _LIBDIR_/libOpenCL.so

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2013-07-29 09:52:57 UTC (rev 1260)
+++ fglrx-driver/trunk/debian/changelog	2013-08-03 17:28:50 UTC (rev 1261)
@@ -5,6 +5,8 @@
   * amd-opencl-dev: Provides/Conflicts/Replaces: opencl-dev.
   * amd-libopencl1: Provide virtual packages libopencl-1.1-1 and
     libopencl-1.2-1 and update description. 
+  * Move the libOpenCL.so symlink from amd-libopencl1 to amd-opencl-dev and
+    adjust Depends/Breaks/Replaces accordingly.
   * d/rules{,.defs}: Add support for yet another upstream file naming scheme.
   * Don't explicitly request xz compression - dpkg 1.17 does this by default.
   * Drop empty Description paragraphs that worked around dpkg bug #680871.

Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control	2013-07-29 09:52:57 UTC (rev 1260)
+++ fglrx-driver/trunk/debian/control	2013-08-03 17:28:50 UTC (rev 1261)
@@ -344,6 +344,8 @@
 Conflicts:
  libopencl1,
  amd-app,
+Breaks:
+ amd-opencl-dev (<< 1:13.4-4),
 Replaces:
  libopencl1,
 Homepage: http://developer.amd.com/zones/openclzone/pages/default.aspx
@@ -363,7 +365,7 @@
 Architecture: i386 amd64
 Multi-Arch: same
 Depends:
- amd-libopencl1 | libopencl1,
+ amd-libopencl1 (= ${binary:Version}),
  opencl-headers (>= 1.2),
  ${misc:Depends}
 Recommends:
@@ -374,6 +376,7 @@
  opencl-dev,
 Replaces:
  opencl-dev,
+ amd-libopencl1 (<< 1:13.4-4),
 Description: AMD OpenCL development files
  OpenCL (Open Computing Language) is a multi-vendor open standard for
  general-purpose parallel programming of heterogeneous systems that include