[SCM] gfan: Program for computing with Groebner fans branch, master, updated. debian/0.3dfsg-1-7-g5b117b0
Cédric Boutillier
boutil at debian.org
Sat Jan 12 16:11:53 UTC 2013
The following commit has been merged in the master branch:
commit 2e19f5ec0b701d15f240adb21ea5489234772dab
Author: Cédric Boutillier <boutil at debian.org>
Date: Sat Jan 12 15:27:44 2013 +0100
update patch series: remove 1 patch applied upstream, add 4 patches
diff --git a/debian/changelog b/debian/changelog
index 4a9e49a..00058d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+gfan (0.5-1) UNRELEASED; urgency=low
+
+ * New upstream version.
+ * debian/patches:
+ + remove gfan-installlinks-relative.patch: applied upstream
+ + add remove_extra_declaration.patch: left-over declaration causing error
+ + 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
+
+ -- Cédric Boutillier <boutil at debian.org> Fri, 11 Jan 2013 01:40:22 +0100
+
gfan (0.3dfsg-1) unstable; urgency=low
* Initial release (Closes: #480089).
diff --git a/debian/patches/fix_command_test_0056.patch b/debian/patches/fix_command_test_0056.patch
new file mode 100644
index 0000000..8a6a48a
--- /dev/null
+++ b/debian/patches/fix_command_test_0056.patch
@@ -0,0 +1,12 @@
+Description: add relative path for func.poly so that it can be found during
+ the test.
+Author: Cédric Boutillier <boutil at debian.org>
+Origin: vendor
+Last-Update: 2013-01-12
+
+
+--- a/testsuite/0056WeildDivisor/command
++++ b/testsuite/0056WeildDivisor/command
+@@ -1 +1 @@
+-%s _tropicalhypersurface >temp1.poly ; %s _tropicalweildivisor -i1 temp1.poly -i2 func.poly > temp2.poly ; %s _tropicalweildivisor -i1 temp2.poly -i2 func.poly | grep MULTIPLICITIES -A1
++%s _tropicalhypersurface >temp1.poly ; %s _tropicalweildivisor -i1 ./testsuite/0056WeilDivisor/temp1.poly -i2 ./testsuite/0056WeilDivisor/func.poly > ./testsuite/0056WeilDivisor/temp2.poly ; %s _tropicalweildivisor -i1 ./testsuite/0056WeilDivisor/temp2.poly -i2 ./testsuite/0056WeilDivisor/func.poly | grep MULTIPLICITIES -A1
diff --git a/debian/patches/gfan-installlinks-relative.patch b/debian/patches/gfan-installlinks-relative.patch
deleted file mode 100644
index ef9473d..0000000
--- a/debian/patches/gfan-installlinks-relative.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gfan-0.3/Makefile
-===================================================================
---- gfan-0.3.orig/Makefile 2008-05-29 21:03:34.000000000 -0400
-+++ gfan-0.3/Makefile 2008-05-29 21:03:53.000000000 -0400
-@@ -267,7 +267,7 @@
- install: $(BINDIR)
- cp $(EXECS) $(BINDIR)
- # cp $(EXECS) /usr/local/bin
-- ./gfan installlinks --path $(BINDIR)/
-+ cd $(BINDIR) && ./gfan installlinks
- .c.o:
- $(CC) $(CFLAGS) -c $<
- .cc.o:
diff --git a/debian/patches/remove_extra_declaration.patch b/debian/patches/remove_extra_declaration.patch
new file mode 100644
index 0000000..ce4704f
--- /dev/null
+++ b/debian/patches/remove_extra_declaration.patch
@@ -0,0 +1,16 @@
+Description: Remove left over declaration creating an error of duplicate
+ declaration
+Author: Cédric Boutillier <boutil at debian.org>
+Last-Update: 2013-01-12
+
+--- a/app_minkowski.cpp
++++ b/app_minkowski.cpp
+@@ -160,7 +160,7 @@
+ //log0 fprintf(Stderr,"4");
+ f.insert(c);
+ //log0 fprintf(Stderr,"5\n");
+- static int i;
++ //static int i;
+ //log0 fprintf(Stderr,"inserted:%i\n",++i);
+ }
+ log1 fprintf(Stderr,"Resolving symmetries.\n");
diff --git a/debian/patches/series b/debian/patches/series
index 70fbda2..a1d28ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,4 @@
-gfan-installlinks-relative.patch
+use_system_cdd.patch
+remove_extra_declaration.patch
+sort_test_output_0008.patch
+fix_command_test_0056.patch
diff --git a/debian/patches/sort_test_output_0008.patch b/debian/patches/sort_test_output_0008.patch
new file mode 100644
index 0000000..3d6f804
--- /dev/null
+++ b/debian/patches/sort_test_output_0008.patch
@@ -0,0 +1,99 @@
+Description: sorting reference output of test 0008 as the results are expected
+ to be sorted by the tests.
+Author: Cédric Boutillier <boutil at debian.org>
+Last-Update: 2013-01-12
+
+--- a/testsuite/0008PolynomialSetUnion/output
++++ b/testsuite/0008PolynomialSetUnion/output
+@@ -1,62 +1,62 @@
+-Q[a,b,c]
+-a*b-c^6,
+-a*b^2-c^3,
+-a*b^4-b,
+-a*c-b^6,
+-a*c^2-b,
+-a*c^6-c,
+-a-b^11,
+-a-b^2*c,
+-a-c^9,
++{
+ a^11-c,
+ a^15-a,
+-a^2*b-c,
+ a^2*b^3-a,
+-a^2*c-b^3,
+ a^2-b^8,
++a^2*b-c,
+ a^2-c^4,
+-a^3*c^2-c}
+-a^3-b*c^2,
++a^2*c-b^3,
+ a^3-b^5,
+-a^4*c-a,
++a^3-b*c^2,
++a^3*c^2-c}
+ a^4-b^2,
++a^4*c-a,
+ a^5-c^3,
+ a^6*b-a,
+ a^6-b*c,
+ a^8-c^2,
+ a^9-b,
+-b*c-a^6,
+-b*c^2-a^3,
+-b*c^4-c,
+-b-a*c^2,
+-b-a^9,
+-b-c^11,
++a-b^11,
++a-b^2*c,
++a*b^2-c^3,
++a*b^4-b,
++a*b-c^6,
++a*c^2-b,
++a*c^6-c,
++a-c^9,
++a*c-b^6,
+ b^11-a,
+ b^15-b,
+-b^2*c-a,
+-b^2*c^3-b,
+ b^2-a^4,
++b^2*c^3-b,
+ b^2-c^8,
++b^2*c-a,
+ b^3-a^2*c,
+ b^3-c^5,
+ b^4-c^2,
+ b^5-a^3,
+-b^6*c-b,
+ b^6-a*c,
++b^6*c-b,
+ b^8-a^2,
+ b^9-c,
+-c-a^11,
+-c-a^2*b,
+-c-b^9,
++b-a^9,
++b-a*c^2,
++b-c^11,
++b*c^2-a^3,
++b*c^4-c,
++b*c-a^6,
+ c^11-b,
+ c^15-c,
+ c^2-a^8,
+ c^2-b^4,
+-c^3-a*b^2,
+ c^3-a^5,
++c^3-a*b^2,
+ c^4-a^2,
+ c^5-b^3,
+ c^6-a*b,
+ c^8-b^2,
+ c^9-a,
+-{
++c-a^11,
++c-a^2*b,
++c-b^9,
++Q[a,b,c]
diff --git a/debian/patches/use_system_cdd.patch b/debian/patches/use_system_cdd.patch
new file mode 100644
index 0000000..fe9e580
--- /dev/null
+++ b/debian/patches/use_system_cdd.patch
@@ -0,0 +1,30 @@
+Description: use system cdd headers
+Author: Cédric Boutillier <boutil at debian.org>
+Last-Update: 2013-01-12
+
+--- a/lp_cdd.cpp
++++ b/lp_cdd.cpp
+@@ -1,7 +1,7 @@
+ #include "lp_cdd.h"
+-#include "setoper.h"
+-#include "cdd.h"
+-#include "cdd_f.h"
++#include <cdd/setoper.h>
++#include <cdd/cdd.h>
++#include <cdd/cdd_f.h>
+ #include "termorder.h"
+ #include "printer.h"
+ #include "log.h"
+--- a/gfanlib_zcone.cpp
++++ b/gfanlib_zcone.cpp
+@@ -10,8 +10,8 @@
+ #include <vector>
+ #include <set>
+
+-#include "setoper.h"
+-#include "cdd.h"
++#include <cdd/setoper.h>
++#include <cdd/cdd.h>
+
+ namespace gfan{
+
--
gfan: Program for computing with Groebner fans
More information about the debian-science-commits
mailing list