[beignet] 05/13: Remove LP#1515419 workaround: this is now fixed in cmake

Rebecca Palmer rnpalmer-guest at moszumanska.debian.org
Mon Apr 25 21:55:11 UTC 2016


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

rnpalmer-guest pushed a commit to branch master
in repository beignet.

commit 4394cc3823b79cbb86529bb02a0f3c93db3e6fa9
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Sun Apr 24 15:39:12 2016 +0100

    Remove LP#1515419 workaround: this is now fixed in cmake
---
 debian/changelog                   |  1 +
 debian/patches/find-python35.patch | 21 ---------------------
 debian/patches/series              |  1 -
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index def19ca..3edfcd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ beignet (1.1.2-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Drop patches applied upstream, refresh others.
+  * Drop find-python35.patch: this has now been fixed in cmake.
 
  -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Sun, 24 Apr 2016 15:31:25 +0100
 
diff --git a/debian/patches/find-python35.patch b/debian/patches/find-python35.patch
deleted file mode 100644
index 3e21fab..0000000
--- a/debian/patches/find-python35.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Find Python 3.5
-
-Workaround for
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=802826
-https://bugs.launchpad.net/ubuntu/+source/cmake/+bug/1515419
-
-Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2ed8429..caa27c2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -210,6 +210,7 @@ ELSE(OCLIcd_FOUND)
-   MESSAGE(STATUS "Looking for OCL ICD header file - not found")
- ENDIF(OCLIcd_FOUND)
- 
-+set(Python_ADDITIONAL_VERSIONS 3.5)
- Find_Package(PythonInterp)
- 
- OPTION(BUILD_EXAMPLES "Build examples" OFF)
-
diff --git a/debian/patches/series b/debian/patches/series
index e090e8a..95e8b54 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@ shared-llvm.patch
 update-docs.patch
 allow-+-in-directory.patch
 printf-fix-90472.patch
-find-python35.patch

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



More information about the Pkg-opencl-commits mailing list