[Pkg-opencl-devel] [beignet] 58/66: Imported Debian patch 0.8-1.1

[Andreas Beckmann]

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

anbe pushed a commit to branch master
in repository beignet.

commit 3f5df614471707f57ce0b0d616c1a02927bbdd21
Author: Julián Moreno Patiño <julian at debian.org>
Date:   Thu Sep 11 10:44:01 2014 -0500

    Imported Debian patch 0.8-1.1
---
 debian/changelog                 | 11 +++++++++++
 debian/control                   |  8 +++-----
 debian/patches/debug             |  8 +++-----
 debian/patches/fix_license_issue | 21 +++++++++++++++++++++
 debian/patches/series            |  1 +
 5 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 14f5074..4755de8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+beignet (0.8-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Adjust clang Build-Depends. (Closes: #759933)
+    + Thanks to Julian Wollrath for it.
+  * Cherry pick upstream patch to fix licensing issue. (Closes: #757395)
+    + Thanks to Julian Wollrath for it.
+  * Refresh debug patch.
+
+ -- Julián Moreno Patiño <julian at debian.org>  Thu, 11 Sep 2014 10:44:01 -0500
+
 beignet (0.8-1) unstable; urgency=low
 
   * New upstream release (Closes: #739534)
diff --git a/debian/control b/debian/control
index 4b99dfb..48aa134 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,9 @@ Maintainer: Simon Richter <sjr at debian.org>
 Build-Depends: debhelper (>= 9), cmake, pkg-config, python-minimal,
  ocl-icd-dev, ocl-icd-opencl-dev,
  libdrm-dev, libxfixes-dev, libxext-dev,
- llvm-3.4-dev | llvm-dev (>= 1:3.4),
- clang-3.4 | clang (>= 1:3.4) | clang (>= 3.4),
- clang-3.4 | clang (>= 1:3.4) | clang (<< 1:0),
- libclang-3.4-dev | libclang-dev (>= 1:3.4) | libclang-dev (>= 3.4),
- libclang-3.4-dev | libclang-dev (>= 1:3.4) | libclang-dev (<< 1:0),
+ llvm-dev (>= 1:3.4),
+ clang (>= 1:3.4),
+ libclang-dev (>= 1:3.4),
  libgl1-mesa-dev (>= 9) [!kfreebsd-any],
  libegl1-mesa-dev (>= 9) [!kfreebsd-any],
  libgbm-dev (>= 9) [!kfreebsd-any],
diff --git a/debian/patches/debug b/debian/patches/debug
index b0f8843..6b5d40f 100644
--- a/debian/patches/debug
+++ b/debian/patches/debug
@@ -2,11 +2,9 @@ Description: Enhance debug output
 Author: Simon Richter <sjr at debian.org>
 Last-Update: 2013-05-21
 
-Index: beignet-0.1+git20130619+42967d2/src/cl_utils.h
-===================================================================
---- beignet-0.1+git20130619+42967d2.orig/src/cl_utils.h	2013-06-19 21:04:25.066667328 +0200
-+++ beignet-0.1+git20130619+42967d2/src/cl_utils.h	2013-06-19 21:04:28.066667194 +0200
-@@ -80,6 +80,7 @@
+--- a/src/cl_utils.h
++++ b/src/cl_utils.h
+@@ -88,6 +88,7 @@
  
  #define FATAL(...)                                          \
  do {                                                        \
diff --git a/debian/patches/fix_license_issue b/debian/patches/fix_license_issue
new file mode 100644
index 0000000..818866d
--- /dev/null
+++ b/debian/patches/fix_license_issue
@@ -0,0 +1,21 @@
+Origin: http://lists.freedesktop.org/archives/beignet/2014-August/003710.html
+From 506a19f6aee9103fe01ec9c0264b6f78004cfbe2 Mon Sep 17 00:00:00 2001
+From: Ruiling Song <ruiling.song at intel.com>
+Date: Wed, 13 Aug 2014 09:53:33 +0800
+Subject: cmake: Fix a license issue.
+Signed-off-by: Ruiling Song <ruiling.song at intel.com>
+Reviewed-by: Yang Rong <rong.r.yang at intel.com>
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,10 +1,3 @@
+-#############################################################################
+-#                  INTEL CORPORATION PROPRIETARY INFORMATION                #
+-#     This software is supplied under the terms of a license agreement or   #
+-#     nondisclosure agreement with Intel Corporation and may not be copied  #
+-#     or disclosed except in accordance with the terms of that agreement.   #
+-#          Copyright (C) 2009 Intel Corporation. All Rights Reserved.       #
+-#############################################################################
+ 
+ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
+ PROJECT(OCL)
diff --git a/debian/patches/series b/debian/patches/series
index 08eae33..d2ee98e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ khronos
 deprecated-in-utest
 versioned-llvm-tools
 terminfo
+fix_license_issue

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