[pocl] 02/04: Merge branch 'master' into experimental

[Andreas Beckmann]

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

anbe pushed a commit to branch experimental
in repository pocl.

commit d85be1a3686ab777471c7b3d5f052f18b7c3365d
Merge: 42958f4 8cefc30
Author: Andreas Beckmann <anbe at debian.org>
Date:   Tue May 10 16:37:46 2016 +0200

    Merge branch 'master' into experimental

 debian/changelog | 6 ++++++
 debian/control   | 1 +
 2 files changed, 7 insertions(+)

diff --cc debian/changelog
index f02d081,aa70bb4..9a488e5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,9 +1,18 @@@
 +pocl (0.12-1) experimental; urgency=medium
 +
 +  * New upstream release 0.12.
 +  * Refresh patches.
 +  * Update symbols files for amd64 and i386.
 +  * Upload to experimental.
 +
 + -- Andreas Beckmann <anbe at debian.org>  Mon, 09 May 2016 14:44:03 +0200
 +
+ pocl (0.11-4) UNRELEASED; urgency=medium
+ 
+   * Add B-D: sphinx-common for binary-arch builds with 'dh --with sphinxdoc'.
+ 
+  -- Andreas Beckmann <anbe at debian.org>  Tue, 10 May 2016 12:44:11 +0200
+ 
  pocl (0.11-3) unstable; urgency=medium
  
    * Update symbols files.

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