[depqbf] 03/04: refresh depqbf-makefile.patch

[Thomas Krennwallner]

This is an automated email from the git hooks/post-receive script.

tkren-guest pushed a commit to branch devel
in repository depqbf.

commit b3c75dc30abc50300fdab13ec4d211ded50d31a7
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Tue Dec 22 08:50:09 2015 +0100

    refresh depqbf-makefile.patch
---
 debian/patches/depqbf-makefile.patch | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/debian/patches/depqbf-makefile.patch b/debian/patches/depqbf-makefile.patch
index 1791922..b661f9f 100644
--- a/debian/patches/depqbf-makefile.patch
+++ b/debian/patches/depqbf-makefile.patch
@@ -1,21 +1,22 @@
 Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
 Description: Add dpkg-buildflags support and use gcc as C compiler.
-Index: depqbf-version-3.02/makefile
+Index: depqbf-git-gbp/makefile
 ===================================================================
---- depqbf-version-3.02.orig/makefile	2014-04-24 07:47:15.819912055 +0200
-+++ depqbf-version-3.02/makefile	2014-04-24 07:47:47.422880230 +0200
-@@ -2,6 +2,10 @@
+--- depqbf-git-gbp.orig/makefile
++++ depqbf-git-gbp/makefile
+@@ -2,6 +2,11 @@ CFLAGS=-Wextra -Wall -Wno-unused-paramet
  #CFLAGS=-Wextra -Wall -Wno-unused -pedantic -std=c99 -g3 -DNDEBUG
- #CFLAGS=-Wextra -Wall -Wno-unused -pedantic -std=c99 -g3
+ #CFLAGS=-Wextra -Wall -Wno-unused-parameter -Wno-unused -pedantic -std=c99 -g3
  #CFLAGS=-Wextra -Wall -Wno-unused -pedantic -std=c99 -DNDEBUG -g3 -pg -fprofile-arcs -ftest-coverage -static
-+CC=gcc
 +CFLAGS += `dpkg-buildflags --get CFLAGS`
 +CFLAGS += `dpkg-buildflags --get CPPFLAGS`
 +LDFLAGS = `dpkg-buildflags --get LDFLAGS`
- OBJECTS=qdpll_main.o qdpll_app.o qdpll.o qdpll_mem.o qdpll_dep_man_qdag.o
++CC=gcc
++
+ OBJECTS=qdpll_main.o qdpll_app.o qdpll.o qdpll_mem.o qdpll_dep_man_qdag.o qdpll_pqueue.o
  
  MAJOR=1
-@@ -17,7 +21,7 @@
+@@ -17,7 +22,7 @@ VERSION=$(MAJOR).$(MINOR)
  	$(CC) $(CFLAGS) -c $< -o $@
  
  depqbf: qdpll_main.o qdpll_app.o libqdpll.a libqdpll.so.$(VERSION)
@@ -24,10 +25,10 @@ Index: depqbf-version-3.02/makefile
  
  qdpll_main.o: qdpll_main.c qdpll.h
  
-@@ -50,7 +54,7 @@
+@@ -54,7 +59,7 @@ libqdpll.a: qdpll.o qdpll_pqueue.o qdpll
  	ranlib $@
  
- libqdpll.so.$(VERSION): qdpll.fpico qdpll_mem.fpico qdpll_dep_man_qdag.fpico
+ libqdpll.so.$(VERSION): qdpll.fpico qdpll_pqueue.fpico qdpll_mem.fpico qdpll_dep_man_qdag.fpico
 -	$(CC) -shared -Wl,-soname,libqdpll.so.$(MAJOR) $^ -o $@
 +	$(CC) $(LDFLAGS) -shared -Wl,-soname,libqdpll.so.$(MAJOR) $^ -o $@
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/depqbf.git