[gringo] 01/01: New upstream release. Add hardening support.
Thomas Krennwallner
tkren-guest at moszumanska.debian.org
Mon Dec 16 17:35:13 UTC 2013
This is an automated email from the git hooks/post-receive script.
tkren-guest pushed a commit to branch master
in repository gringo.
commit 90927d0d06f1a8489d8bcb6750644cabddfca938
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date: Mon Dec 16 18:02:57 2013 +0100
New upstream release.
Add hardening support.
---
debian/changelog | 16 ++++++++++++++++
debian/control | 33 ++++++++++++++++++++-------------
debian/docs | 2 ++
debian/gringo.links | 4 ++++
debian/gringo.manpages | 1 -
debian/install | 5 ++---
debian/rules | 43 +++++++++++++++++++++++++++++++++++++------
debian/watch | 2 +-
8 files changed, 82 insertions(+), 24 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a0b2d00..8322abf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+gringo (4.2.1-1) unstable; urgency=low
+
+ gringo 4.2 adds support for {i,o,}clingo again.
+
+ * New upstream release.
+ * debian/watch: Back to watching all releases of gringo.
+ * debian/rules: Add scons, python, tbb, and hardening support.
+ * debian/install: Install gringo and clingo.
+ * debian/gringo.links: Symlink clingo binary and manpage to {i,o}clingo.
+ * debian/gringo.manpages: Remove iclingo manpage.
+ * debian/control: Build-Depends on bison, scons, g++ >= 4.8.0,
+ libpython2.7-dev, libtbb-dev.
+ Bump Standards-Version to 3.9.5.
+
+ -- Thomas Krennwallner <tkren at kr.tuwien.ac.at> Mon, 16 Dec 2013 16:28:42 +0100
+
gringo (3.0.5-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 8751914..085e229 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,16 @@ 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),
- cmake,
+ g++ (>= 4.8.0),
+ scons,
re2c,
+ bison,
+ libtbb-dev (>= 4.0+r233) [amd64 ia64 ppc64],
libboost-filesystem-dev,
libboost-system-dev,
- liblua5.1-dev
-Standards-Version: 3.9.4
+ liblua5.1-dev,
+ libpython2.7-dev
+Standards-Version: 3.9.5
Vcs-Git: git://git.debian.org/git/debian-science/packages/gringo.git
Vcs-Browser: http://git.debian.org/?p=debian-science/packages/gringo.git
Homepage: http://potassco.sourceforge.net/
@@ -28,16 +32,19 @@ Description: grounding tools for (disjunctive) logic programs
.
This package contains the following tools:
.
- - gringo: creates lparse-compatbile variable-free programs.
+ - gringo: creates lparse-compatible variable-free programs.
- clingo: stands for clasp on gringo and combines both systems in
a monolithic way. Its input language is that of gringo and its
output corresponds to that of clasp.
- - iclingo: an incremental answer set programming system
- implemented on top of clingo. It is based on the idea that the
- grounder as well as the solver are implemented in a stateful way.
- Thus, both keep their previous states while increasing an
- incremental parameter. As regards grounding, at each incremental
- step, the goal is to produce only ground rules stemming from the
- current program slice, without re-producing previous ground rules.
- The ground program slices are then gradually passed to the solver
- that accumulates ground rules and computes answer sets for them.
+ - iclingo: an incremental answer set programming system, which is
+ based on the idea that the grounder as well as the solver are
+ implemented in a stateful way. Thus, both keep their previous states
+ while increasing an incremental parameter. As regards grounding, at
+ each incremental step, the goal is to produce only ground rules
+ stemming from the current program slice, without re-producing
+ previous ground rules. The ground program slices are then gradually
+ passed to the solver that accumulates ground rules and computes
+ answer sets for them.
+ - oclingo: a system for reactive answer set programming, extending
+ gringo and clasp for handling external modules provided at runtime
+ by a controller.
diff --git a/debian/docs b/debian/docs
index e845566..7475e4b 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1,3 @@
README
+NOTES
+examples
diff --git a/debian/gringo.links b/debian/gringo.links
new file mode 100644
index 0000000..1f295db
--- /dev/null
+++ b/debian/gringo.links
@@ -0,0 +1,4 @@
+usr/bin/clingo usr/bin/iclingo
+usr/bin/clingo usr/bin/oclingo
+usr/share/man/man1/clingo.1 usr/share/man/man1/iclingo.1
+usr/share/man/man1/clingo.1 usr/share/man/man1/oclingo.1
diff --git a/debian/gringo.manpages b/debian/gringo.manpages
index 7cb38c5..98267dd 100644
--- a/debian/gringo.manpages
+++ b/debian/gringo.manpages
@@ -1,3 +1,2 @@
gringo.1
clingo.1
-iclingo.1
diff --git a/debian/install b/debian/install
index cd513cc..bf3abd7 100644
--- a/debian/install
+++ b/debian/install
@@ -1,3 +1,2 @@
-build/release/bin/gringo usr/bin/
-build/release/bin/clingo usr/bin/
-build/release/bin/iclingo usr/bin/
+build/release/gringo usr/bin/
+build/release/clingo usr/bin/
diff --git a/debian/rules b/debian/rules
index 60be9f9..a778bf0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,20 +4,51 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
+# compile with libtbb-dev only with linux 64bit intel/ppc architectures,
+# fallback in pentium4 processors is not implemented, see also note of
+# libtbb-dev:
+#
+# Note: if you are a user of the i386 architecture, i.e., 32-bit Intel
+# or compatible hardware, this package only supports Pentium4-compatible
+# and higher processors.
+#
+arch = $(shell dpkg-architecture -qDEB_BUILD_ARCH | egrep "(amd64|ia64|ppc64)")
+os = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS | grep linux)
+CONFIGPARMS = WITH_LUA='lua5.1' WITH_PYTHON='python2.7' CPPPATH='$${["/usr/include/lua5.1","/usr/include/python2.7"]}'
+ifeq ($(and $(if $(os),good), $(if $(arch),good)), good)
+ CONFIGPARMS += WITH_TBB="tbb"
+endif
+
+#
+# export CPPFLAGS, CXXFLAGS, and LDFLAGS for scons
+#
+# default to -O3 -std=c++11 -Wall -DNDEBUG and enable all hardening flags
+#
+DEB_CXXFLAGS_MAINT_APPEND = -std=c++11 -O3 -Wall
+DEB_CPPFLAGS_MAINT_APPEND = -DNDEBUG
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
+# inject compiler and linker flags to scons variables
+SCCXXFLAGS = $(shell echo $(CXXFLAGS) $(CPPFLAGS) | sed -e 's/^/\$${["/;s/ -/","-/g;s/$$/"]}/')
+SCLINKFLAGS = $(shell echo $(LDFLAGS) | sed -e 's/^/\$${["/;s/ -/","-/g;s/$$/"]}/')
%:
dh $@
-# force recreation of re2c parsers
+# configure with LUA, Python, and possibly TBB
override_dh_auto_configure:
- rm -f libgringo/src/parser.cpp libgringo/src/converter.cpp
+ scons configure --build-dir=release $(CONFIGPARMS) CXXFLAGS='$(SCCXXFLAGS)' LINKFLAGS='$(SCLINKFLAGS)'
-# build all {gringo,clingo,iclingo} and use Debian's LUA
+# build gringo and clingo
override_dh_auto_build:
- dh_auto_build -- target="gringo-app clingo-app iclingo-app" cmake_options="-DWITH_LUA=system -DWITH_LUASQL=1"
+ scons --build-dir=release gringo clingo
+
+override_dh_auto_clean:
+ rm -rf ./build .sconf_temp .sconsign.dblite
override_dh_installchangelogs:
dh_installchangelogs CHANGES
diff --git a/debian/watch b/debian/watch
index 01f3a53..0380eef 100644
--- a/debian/watch
+++ b/debian/watch
@@ -6,4 +6,4 @@ version=3
# qa.debian.org runs a redirector which allows a simpler form of URL
# for SourceForge based projects. The format below will automatically
# be rewritten to use the redirector.
-http://sf.net/potassco/gringo-3\.([\d\.]+)-source\.tar\.gz
+http://sf.net/potassco/gringo-([\d\.]+)-source\.tar\.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gringo.git
More information about the debian-science-commits
mailing list