[SCM] grounding tools for (disjunctive) logic programs branch, master, updated. 83f10a44c5178f56bfcd65d281ae21e51b115f5b

[Thomas Krennwallner]

The following commit has been merged in the master branch:
commit 83f10a44c5178f56bfcd65d281ae21e51b115f5b
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Sun Dec 25 18:48:39 2011 +0100

    Fix bug #652787.

diff --git a/debian/changelog b/debian/changelog
index 1a43b63..2f2c4da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,16 @@ gringo (3.0.3-7) unstable; urgency=low
   * debian/copyright: Fix comma-separated-files-in-dep5-copyright,
     obsolete-field-in-dep5-copyright and unversioned-copyright-format-uri
     lintian warnings.
-
- -- Thomas Krennwallner <tkren at kr.tuwien.ac.at>  Mon, 26 Sep 2011 07:46:14 +0200
+  * Bug fix: "FTBFS: clone_allocator.hpp:34:27: error: invalid use of
+    incomplete type <struct Domain>", thanks to Lucas Nussbaum
+    (Closes: #652787).
+  * debian/patches/gringo-domain-fwd-decl.patch: New file.
+  * debian/control: Build-Depends on re2c to recreate parser.cpp from
+    parser.r2c, add boost version libboost-*N.MM-dev.
+  * debian/rules: Add override_dh_auto_configure and remove parser.cpp and
+    converter.cpp to force recreation of re2c lexer files.
+
+ -- Thomas Krennwallner <tkren at kr.tuwien.ac.at>  Sun, 25 Dec 2011 18:44:20 +0100
 
 gringo (3.0.3-6) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index e99a8dd..02ea5a3 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,9 @@ Uploaders: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 8.0.0),
  cmake,
- libboost-filesystem-dev,
- libboost-system-dev,
+ re2c,
+ libboost-filesystem1.48-dev,
+ libboost-system1.48-dev,
  liblua5.1-dev
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/debian-science/packages/gringo.git
diff --git a/debian/patches/gringo-domain-fwd-decl.patch b/debian/patches/gringo-domain-fwd-decl.patch
new file mode 100644
index 0000000..ba3056a
--- /dev/null
+++ b/debian/patches/gringo-domain-fwd-decl.patch
@@ -0,0 +1,15 @@
+Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
+Description: Fix invalid use of incomplete type Domain compile error.
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=652787
+Index: gringo-3.0.3-source/libgringo/src/parser.r2c
+===================================================================
+--- gringo-3.0.3-source.orig/libgringo/src/parser.r2c	2010-11-03 22:24:59.000000000 +0100
++++ gringo-3.0.3-source/libgringo/src/parser.r2c	2011-12-25 18:19:11.000000000 +0100
+@@ -22,6 +22,7 @@
+ #include <gringo/constterm.h>
+ #include <gringo/prgvisitor.h>
+ #include <gringo/predlit.h>
++#include <gringo/domain.h>
+ #include <gringo/rule.h>
+ #include <gringo/streams.h>
+ #include <gringo/grounder.h>
diff --git a/debian/patches/series b/debian/patches/series
index 95843bd..7638f66 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+gringo-domain-fwd-decl.patch
 gringo-manpages.patch
diff --git a/debian/rules b/debian/rules
index bf61517..60be9f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,10 @@ export DH_OPTIONS
 %:
 	dh $@
 
+# force recreation of re2c parsers
+override_dh_auto_configure:
+	rm -f libgringo/src/parser.cpp libgringo/src/converter.cpp
+
 # build all {gringo,clingo,iclingo} and use Debian's LUA
 override_dh_auto_build:
 	dh_auto_build -- target="gringo-app clingo-app iclingo-app" cmake_options="-DWITH_LUA=system -DWITH_LUASQL=1"

-- 
grounding tools for (disjunctive) logic programs