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

[Thomas Krennwallner]

The following commit has been merged in the master branch:
commit 12a048c56bbfffa60452a5f4cdd65ddb76c0a80a
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Mon Sep 5 13:37:31 2011 +0200

    Get rid off makefile patch.

diff --git a/debian/changelog b/debian/changelog
index 69451ec..15505a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,18 @@
 gringo (3.0.3-6) unstable; urgency=low
 
   * control: Setup as Debian Science project.
-    - Set Maintainer to Debian Science Maintainers and Uploaders to TK.
+    - Set Maintainer to Debian Science Maintainers and Uploaders to Thomas
+      Krennwallner.
     - Set DM-Upload-Allowed to yes.
     - Convert bzr repository to git and use Vcs-Git and Vcs-Browser
-    accourdingly.
-
- -- Thomas Krennwallner <tkren at kr.tuwien.ac.at>  Thu, 12 May 2011 17:28:21 +0200
+      accourdingly.
+    - Build-Depends on debhelper >= 8.0.0.
+  * rules: Add override_dh_auto_build to get rid off
+    gringo-makefile.patch.
+  * patches/gringo-makefile.patch,patches/series: Remove
+    gringo-makefile.patch.
+    
+ -- Thomas Krennwallner <tkren at kr.tuwien.ac.at>  Mon, 05 Sep 2011 13:21:51 +0200
 
 gringo (3.0.3-5~natty1) natty; urgency=low
 
diff --git a/debian/control b/debian/control
index f1d88c3..e99a8dd 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 8.0.0),
  cmake,
  libboost-filesystem-dev,
  libboost-system-dev,
diff --git a/debian/patches/gringo-makefile.patch b/debian/patches/gringo-makefile.patch
deleted file mode 100644
index 66bc9ae..0000000
--- a/debian/patches/gringo-makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
-Description: Use system-wide LUA, and build all available targets (gringo, clingo, and iclingo).
-Index: gringo-3.0.3-source/Makefile
-===================================================================
---- gringo-3.0.3-source.orig/Makefile	2010-11-11 23:19:38.000000000 +0100
-+++ gringo-3.0.3-source/Makefile	2011-02-22 10:29:03.443482002 +0100
-@@ -1,5 +1,5 @@
--target=gringo-app
--cmake_options=-DWITH_LUA=shipped -DWITH_LUASQL=1
-+target=gringo-app clingo-app iclingo-app
-+cmake_options=-DWITH_LUA=system -DWITH_LUASQL=1
- 
- all: release
- 
-@@ -56,3 +56,5 @@
- 
- clean:
- 	rm -rf build
-+
-+install: release
diff --git a/debian/patches/series b/debian/patches/series
index 0e580a1..95843bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-gringo-makefile.patch
 gringo-manpages.patch
diff --git a/debian/rules b/debian/rules
index 065c6ca..2c51695 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,5 +20,9 @@ export DH_OPTIONS
 %:
 	dh $@
 
+# 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"
+
 override_dh_installchangelogs:
 	dh_installchangelogs CHANGES

-- 
grounding tools for (disjunctive) logic programs