[khronos-opencl-headers] 06/08: c++ headers are now in a separate package

[Vincent Danjean]

This is an automated email from the git hooks/post-receive script.

vdanjean pushed a commit to branch master
in repository khronos-opencl-headers.

commit 0df3aa4080e45551962c8a58eb6138751d88e475
Author: Vincent Danjean <Vincent.Danjean at ens-lyon.org>
Date:   Fri Sep 9 00:33:07 2016 +0200

    c++ headers are now in a separate package
---
 debian/control                                     | 23 +++++++++++++++++++---
 ...cl-headers.install => opencl-c-headers.install} |  1 -
 debian/opencl-c-headers.lintian-overrides          |  1 +
 debian/t/Makefile                                  | 15 ++------------
 debian/t/cl_hpp.cpp                                |  1 -
 5 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/debian/control b/debian/control
index f47fcb0..8b45b38 100644
--- a/debian/control
+++ b/debian/control
@@ -12,15 +12,32 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-opencl/khronos-opencl-headers.g
 Vcs-Git: https://anonscm.debian.org/git/pkg-opencl/khronos-opencl-headers.git
 Homepage: http://www.khronos.org/registry/cl/
 
-Package: opencl-headers
+Package: opencl-c-headers
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}
-Description: OpenCL (Open Computing Language) header files
+Breaks: opencl-headers (<<2.1)
+Replaces: opencl-headers (<<2.1)
+Description: OpenCL (Open Computing Language) C header files
  OpenCL (Open Computing Language) is a multi-vendor open standard for
  general-purpose parallel programming of heterogeneous systems that include
  CPUs, GPUs and other processors.
  .
- This package provides the development header files for the OpenCL API
+ This package provides the C development header files for the OpenCL API
  as published by The Khronos Group Inc.  The corresponding specification and
  documentation can be found on the Khronos website.
+
+Package: opencl-headers
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+         opencl-c-headers (= ${source:Version}),
+         opencl-clhpp-headers (>= 2.0.10)
+Description: OpenCL (Open Computing Language) header files
+ OpenCL (Open Computing Language) is a multi-vendor open standard for
+ general-purpose parallel programming of heterogeneous systems that include
+ CPUs, GPUs and other processors.
+ .
+ This metapackage depends on packages providing the C and C++ headers files
+ for the OpenCL API as published by The Khronos Group Inc.  The corresponding
+ specification and documentation can be found on the Khronos website.
diff --git a/debian/opencl-headers.install b/debian/opencl-c-headers.install
similarity index 65%
rename from debian/opencl-headers.install
rename to debian/opencl-c-headers.install
index a04db7f..4dc2c91 100644
--- a/debian/opencl-headers.install
+++ b/debian/opencl-c-headers.install
@@ -1,3 +1,2 @@
 opencl.h	usr/include/CL/
 cl*.h		usr/include/CL/
-cl*.hpp		usr/include/CL/
diff --git a/debian/opencl-c-headers.lintian-overrides b/debian/opencl-c-headers.lintian-overrides
new file mode 100644
index 0000000..fc882fe
--- /dev/null
+++ b/debian/opencl-c-headers.lintian-overrides
@@ -0,0 +1 @@
+no-upstream-changelog
diff --git a/debian/t/Makefile b/debian/t/Makefile
index 57e5425..d180611 100644
--- a/debian/t/Makefile
+++ b/debian/t/Makefile
@@ -7,29 +7,18 @@ CXXFLAGS	+= -std=c++11 -I. $(OPENCLFLAGS) $(ARCHFLAGS)
 OPENCL_CLH_FLAGS_1_0 = -DCL_USE_DEPRECATED_OPENCL_1_0_APIS
 OPENCL_CLH_FLAGS_1_1 = -DCL_USE_DEPRECATED_OPENCL_1_1_APIS
 OPENCL_CLH_FLAGS_1_2 = -DCL_USE_DEPRECATED_OPENCL_1_2_APIS
-
-OPENCL_CLHPP_FLAGS_1_0 = -DCL_HPP_TARGET_OPENCL_VERSION=100 -DCL_HPP_MINIMUM_OPENCL_VERSION=100
-OPENCL_CLHPP_FLAGS_1_1 = -DCL_HPP_TARGET_OPENCL_VERSION=110 -DCL_HPP_MINIMUM_OPENCL_VERSION=110
-OPENCL_CLHPP_FLAGS_1_2 = -DCL_HPP_TARGET_OPENCL_VERSION=120 -DCL_HPP_MINIMUM_OPENCL_VERSION=120
-OPENCL_CLHPP_FLAGS_2_0 = -DCL_HPP_TARGET_OPENCL_VERSION=200 -DCL_HPP_MINIMUM_OPENCL_VERSION=200
+OPENCL_CLH_FLAGS_2_0 = -DCL_USE_DEPRECATED_OPENCL_2_0_APIS
 
 check:
 	$(MAKE) compile_opencl_h
 	$(MAKE) compile_opencl_h OPENCLFLAGS="$(OPENCL_CLH_FLAGS_1_0)"
 	$(MAKE) compile_opencl_h OPENCLFLAGS="$(OPENCL_CLH_FLAGS_1_1)"
 	$(MAKE) compile_opencl_h OPENCLFLAGS="$(OPENCL_CLH_FLAGS_1_2)"
-
-	$(MAKE) compile_cl_hpp OPENCLFLAGS="$(OPENCL_CLHPP_FLAGS_1_0)"
-	$(MAKE) compile_cl_hpp OPENCLFLAGS="$(OPENCL_CLHPP_FLAGS_1_1)"
-	$(MAKE) compile_cl_hpp OPENCLFLAGS="$(OPENCL_CLHPP_FLAGS_1_2)"
-	$(MAKE) compile_cl_hpp OPENCLFLAGS="$(OPENCL_CLHPP_FLAGS_2_0)"
+	$(MAKE) compile_opencl_h OPENCLFLAGS="$(OPENCL_CLH_FLAGS_2_0)"
 
 compile_opencl_h:
 	$(CC) $(CPPFLAGS) $(CFLAGS) -c opencl_h.c
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c opencl_h.cpp
 
-compile_cl_hpp:
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c cl_hpp.cpp
-
 clean:
 	$(RM) *.o
diff --git a/debian/t/cl_hpp.cpp b/debian/t/cl_hpp.cpp
deleted file mode 100644
index e061e4d..0000000
--- a/debian/t/cl_hpp.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <CL/cl2.hpp>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/khronos-opencl-headers.git