[SCM] conflict-driven nogood learning answer set solver branch, master, updated. debian/2.0.6-2-1-g2e3ff8f

[Thomas Krennwallner]

The following commit has been merged in the master branch:
commit 2e3ff8f4f932a1809e908af2a0f961911f089a59
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Mon Aug 27 23:08:06 2012 +0200

    New upstream release, add hardening support.

diff --git a/debian/changelog b/debian/changelog
index e818ae6..514badc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+clasp (2.1.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/copyright: Fix Format URL.
+  * debian/rules: Add hardening support.
+  * debian/gcc-4.7.patch: Remove unnecessary patch.
+  * debian/control: Bump Standards-Version to 3.9.3.1 and Build-Depends on
+    dephelper >= 9.
+  * debian/compat: Bump to 9.
+
+ -- Thomas Krennwallner <tkren at kr.tuwien.ac.at>  Mon, 27 Aug 2012 20:20:04 +0200
+
 clasp (2.0.6-2) unstable; urgency=low
 
   * Team upload
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index ddf72e2..c3ef05f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,10 @@ 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 (>= 8.0.0),
+Build-Depends: debhelper (>= 9),
+ dpkg-dev (>= 1.16.1~),
  libtbb-dev (>= 3.0+r018) [amd64 ia64 ppc64]
-Standards-Version: 3.9.3
+Standards-Version: 3.9.3.1
 Vcs-Git: git://git.debian.org/git/debian-science/packages/clasp.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/clasp.git
 Homepage: http://www.cs.uni-potsdam.de/clasp/
diff --git a/debian/copyright b/debian/copyright
index c2c2554..9adb60f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: clasp
 Upstream-Contact: Benjamin Kaufmann <kaufmann at cs.uni-potsdam.de>
 Source: http://sourceforge.net/projects/potassco/files/clasp/
diff --git a/debian/patches/gcc-4.7.patch b/debian/patches/gcc-4.7.patch
deleted file mode 100644
index 0c56be0..0000000
--- a/debian/patches/gcc-4.7.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: fix build with gcc 4.7
- Include necessary header for _exit()
-Author: Ilya Barygin <randomaction at ubuntu.com>
-
---- a/app/clasp_app.cpp
-+++ b/app/clasp_app.cpp
-@@ -22,6 +22,7 @@
- #include <iostream>
- #include <fstream>
- #include <clasp/clause.h>
-+#include <unistd.h>
- /////////////////////////////////////////////////////////////////////////////////////////
- // Application
- /////////////////////////////////////////////////////////////////////////////////////////
diff --git a/debian/patches/series b/debian/patches/series
index 33ac4f8..b31f497 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 clasp-manpage.patch
-gcc-4.7.patch
diff --git a/debian/rules b/debian/rules
index 92659c8..1abae95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,20 +15,35 @@
 arch = $(shell dpkg-architecture -qDEB_BUILD_ARCH | egrep "(amd64|ia64|ppc64)")
 os = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS | grep linux)
 
+# use hardening config flags for compiling clasp
+CONFIG=hardening
 CONFIGPARMS = --prefix=/usr --with-claspre
-TOPBUILDDIR = build/release
+TOPBUILDDIR = build/$(CONFIG)
 ifeq ($(and $(if $(os),good), $(if $(arch),good)), good)
 	CONFIGPARMS += --with-mt TBB_INCLUDE=/usr/include TBB_LIB=/usr/lib
-	TOPBUILDDIR = build/release_mt
+	TOPBUILDDIR = build/$(CONFIG)_mt
 endif
 
+#
+# export CXXFLAGS and LDFLAGS for configure.sh
+#
+# add -O3 and NDEBUG and enable all hardening flags
+#
+DEB_CXXFLAGS_MAINT_APPEND = -O3 -DNDEBUG
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
+# inject CPPFLAGS to CXXFLAGS
+CXXFLAGS += $(CPPFLAGS)
 
 %:
 	dh $@
 
 # call ./configure.sh $(CONFIGPARMS)
 override_dh_auto_configure:
-	./configure.sh $(CONFIGPARMS)
+	./configure.sh --config=$(CONFIG) $(CONFIGPARMS)
 
 # build in $(TOPBUILDDIR)
 override_dh_auto_build:

-- 
conflict-driven nogood learning answer set solver