[pocl] 09/14: rewrap/reorder/fix control files

Andreas Beckmann anbe at moszumanska.debian.org
Mon Apr 25 09:11:33 UTC 2016


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

anbe pushed a commit to branch master
in repository pocl.

commit 7ca013272f81cc1f6e12807f2a5ae2757bbd0018
Author: Andreas Beckmann <anbe at debian.org>
Date:   Mon Apr 25 01:13:03 2016 +0200

    rewrap/reorder/fix control files
---
 debian/control                                     | 87 ++++++++++++++--------
 .../patches/fix-configure-for-debian-archs.patch   |  3 +-
 debian/patches/freebsd-compat.patch                |  3 +-
 debian/rules                                       |  5 +-
 4 files changed, 63 insertions(+), 35 deletions(-)

diff --git a/debian/control b/debian/control
index f541d15..4fd3aba 100644
--- a/debian/control
+++ b/debian/control
@@ -1,25 +1,40 @@
 Source: pocl
-Section: devel
-Priority: extra
 Maintainer: Debian OpenCL Maintainers <pkg-opencl-devel at lists.alioth.debian.org>
 Uploaders: Vincent Danjean <vdanjean at debian.org>,
  Andreas Beckmann <anbe at debian.org>,
-Build-Depends: debhelper (>= 9~), autotools-dev, autoconf, dh-autoreconf,
- pkg-config, libhwloc-dev, libltdl-dev, mesa-common-dev,
- ocl-icd-dev (>=2.2.3), ocl-icd-libopencl1 (>=2.2.3), ocl-icd-opencl-dev,
- libedit-dev, libz-dev,
- clang, llvm-3.6-dev, libclang-3.6-dev,
- pkg-kde-tools
+Section: libs
+Priority: extra
+Build-Depends: debhelper (>= 9),
+ autotools-dev,
+ autoconf,
+ dh-autoreconf,
+ pkg-config,
+ libhwloc-dev,
+ libltdl-dev,
+ mesa-common-dev,
+ ocl-icd-dev (>= 2.2.3),
+ ocl-icd-libopencl1 (>= 2.2.3),
+ ocl-icd-opencl-dev,
+ libedit-dev,
+ libz-dev,
+ clang,
+ llvm-3.6-dev,
+ libclang-3.6-dev,
+ pkg-kde-tools,
 Standards-Version: 3.9.8
-Homepage: http://portablecl.org
-Vcs-Git: https://anonscm.debian.org/git/collab-maint/pocl.git
 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/pocl.git
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/pocl.git
+Homepage: http://portablecl.org
 
 Package: pocl-opencl-icd
 Architecture: any
-Provides: opencl-icd, opencl-icd-1.1-1, opencl-icd-1.2-1
-Section: libs
-Depends: ${misc:Depends}, libpocl1 (= ${binary:Version})
+Depends:
+ libpocl1 (= ${binary:Version}),
+ ${misc:Depends}
+Provides:
+ opencl-icd,
+ opencl-icd-1.1-1,
+ opencl-icd-1.2-1,
 Description: pocl ICD
  Portable Computing Language is an open source implementation of the OpenCL
  standard which can be easily adapted for new targets. One of the goals of the
@@ -32,9 +47,9 @@ Description: pocl ICD
 
 Package: libpocl1-common
 Architecture: all
-Section: libs
 Multi-Arch: foreign
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends}
 Description: common files for the pocl library
  Portable Computing Language is an open source implementation of the OpenCL
  standard which can be easily adapted for new targets. One of the goals of the
@@ -46,12 +61,16 @@ Description: common files for the pocl library
 
 Package: libpocl1
 Architecture: any
-Section: libs
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, libpocl1-common (= ${source:Version}),
-  clang-3.5
-Recommends: pocl-opencl-icd
+Pre-Depends:
+ ${misc:Pre-Depends}
+Depends:
+ libpocl1-common (= ${source:Version}),
+ clang-3.5,
+ ${shlibs:Depends},
+ ${misc:Depends}
+Recommends:
+ pocl-opencl-icd,
 Description: Portable Computing Language library
  Portable Computing Language is an open source implementation of the OpenCL
  standard which can be easily adapted for new targets. One of the goals of the
