[beignet] 01/02: Merge branch 'master' into jessie-backports

[Rebecca Palmer]

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

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

commit 8d1a45e9aecc5f1155d2f4bdd72657a1ec24adc0
Merge: bf4ead0 3d4774b
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Sat May 13 08:06:48 2017 +0100

    Merge branch 'master' into jessie-backports
    
    Conflicts:
    	debian/changelog

 debian/changelog                |  7 +++++
 debian/patches/series           |  1 +
 debian/patches/zerooffset.patch | 61 +++++++++++++++++++++++++++++++++++++++++
 debian/rules                    |  3 +-
 4 files changed, 71 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index ec1ce77,dde40ed..b8c3bda
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,17 @@@
+ beignet (1.3.0-3) unstable; urgency=medium
+ 
+   * Fix "Exec...-5" error on older hardware.  (Closes: #860805)
+   * Use LLVM 3.8 on x32 to fix FTBFS.
+ 
+  -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Tue, 02 May 2017 23:23:11 +0100
+ 
 +beignet (1.3.0-2~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * Use an LLVM/Clang version that exists in jessie-backports.
 +
 + -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Sun, 05 Mar 2017 10:35:43 +0000
 +
  beignet (1.3.0-2) unstable; urgency=medium
  
    * Statically link to LLVM to allow installation together with

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