[SCM] solver for quantified boolean formulae branch, master, updated. ace6d22f039a5f0bc9b2e5517f58af03cdc04a3b

[Thomas Krennwallner]

The following commit has been merged in the master branch:
commit ace6d22f039a5f0bc9b2e5517f58af03cdc04a3b
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Sun Aug 12 22:40:25 2012 +0200

    Add hardening support.

diff --git a/debian/changelog b/debian/changelog
index 96498f4..8586932 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
 depqbf (1.0-1) unstable; urgency=low
 
   * New upstream release.
-  * debian/control: Bump Standards-Version and update Homepage and Description.
+  * debian/control: Bump Standards-Version and update Homepage and Description,
+    Build-Depends on dpkg-dev.
   * debian/copyright: Update Format, Upstream-Contact, Source, and Copyright.
   * debian/watch: Scan github for version tags.
-  * debian/patches/depqbf-makefile.patch: Refresh patch.
+  * debian/patches/depqbf-makefile.patch: Add hardening support.
+  * debian/rules: Enable dpkg-buildflags.
 
  -- Thomas Krennwallner <tkren at kr.tuwien.ac.at>  Sun, 12 Aug 2012 22:02:14 +0200
 
diff --git a/debian/control b/debian/control
index f9efe58..e4bae73 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: interpreters
 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 (>= 8.0.0)
+Build-Depends: debhelper (>= 8.0.0), dpkg-dev (>= 1.16.1~)
 DM-Upload-Allowed: yes
 Standards-Version: 3.9.3.1
 Homepage: http://lonsing.github.com/depqbf/
diff --git a/debian/patches/depqbf-makefile.patch b/debian/patches/depqbf-makefile.patch
index 112511f..e534c72 100644
--- a/debian/patches/depqbf-makefile.patch
+++ b/debian/patches/depqbf-makefile.patch
@@ -3,13 +3,23 @@ Description: Remove -static and use gcc as C compiler.
 Index: lonsing-depqbf-a539c4d/makefile
 ===================================================================
 --- lonsing-depqbf-a539c4d.orig/makefile	2012-07-18 13:14:21.000000000 +0200
-+++ lonsing-depqbf-a539c4d/makefile	2012-08-12 22:19:48.000000000 +0200
-@@ -1,5 +1,6 @@
++++ lonsing-depqbf-a539c4d/makefile	2012-08-12 22:37:49.000000000 +0200
+@@ -1,11 +1,15 @@
 -#CFLAGS=-Wextra -Wall -Wno-unused -pedantic -std=c99 -DNDEBUG -O3 
 -CFLAGS=-Wextra -Wall -Wno-unused -pedantic -std=c99 -DNDEBUG -O3 -static
 +CC=gcc
 +CFLAGS=-Wextra -Wall -Wno-unused -pedantic -std=c99 -DNDEBUG -O3
++CFLAGS += `dpkg-buildflags --get CFLAGS`
++CFLAGS += `dpkg-buildflags --get CPPFLAGS`
++LDFLAGS = `dpkg-buildflags --get LDFLAGS`
 +#CFLAGS=-Wextra -Wall -Wno-unused -pedantic -std=c99 -DNDEBUG -O3 -static
  #CFLAGS=-Wextra -Wall -Wno-unused -pedantic -std=c99 -g3 -static
  #CFLAGS=-Wextra -Wall -Wno-unused -pedantic -std=c99 -DNDEBUG -g3 -pg -fprofile-arcs -ftest-coverage -static
  OBJECTS=qdpll_main.o qdpll_app.o qdpll.o qdpll_mem.o qdpll_dep_man_qdag.o
+ 
+ depqbf: qdpll_main.o qdpll_app.o libqdpll.a
+-	$(CC) $(CFLAGS) qdpll_main.o qdpll_app.o -L. -lqdpll -o depqbf
++	$(CC) $(CFLAGS) $(LDFLAGS) qdpll_main.o qdpll_app.o -L. -lqdpll -o depqbf
+ 
+ qdpll_main.o: qdpll_main.c qdpll.h
+ 	$(CC) $(CFLAGS) -c qdpll_main.c
diff --git a/debian/rules b/debian/rules
index 79fd842..7ea1b41 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,5 +4,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# for hardening support
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
 %:
 	dh $@ 

-- 
solver for quantified boolean formulae