[SCM] gfan: Program for computing with Groebner fans branch, master, updated. debian/0.3dfsg-1-24-gc204dfb

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 2b97bf553de65050901e52b732b9a9c7c725d4ec
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Jan 16 20:17:24 2013 +0100

    two more patches

diff --git a/debian/changelog b/debian/changelog
index 00058d4..7fa38c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ gfan (0.5-1) UNRELEASED; urgency=low
     + add use_system_cdd.patch: cdd headers are in /usr/include/cdd
     + sort_test_output_0008.patch: test expects that output is sorted
     + fix_command_test_0056.patch: use relative path for func.poly file
+    + string_subst_test_50x.patch: replace gfan by %s as in other tests
+    + dont_forget_flags_debian.patch: take into account Debian {CPP,LD}FLAGS
 
  -- Cédric Boutillier <boutil at debian.org>  Fri, 11 Jan 2013 01:40:22 +0100
 
diff --git a/debian/patches/dont_forget_flags_debian.patch b/debian/patches/dont_forget_flags_debian.patch
new file mode 100644
index 0000000..ccf4f74
--- /dev/null
+++ b/debian/patches/dont_forget_flags_debian.patch
@@ -0,0 +1,40 @@
+Description: Use CXXFLAGS/LDFLAGS exported by dpkg-dev
+Author: Cédric Boutillier <boutil at debian.org>
+Last-Update: 2013-01-16
+
+--- a/Makefile
++++ b/Makefile
+@@ -84,8 +84,8 @@
+ #OPTFLAGS    = -O2 -DGMPRATIONAL -DNDEBUG
+ OPTFLAGS    = -O2 -DGMPRATIONAL -Wuninitialized
+ 
+-CFLAGS	  = $(OPTFLAGS) $(GPROFFLAG) $(ADDITIONALINCLUDEOPTIONS) #-pedantic
+-CCFLAGS	  = $(CFLAGS)
++CFLAGS	  += $(OPTFLAGS) $(GPROFFLAG) $(ADDITIONALINCLUDEOPTIONS) #-pedantic
++CXXFLAGS  += $(OPTFLAGS) $(GPROFFLAG) $(ADDITIONALINCLUDEOPTIONS)
+ FFLAGS	  = $(OPTFLAGS)
+ 
+ CATSOBJECTS =	$(GCATSPATH)lp_cdd.o \
+@@ -317,7 +317,7 @@
+ default: $(OBJECTS) $(ADDITIONALOBJECTS) $(EXECS)
+ 
+ $(MAIN): $(OBJECTS)
+-	$(CCLINKER) $(OBJECTS) $(ADDITIONALLINKOPTIONS) $(GPROFFLAG) -o $(MAIN)
++	$(CCLINKER) $(OBJECTS) $(LDFLAGS) $(ADDITIONALLINKOPTIONS) $(GPROFFLAG) -o $(MAIN)
+ 
+ release:
+ 	rm -f -r $(RELEASEDIR)/*
+@@ -431,11 +431,11 @@
+ 	cp gfanlib_* gfanlib/
+ 	tar zcf -  gfanlib > gfanlib.tar.gz
+ .c.o:
+-	$(CC) $(CFLAGS) -c $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
+ .cc.o:
+ 	$(CXX) -c $<
+ .cpp.o:
+-	$(CXX) $(CFLAGS) -c $<
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $<
+ .C.o:
+ 	$(CXX) -c $<
+ # wget http://ftp.sunet.se/pub/gnu/gmp/gmp-4.2.2.tar.gz
diff --git a/debian/patches/series b/debian/patches/series
index a1d28ac..bec653c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@ use_system_cdd.patch
 remove_extra_declaration.patch
 sort_test_output_0008.patch
 fix_command_test_0056.patch
+string_subst_test_50x.patch
+dont_forget_flags_debian.patch
diff --git a/debian/patches/string_subst_test_50x.patch b/debian/patches/string_subst_test_50x.patch
new file mode 100644
index 0000000..a4c693e
--- /dev/null
+++ b/debian/patches/string_subst_test_50x.patch
@@ -0,0 +1,20 @@
+Description: use string substitution instead of hard coded executable name in
+ some of the 50x tests.
+Author: Cédric Boutillier <boutil at debian.org>
+Last-Update: 2013-01-16
+
+--- a/testsuite/0507InitialIdeal/command
++++ b/testsuite/0507InitialIdeal/command
+@@ -1 +1 @@
+-gfan _overintegers --initialIdeal -m
++%s _overintegers --initialIdeal -m
+--- a/testsuite/0508IntegerGroebnerCone/command
++++ b/testsuite/0508IntegerGroebnerCone/command
+@@ -1 +1 @@
+-gfan _overintegers --groebnerCone | grep N_RAYS -v | grep RAYS -A3 | sort
++%s _overintegers --groebnerCone | grep N_RAYS -v | grep RAYS -A3 | sort
+--- a/testsuite/0509IntegerGroebnerFan/command
++++ b/testsuite/0509IntegerGroebnerFan/command
+@@ -1 +1 @@
+-gfan _overintegers --groebnerFan |grep F_VECTOR
++%s _overintegers --groebnerFan |grep F_VECTOR

-- 
gfan: Program for computing with Groebner fans