@@ -63,10 +82,12 @@ Description: Portable Computing Language library
 
 Package: libpoclu1
 Architecture: any
-Section: libs
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends:
+ ${misc:Pre-Depends}
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
 Description: utility library for writing OpenCL programs
  Portable Computing Language is an open source implementation of the OpenCL
  standard which can be easily adapted for new targets. One of the goals of the
@@ -79,10 +100,14 @@ Description: utility library for writing OpenCL programs
 
 Package: libpoclu-dev
 Architecture: any
-Section: libdevel
 Multi-Arch: foreign
-Depends: ${misc:Depends}, libpoclu1 (= ${binary:Version}), opencl-headers (>= 1.2)
-Recommends: ocl-icd-opencl-dev
+Section: libdevel
+Depends:
+ libpoclu1 (= ${binary:Version}),
+ opencl-headers,
+ ${misc:Depends}
+Recommends:
+ ocl-icd-opencl-dev,
 Description: development files for the pocl utility library
  Portable Computing Language is an open source implementation of the OpenCL
  standard which can be easily adapted for new targets. One of the goals of the
@@ -95,9 +120,11 @@ Description: development files for the pocl utility library
 
 Package: libpocl-dev
 Architecture: any
-Section: libdevel
 Multi-Arch: foreign
-Depends: ${misc:Depends}, libpocl1 (= ${binary:Version})
+Section: libdevel
+Depends:
+ libpocl1 (= ${binary:Version}),
+ ${misc:Depends}
 Description: development files for the pocl library
  Portable Computing Language is an open source implementation of the OpenCL
  standard which can be easily adapted for new targets. One of the goals of the
@@ -105,8 +132,8 @@ Description: development files for the pocl library
  need for target-dependent manual optimizations. A "native" target is included,
  which allows running OpenCL kernels on the host (CPU).
  .
- This package provides the development files for the pocl library.  Unless very
- specific needs, this package is useless.  This package is only required to link
+ This package provides the development files for the pocl library. Unless very
+ specific needs, this package is useless. This package is only required to link
  directly and explicitly with pocl.
  .
  To develop OpenCL programs (that can be run with pocl), the opencl-dev virtual
diff --git a/debian/patches/fix-configure-for-debian-archs.patch b/debian/patches/fix-configure-for-debian-archs.patch
index 3d859ed..e68892b 100644
--- a/debian/patches/fix-configure-for-debian-archs.patch
+++ b/debian/patches/fix-configure-for-debian-archs.patch
@@ -1,4 +1,5 @@
-Fix architecture name for ARM on Debian
+Description: Fix architecture name for ARM on Debian
+
 --- a/configure.ac
 +++ b/configure.ac
 @@ -958,6 +958,11 @@
diff --git a/debian/patches/freebsd-compat.patch b/debian/patches/freebsd-compat.patch
index 080149f..aa2a8cd 100644
--- a/debian/patches/freebsd-compat.patch
+++ b/debian/patches/freebsd-compat.patch
@@ -1,4 +1,5 @@
-Fix includes for FreeBSD
+Description: Fix includes for FreeBSD
+
 --- a/include/CL/cl.hpp.in
 +++ b/include/CL/cl.hpp.in
 @@ -211,7 +211,7 @@
diff --git a/debian/rules b/debian/rules
index da6104e..6c35faa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,13 +25,12 @@ LLVM_ARCH=$(shell sed < debian/supported-archs \
 	-e '/^DEB_ARCH: $(DEB_HOST_ARCH)$$/,/^ *$$/p;d' \
 	| sed -e 's/^LLVM_ARCH=//p;d')
 
-ifeq ($(LLVM_ARCH),)
-else
+ifneq ($(LLVM_ARCH),)
 export LLC_HOST_CPU=$(LLVM_ARCH)
 endif
 
 ifeq ($(DEB_HOST_ARCH),armhf)
-# NEON, optionnal for Debian, must not be used
+# NEON, optional for Debian, must not be used
 export CLANG_FLAGS= -mfpu=vfp3-d16
 #export KERNEL_LIB_OPT_FLAGS= -mattr=-neon
 export KERNEL_LIB_OPT_FLAGS= -mattr=-neon,+d16,+vfp3,-vfp4,+v7,+aclass,+thumb2

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/pocl.git



More information about the Pkg-opencl-commits mailing list