[gringo] 01/01: Bug fix: "non-standard gcc/g++ used for build (gcc-4.8)", thanks to Matthias Klose (Closes: #751317). Build with system-wide liblua5.2-dev.

[Thomas Krennwallner]

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

tkren-guest pushed a commit to branch master
in repository gringo.

commit 985685c306b59f55995f31497863dd39724037db
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Thu Jun 12 09:24:03 2014 +0200

    Bug fix: "non-standard gcc/g++ used for build (gcc-4.8)", thanks to Matthias Klose (Closes: #751317).
    Build with system-wide liblua5.2-dev.
---
 debian/changelog | 8 ++++++++
 debian/control   | 4 ++--
 debian/rules     | 4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4ca754d..ab5d67c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gringo (4.3.0-2) unstable; urgency=low
+
+  * Bug fix: "non-standard gcc/g++ used for build (gcc-4.8)", thanks to
+    Matthias Klose (Closes: #751317).
+  * Build with system-wide liblua5.2-dev.
+
+ -- Thomas Krennwallner <tkren at kr.tuwien.ac.at>  Thu, 12 Jun 2014 09:16:31 +0200
+
 gringo (4.3.0-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 560545d..a5d7a83 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,12 @@ Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
 Build-Depends: debhelper (>= 9),
- g++-4.8 (>= 4.8.0),
+ g++ (>= 4:4.8.0),
  scons,
  re2c,
  bison,
  libtbb-dev (>= 4.0+r233) [amd64 ia64 ppc64 ppc64el],
- liblua5.1-dev,
+ liblua5.2-dev,
  libpython2.7-dev
 Standards-Version: 3.9.5
 Vcs-Git: git://git.debian.org/git/debian-science/packages/gringo.git
diff --git a/debian/rules b/debian/rules
index 199fff3..74f13c2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,8 +15,8 @@
 arch = $(shell dpkg-architecture -qDEB_BUILD_ARCH | egrep "(amd64|ia64|ppc64)")
 os = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS | grep linux)
 
-# force g++-4.8, lua5.1, and python2.7
-CONFIGPARMS = CXX='g++-4.8' WITH_LUA='lua5.1' WITH_PYTHON='python2.7' CPPPATH='$${["/usr/include/lua5.1","/usr/include/python2.7"]}'
+# force g++, lua5.2, and python2.7
+CONFIGPARMS = CXX='g++' WITH_LUA='lua5.2' WITH_PYTHON='python2.7' CPPPATH='$${["/usr/include/lua5.2","/usr/include/python2.7"]}'
 ifeq ($(and $(if $(os),good), $(if $(arch),good)), good)
 	CONFIGPARMS += WITH_TBB="tbb"
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gringo.git