[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 9e5f8dbd87b4f5c860f326f46d5516763bac5c23
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu Jan 17 09:50:11 2013 +0100

    change patch logic: sort_test_output_0008.patch → set_locale_test_0008.patch

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index dec35d1..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-testsuite/0008PolynomialSetUnion/outputNew
diff --git a/debian/changelog b/debian/changelog
index 8655d2b..ae90027 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ gfan (0.5+dfsg-1) UNRELEASED; urgency=low
     + 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
+    + set_locale_test_0008.patch: fix locale for consistency in sorted output
     + 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
diff --git a/debian/patches/series b/debian/patches/series
index bec653c..8ff37d3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
 use_system_cdd.patch
 remove_extra_declaration.patch
-sort_test_output_0008.patch
+set_locale_test_0008.patch
 fix_command_test_0056.patch
 string_subst_test_50x.patch
 dont_forget_flags_debian.patch
diff --git a/debian/patches/set_locale_test_0008.patch b/debian/patches/set_locale_test_0008.patch
new file mode 100644
index 0000000..603f48a
--- /dev/null
+++ b/debian/patches/set_locale_test_0008.patch
@@ -0,0 +1,10 @@
+Description: force LC_ALL=C when sorting output of test 0008
+ Order used by sort is locale-dependent.
+Author: Cédric Boutillier <boutil at debian.org>
+Last-Update: 2013-01-12
+
+--- a/testsuite/0008PolynomialSetUnion/command
++++ b/testsuite/0008PolynomialSetUnion/command
+@@ -1 +1 @@
+-%s | %s _polynomialsetunion |sort
++%s | %s _polynomialsetunion | LC_ALL=C sort
diff --git a/debian/patches/sort_test_output_0008.patch b/debian/patches/sort_test_output_0008.patch
deleted file mode 100644
index 3d6f804..0000000
--- a/debian/patches/sort_test_output_0008.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-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/source/local-options b/debian/source/local-options
index f99627f..13bdd16 100644
--- a/debian/source/local-options
+++ b/debian/source/local-options
@@ -1,3 +1,2 @@
 unapply-patches
-extend-diff-ignore="^testsuite/0008PolynomialSetUnion/outputNew"
 

-- 
gfan: Program for computing with Groebner fans