[singular] 01/01: update debian/patches directory
felix salfelder
felix-guest at alioth.debian.org
Mon Aug 19 19:19:03 UTC 2013
This is an automated email from the git hooks/post-receive script.
felix-guest pushed a commit to branch master-3-1-5
in repository singular.
commit f9dbe7ffaa02993b7d84f45214e21a6726eacd84
Author: Felix Salfelder <felix at salfelder.org>
Date: Mon Aug 19 21:17:03 2013 +0200
update debian/patches directory
---
debian/.git-dpm | 2 +-
...01-avoid-segfault-in-internal-help-parser.patch | 27 -
...es.patch => 0001-tag-gfan-using-examples.patch} | 140 ++-
debian/patches/0002-tag-MP-using-examples.patch | 99 --
...STDIR-as-a-pre-prefix-in-install-targets.patch} | 42 +-
...03-add-working-all-target-to-Makefile.in.patch} | 6 +-
debian/patches/0003-tag-more-examples.patch | 144 ---
.../0004-mark-hidden-sub-makes-in-doc.patch | 40 -
...> 0004-miscellaneous-Makefile.in-patches.patch} | 111 +--
...eds-to-be-defined-after-include-assert.h.patch} | 12 +-
...ar.patch => 0006-keep-mod2.h-in-Singular.patch} | 1002 ++++++++++----------
... => 0007-move-libreadline-to-main-binary.patch} | 36 +-
...ings.patch => 0008-default-path-settings.patch} | 12 +-
.../0009-fix-NTL-negate-namespace-issue.patch | 28 +
...install-factory.h-where-libfac-expects-it.patch | 22 +
.../patches/0013-fix-licence-of-minpoly.-GPL.patch | 52 -
debian/patches/series | 23 +-
17 files changed, 706 insertions(+), 1092 deletions(-)
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 697d364..dffcf11 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,5 +1,5 @@
# see git-dpm(1) from git-dpm package
-27e029636862d5ac4d8c20c466d37e79f762e7f8
+80af528c075a9215ceb425f9221350be1a184fc3
80af528c075a9215ceb425f9221350be1a184fc3
01299c5795a0c0b3842c1f6d3bc30d3714fc1248
01299c5795a0c0b3842c1f6d3bc30d3714fc1248
diff --git a/debian/patches/0001-avoid-segfault-in-internal-help-parser.patch b/debian/patches/0001-avoid-segfault-in-internal-help-parser.patch
deleted file mode 100644
index b2bc90d..0000000
--- a/debian/patches/0001-avoid-segfault-in-internal-help-parser.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7d6ccb5bda9bcd580c39b79e2a66f7f6e56d9f4e Mon Sep 17 00:00:00 2001
-From: "Bernhard R. Link" <brlink at debian.org>
-Date: Sat, 3 Mar 2012 13:24:47 +0100
-Subject: avoid segfault in internal help parser
-
-the dummy help parser has a maximum length of index entries that is
-too short. Increase the constant to avoid that.
-
-Bug: http://www.singular.uni-kl.de:8002/trac/ticket/408
-Applied-Upstream: https://github.com/Singular/Sources/commit/ac1f9c07b80ebde3491189a494a1c90324e91baa
----
- Singular/fehelp.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Singular/fehelp.cc b/Singular/fehelp.cc
-index 34a0ffb..3c39bf9 100644
---- a/Singular/fehelp.cc
-+++ b/Singular/fehelp.cc
-@@ -1126,7 +1126,7 @@ static void heBuiltinHelp(heEntry hentry, int br)
- #define HELP_NOT_OPEN 1
- #define HELP_NOT_FOUND 2
- #define BUF_LEN 256
--#define IDX_LEN 64
-+#define IDX_LEN 256
- #define MAX_LINES 21
-
- static inline char tolow(char p)
diff --git a/debian/patches/0005-tag-gfan-using-examples.patch b/debian/patches/0001-tag-gfan-using-examples.patch
similarity index 75%
rename from debian/patches/0005-tag-gfan-using-examples.patch
rename to debian/patches/0001-tag-gfan-using-examples.patch
index adf4025..5714ded 100644
--- a/debian/patches/0005-tag-gfan-using-examples.patch
+++ b/debian/patches/0001-tag-gfan-using-examples.patch
@@ -1,4 +1,4 @@
-From bcdc02f66d874d23b71f7c698a2481581565ac80 Mon Sep 17 00:00:00 2001
+From fade56b642256bc143bb6fd75e5e101e6075fd0a Mon Sep 17 00:00:00 2001
From: "Bernhard R. Link" <brlink at debian.org>
Date: Sat, 3 Mar 2012 10:17:51 +0100
Subject: tag gfan using examples
@@ -6,14 +6,14 @@ Subject: tag gfan using examples
Tag all examples in cones.doc, so that the manual can be built
even if compiled without gfan support.
---
- doc/cones.doc | 96 ++++++++++++++++++++++++++++-----------------------------
- 1 file changed, 48 insertions(+), 48 deletions(-)
+ doc/cones.doc | 92 +++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 46 insertions(+), 46 deletions(-)
diff --git a/doc/cones.doc b/doc/cones.doc
-index 0a6b855..944d2f1 100644
+index a2e652e..75c287e 100644
--- a/doc/cones.doc
+++ b/doc/cones.doc
-@@ -53,7 +53,7 @@ vectors of L is the lineality space of the cone,
+@@ -52,7 +52,7 @@ vectors of L is the lineality space of the cone,
if either bit is 0, then program computes the information itself.
@item @strong{Example:}
@smallexample
@@ -22,7 +22,7 @@ index 0a6b855..944d2f1 100644
// Let's define a cone in R^3 generated by the following half lines:
intmat HL[5][3]=
1,0, 0,
-@@ -115,7 +115,7 @@ if lower bit is 1, then program assumes the kernel of E is the span of the cone,
+@@ -117,7 +117,7 @@ if lower bit is 1, then program assumes the kernel of E is the span of the cone,
if either bit is 0, then program computes the information itself.
@item @strong{Example:}
@smallexample
@@ -31,16 +31,7 @@ index 0a6b855..944d2f1 100644
// Let's define a cone in R^3 given by the following inequalities:
intmat IE[6][3]=
1,3,5,
-@@ -176,7 +176,7 @@ if lower bit is 1, then program assumes the kernel of E is the span of the cone,
- if either bit is 0, then program computes the information itself.
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M[11][3]=
- 0,-1,1,
- -1,1,0,
-@@ -251,7 +251,7 @@ cone
+@@ -211,7 +211,7 @@ cone
canonicalized version of the cone, no more redundant inequalities and equations
@item @strong{Example:}
@smallexample
@@ -49,7 +40,7 @@ index 0a6b855..944d2f1 100644
intmat M[11][3]=
0,-1,1,
-1,1,0,
-@@ -284,7 +284,7 @@ cone
+@@ -244,7 +244,7 @@ cone
local version of the given cone around the given point of the cone
@item @strong{Example:}
@smallexample
@@ -58,7 +49,7 @@ index 0a6b855..944d2f1 100644
intmat M[3][3]=
1,0,0,
0,1,0,
-@@ -316,7 +316,7 @@ int
+@@ -306,7 +306,7 @@ int
1 iff c1 entirely contains c2 resp. iff c contains the given point, possibly on one of its facets; 0 otherwise
@item @strong{Example:}
@smallexample
@@ -67,7 +58,7 @@ index 0a6b855..944d2f1 100644
intmat M[2][2]=
1,0,
0,1;
-@@ -353,7 +353,7 @@ int
+@@ -343,7 +343,7 @@ int
1 iff the cone contains a point with positive coordinates in its relative interior; 0 otherwise
@item @strong{Example:}
@smallexample
@@ -76,7 +67,7 @@ index 0a6b855..944d2f1 100644
intmat M1[2][2]=
1,1,
1,-1;
-@@ -381,7 +381,7 @@ int
+@@ -371,7 +371,7 @@ int
1 iff the given cone contains the given point in its relative interior; 0 otherwise
@item @strong{Example:}
@smallexample
@@ -85,7 +76,7 @@ index 0a6b855..944d2f1 100644
intmat M[2][2]=
1,0,
0,1;
-@@ -409,7 +409,7 @@ int
+@@ -399,7 +399,7 @@ int
ambient dimension of the cone;
@item @strong{Example:}
@smallexample
@@ -94,7 +85,7 @@ index 0a6b855..944d2f1 100644
intmat M1[2][2]=
1,0,
0,1;
-@@ -439,7 +439,7 @@ int
+@@ -429,7 +429,7 @@ int
codimension of the cone;
@item @strong{Example:}
@smallexample
@@ -102,8 +93,8 @@ index 0a6b855..944d2f1 100644
+ at c example tag:gfan
intmat M1[1][2]=
1,0;
- cone c1=coneViaRays(M1);
-@@ -467,7 +467,7 @@ int
+ cone c1=coneViaPoints(M1);
+@@ -457,7 +457,7 @@ int
dimension of the cone
@item @strong{Example:}
@smallexample
@@ -111,8 +102,8 @@ index 0a6b855..944d2f1 100644
+ at c example tag:gfan
intmat M1[1][2]=
1,0;
- cone c1=coneViaRays(M1);
-@@ -493,7 +493,7 @@ cone
+ cone c1=coneViaPoints(M1);
+@@ -483,7 +483,7 @@ cone
the dual of the cone
@item @strong{Example:}
@smallexample
@@ -121,7 +112,7 @@ index 0a6b855..944d2f1 100644
intmat M1[2][2]=
1,0,
0,1;
-@@ -526,7 +526,7 @@ intmat
+@@ -516,7 +516,7 @@ bigintmat
equations given by the cone
@item @strong{Example:}
@smallexample
@@ -130,7 +121,7 @@ index 0a6b855..944d2f1 100644
intmat M1[2][2]=
1,0,
0,1;
-@@ -556,7 +556,7 @@ intmat
+@@ -546,7 +546,7 @@ bigintmat
inner normal vectors of the facets of the cone
@item @strong{Example:}
@smallexample
@@ -139,7 +130,7 @@ index 0a6b855..944d2f1 100644
intmat M1[2][2]=
1,0,
0,1;
-@@ -586,7 +586,7 @@ intmat
+@@ -576,7 +576,7 @@ bigintmat
generating vectors of the lineality space of the cone
@item @strong{Example:}
@smallexample
@@ -148,7 +139,7 @@ index 0a6b855..944d2f1 100644
intmat M[5][3]=
1,0,0,
0,1,0,
-@@ -613,7 +613,7 @@ intmat
+@@ -603,7 +603,7 @@ bigintmat
generating vectors of the span of the cone
@item @strong{Example:}
@smallexample
@@ -157,7 +148,7 @@ index 0a6b855..944d2f1 100644
intmat M[3][5]=
1,0,0,0,0,
0,1,0,0,0,
-@@ -638,7 +638,7 @@ intmat
+@@ -654,7 +654,7 @@ bigintmat
generating vectors of the orthogonal complement of the span of the cone
@item @strong{Example:}
@smallexample
@@ -166,7 +157,7 @@ index 0a6b855..944d2f1 100644
intmat M[3][5]=
1,0,0,0,0,
0,1,0,0,0,
-@@ -663,7 +663,7 @@ intmat
+@@ -679,7 +679,7 @@ bigintmat
inequalities given by the cone
@item @strong{Example:}
@smallexample
@@ -175,7 +166,7 @@ index 0a6b855..944d2f1 100644
intmat M1[2][2]=
1,0,
0,1;
-@@ -693,7 +693,7 @@ int
+@@ -709,7 +709,7 @@ int
dimension of the lineality space of the cone
@item @strong{Example:}
@smallexample
@@ -184,7 +175,7 @@ index 0a6b855..944d2f1 100644
intmat M1[3][3]=
1,0,0,
0,1,0,
-@@ -724,7 +724,7 @@ cone
+@@ -740,7 +740,7 @@ cone
the lineality space of the cone as a new cone
@item @strong{Example:}
@smallexample
@@ -193,7 +184,7 @@ index 0a6b855..944d2f1 100644
intmat M1[3][3]=
1,0,0,
0,1,0,
-@@ -758,7 +758,7 @@ intvec
+@@ -774,7 +774,7 @@ intvec
linear forms of the cone (can be set by setLinearForms); returns empty intmat if not set
@item @strong{Example:}
@smallexample
@@ -202,16 +193,7 @@ index 0a6b855..944d2f1 100644
intmat M[2][3]=
-1,0,0,
0,-1,0;
-@@ -785,7 +785,7 @@ int
- multiplicity of the cone (can be set by setMultiplicity); returns 1 if not set
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M[2][3]=
- -1,0,0,
- 0,-1,0;
-@@ -810,7 +810,7 @@ cone
+@@ -800,7 +800,7 @@ cone
the negated (or negative) of the cone
@item @strong{Example:}
@smallexample
@@ -220,7 +202,7 @@ index 0a6b855..944d2f1 100644
intmat M[2][2]=
1,0,
0,1;
-@@ -835,7 +835,7 @@ int
+@@ -825,7 +825,7 @@ bigintmat%
quotient of Z^n intersected with the span of the cone with Z^n intersected with its lineality space
@item @strong{Example:}
@smallexample
@@ -229,7 +211,7 @@ index 0a6b855..944d2f1 100644
intmat M[3][2]=
1,0,
0,1,
-@@ -860,7 +860,7 @@ intmat
+@@ -850,7 +850,7 @@ bigintmat
rays of the cone outside the lineality space, rays inside the lineality space will be ignored
@item @strong{Example:}
@smallexample
@@ -238,7 +220,7 @@ index 0a6b855..944d2f1 100644
intmat M1[2][2]=
1,0,
0,1;
-@@ -891,7 +891,7 @@ intvec
+@@ -881,7 +881,7 @@ intvec
point in the relative interior of the cone
@item @strong{Example:}
@smallexample
@@ -247,8 +229,8 @@ index 0a6b855..944d2f1 100644
intmat M1[2][2]=
1,0,
0,1;
-@@ -919,7 +919,7 @@ intvec
- if getDimension(c)=getLinealityDimension(c)+1, then the quotient lattice of Z^n intersected with the span and Z^n intersected with the lineality space is Z^1 and the class of the cone is a semigroup. returns a generator of that semigroup. (like getQuotientLatticeBasis(cone c), but as intvec)
+@@ -909,7 +909,7 @@ intvec
+ if dimension(c)=linealityDimension(c)+1, then the quotient lattice of Z^n intersected with the span and Z^n intersected with the lineality space is Z^1 and the class of the cone is a semigroup. returns a generator of that semigroup. (like quotientLatticeBasis(cone c), but as intvec)
@item @strong{Example:}
@smallexample
- at c example
@@ -256,7 +238,7 @@ index 0a6b855..944d2f1 100644
intmat M[3][2]=
1,0,
0,1,
-@@ -943,7 +943,7 @@ intvec
+@@ -933,7 +933,7 @@ intvec
special-purpose interior point which supports recognition of symmetries among non-intersecting cones (used in implementation of fans)
@item @strong{Example:}
@smallexample
@@ -265,17 +247,17 @@ index 0a6b855..944d2f1 100644
intmat M1[2][2]=
1,0,
0,1;
-@@ -971,7 +971,7 @@ int
- 1 iff c1 contains c2 as a face; 0 otherwise
+@@ -964,7 +964,7 @@ cone if both input arguments are cones, else polytope
+ the hull of the two objects
@item @strong{Example:}
@smallexample
- at c example
+ at c example tag:gfan
- intmat M[2][2]=
+ intmat M1[2][2]=
1,0,
0,1;
-@@ -1001,7 +1001,7 @@ cone
- the intersection of the two cones
+@@ -1006,7 +1006,7 @@ cone if both input arguments are cones, else polytope
+ the intersection of the two objects
@item @strong{Example:}
@smallexample
- at c example
@@ -283,7 +265,7 @@ index 0a6b855..944d2f1 100644
intmat M1[2][2]=
1,0,
0,1;
-@@ -1040,7 +1040,7 @@ int
+@@ -1045,7 +1045,7 @@ int
1 iff the cone is the entire ambient space; 0 otherwise
@item @strong{Example:}
@smallexample
@@ -292,7 +274,7 @@ index 0a6b855..944d2f1 100644
cone c1;
isFullSpace(c1);
intmat M2[2][2]=
-@@ -1072,7 +1072,7 @@ int
+@@ -1077,7 +1077,7 @@ int
1 iff the cone is just the origin of the ambient space; 0 otherwise
@item @strong{Example:}
@smallexample
@@ -301,7 +283,7 @@ index 0a6b855..944d2f1 100644
cone c1; // full cone in zero-dimensional ambient space
isOrigin(c1);
intmat M2[2][2]=
-@@ -1105,7 +1105,7 @@ int
+@@ -1110,7 +1110,7 @@ int
1 iff the cone resp. fan is simplicial; 0 otherwise
@item @strong{Example:}
@smallexample
@@ -310,7 +292,7 @@ index 0a6b855..944d2f1 100644
intmat M1[3][3]=
1,0,0,
0,1,0,
-@@ -1154,7 +1154,7 @@ isSimplicial(f);
+@@ -1159,7 +1159,7 @@ isSimplicial(f);
adds the information of a linear form to the cone
@item @strong{Example:}
@smallexample
@@ -319,7 +301,7 @@ index 0a6b855..944d2f1 100644
intmat M[2][3]=
-1,0,0,
0,-1,0;
-@@ -1180,7 +1180,7 @@ getLinearForms(c);
+@@ -1185,7 +1185,7 @@ linearForms(c);
adds the information of a multiplicity to the cone
@item @strong{Example:}
@smallexample
@@ -328,7 +310,7 @@ index 0a6b855..944d2f1 100644
intmat M[2][3]=
-1,0,0,
0,-1,0;
-@@ -1321,7 +1321,7 @@ cone
+@@ -1329,7 +1329,7 @@ cone
1 iff c is contained in the collection of cones that is f; 0 otherwise
@item @strong{Example:}
@smallexample
@@ -337,7 +319,7 @@ index 0a6b855..944d2f1 100644
fan f=emptyFan(2);
intmat M[2][2]=
1,0,
-@@ -1347,7 +1347,7 @@ cone
+@@ -1419,7 +1419,7 @@ cone
cone (orbit=0) or orbit (orbit=1) of a certain index (ranges from 1 to numberOfConesOfDimension(f,2,0,0)) in a given dimension; if maximal=0, all cones and orbits are considered, if maximal=1, only maximal cones and orbits are considered
@item @strong{Example:}
@smallexample
@@ -346,8 +328,8 @@ index 0a6b855..944d2f1 100644
intmat M[3][3]=
1,0,0,
0,1,0,
-@@ -1375,7 +1375,7 @@ none
- inserts the cone into the fan, checks for compatibility beforehand
+@@ -1448,7 +1448,7 @@ none
+ inserts the cone into the fan; checks for compatibility beforehand unless check is passed and equal 0
@item @strong{Example:}
@smallexample
- at c example
@@ -355,7 +337,7 @@ index 0a6b855..944d2f1 100644
fan f=emptyFan(3);
f;
intmat M[3][3]=
-@@ -1403,7 +1403,7 @@ int
+@@ -1476,7 +1476,7 @@ int
1 iff cone is compatible with the fan; 0 otherwise
@item @strong{Example:}
@smallexample
@@ -364,7 +346,7 @@ index 0a6b855..944d2f1 100644
fan f=emptyFan(3);
intmat M1[3][3]=
1,0,0,
-@@ -1441,7 +1441,7 @@ isCompatible(f,c3);
+@@ -1514,7 +1514,7 @@ isCompatible(f,c3);
@c 1 iff the fan is complete; 0 otherwise
@c @item @strong{Example:}
@c @smallexample
@@ -373,7 +355,7 @@ index 0a6b855..944d2f1 100644
@c fan f=fullFan(2);
@c isComplete(f);
@c fan g=emptyFan(2);
-@@ -1481,7 +1481,7 @@ int
+@@ -1554,7 +1554,7 @@ int
1 iff the fan is pure; 0 otherwise
@item @strong{Example:}
@smallexample
@@ -382,7 +364,7 @@ index 0a6b855..944d2f1 100644
fan f=fullFan(2);
isPure(f);
fan g=emptyFan(2);
-@@ -1513,7 +1513,7 @@ int
+@@ -1586,7 +1586,7 @@ int
number of maximal cones in f
@item @strong{Example:}
@smallexample
@@ -391,7 +373,7 @@ index 0a6b855..944d2f1 100644
fan f=emptyFan(3);
nmaxcones(f);
intmat M1[3][3]=
-@@ -1546,7 +1546,7 @@ int
+@@ -1619,7 +1619,7 @@ int
number of cones in f
@item @strong{Example:}
@smallexample
@@ -400,7 +382,7 @@ index 0a6b855..944d2f1 100644
fan f=emptyFan(3);
ncones(f);
intmat M1[3][3]=
-@@ -1579,7 +1579,7 @@ int
+@@ -1652,7 +1652,7 @@ int
number of cones (orbit=0) or orbits (orbit=1) of a given dimension; if maximal=0, then all cones are considered, if maximal=1, only maximal cones are considered
@item @strong{Example:}
@smallexample
@@ -409,16 +391,16 @@ index 0a6b855..944d2f1 100644
fan f=emptyFan(3);
ncones(f);
intmat M[3][3]=
-@@ -1613,7 +1613,7 @@ none
- inserts the cone into the fan, no checking of compatibility
+@@ -1687,7 +1687,7 @@ none
+ removes the cone from the fan; checks for compatibility beforehand unless check is passed and equal 0
@item @strong{Example:}
@smallexample
- at c example
+ at c example tag:gfan
- fan f=emptyFan(3);
- f;
- intmat M[3][3]=
-@@ -1666,7 +1666,7 @@ a vertex of the polytope,
+ intmat M[2][2]=1,0,0,1;
+ intmat N[2][2]=1,0,1,-1;
+ cone c=coneViaPoints(M);
+@@ -1741,7 +1741,7 @@ a vertex of the polytope,
if flags is 0, then program computes the information itself.
@item @strong{Example:}
@smallexample
@@ -427,7 +409,7 @@ index 0a6b855..944d2f1 100644
// Let's a polytope in R^2 generated by:
intmat V[4][3]=
1,0,0,
-@@ -1707,7 +1707,7 @@ if lower bit is 1, then program assumes the kernel of E is the span of the cone,
+@@ -1782,7 +1782,7 @@ if lower bit is 1, then program assumes the kernel of E is the span of the cone,
if either bit is 0, then program computes the information itself.
@item @strong{Example:}
@smallexample
@@ -436,7 +418,7 @@ index 0a6b855..944d2f1 100644
intmat IE[2][3]=
1,0,0,
0,1,0;
-@@ -1752,7 +1752,7 @@ intmat
+@@ -1876,7 +1876,7 @@ intmat
vertices of p
@item @strong{Example:}
@smallexample
diff --git a/debian/patches/0002-tag-MP-using-examples.patch b/debian/patches/0002-tag-MP-using-examples.patch
deleted file mode 100644
index aa48286..0000000
--- a/debian/patches/0002-tag-MP-using-examples.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 214c96a8ba75a03ae3b280686aa6ef487b4131f7 Mon Sep 17 00:00:00 2001
-From: "Bernhard R. Link" <brlink at debian.org>
-Date: Sat, 3 Mar 2012 10:16:25 +0100
-Subject: tag MP using examples
-
-Properly tag all examples using MP functions, so that the documentation
-can be built even if built without MP.
-
-Bug: http://www.singular.uni-kl.de:8002/trac/ticket/407
----
- doc/general.doc | 8 ++++----
- doc/reference.doc | 4 ++--
- doc/types.doc | 4 ++--
- 3 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/doc/general.doc b/doc/general.doc
-index 155ef21..d3f493a 100644
---- a/doc/general.doc
-+++ b/doc/general.doc
-@@ -2913,7 +2913,7 @@ For more information, see @ref{write}, @ref{read}, @ref{dump},
-
- @strong{Example:}
- @smallexample
-- at c example unix_only
-+ at c example unix_only tag:MP
- ring r; poly p = x+y;
- dump("MPfile:w test.mp"); // dump the session to the file test.mp
- kill r; // kill the basering
-@@ -2934,7 +2934,7 @@ Links have various properties which can be queried using the
-
- @strong{Example:}
- @smallexample
-- at c example unix_only
-+ at c example unix_only tag:MP
- link l = "MPtcp:fork";
- l;
- open(l);
-@@ -2988,7 +2988,7 @@ MPfile links are implemented on Unix-like operating systems only.
-
- @strong{Example:}
- @smallexample
-- at c example unix_only
-+ at c example unix_only tag:MP
- ring r;
- // (over)write MPfile test.mp, link is specified as string
- write("MPfile:w test.mp", x+y);
-@@ -3015,7 +3015,7 @@ MPtcp links are implemented on Unix-like operating systems only.
-
- @strong{Example:}
- @smallexample
-- at c example unix_only
-+ at c example unix_only tag:MP
- ring r;
- link l = "MPtcp:launch"; // declare a link explicitly
- open(l); // needs an open, launches another SINGULAR as a server
-diff --git a/doc/reference.doc b/doc/reference.doc
-index edf78fa..472f229 100644
---- a/doc/reference.doc
-+++ b/doc/reference.doc
-@@ -1604,7 +1604,7 @@ with @code{quote} and @code{write} to
- prevent local evaluations when writing to an MPtcp link.
- @item @strong{Example:}
- @smallexample
-- at c example unix_only
-+ at c example unix_only tag:MP
- link l="MPfile:w example.mp";
- ring r=0,(x,y,z),ds;
- ideal i=maxideal(3);
-@@ -5708,7 +5708,7 @@ quote can be "undone" by an @code{eval} (i.e., each eval "undoes" the
- effect of exactly one quote).
- @item @strong{Example:}
- @smallexample
-- at c example unix_only
-+ at c example unix_only tag:MP
- link l="MPfile:w example.mp";
- ring r=0,(x,y,z),ds;
- ideal i=maxideal(3);
-diff --git a/doc/types.doc b/doc/types.doc
-index 768559d..d6a688e 100644
---- a/doc/types.doc
-+++ b/doc/types.doc
-@@ -1638,7 +1638,7 @@ either for reading or for writing, but not for both at the same time. A
-
- @*@strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:MP
- ring r;
- link l="MPfile:w example.mp"; // type=MPfile, mode=overwrite
- l;
-@@ -1786,7 +1786,7 @@ is data to read.
-
- @*@strong{Example:}
- @smallexample
-- at c example unix_only
-+ at c example unix_only tag:MP
- LIB "general.lib"; // needed for "killall" command
- link l="MPtcp:launch";
- open(l); l; // l is ready for writing but not for reading
diff --git a/debian/patches/0006-use-DESTDIR-as-a-pre-prefix-in-install-targets.patch b/debian/patches/0002-use-DESTDIR-as-a-pre-prefix-in-install-targets.patch
similarity index 93%
rename from debian/patches/0006-use-DESTDIR-as-a-pre-prefix-in-install-targets.patch
rename to debian/patches/0002-use-DESTDIR-as-a-pre-prefix-in-install-targets.patch
index fda0c96..be8f9ab 100644
--- a/debian/patches/0006-use-DESTDIR-as-a-pre-prefix-in-install-targets.patch
+++ b/debian/patches/0002-use-DESTDIR-as-a-pre-prefix-in-install-targets.patch
@@ -1,22 +1,22 @@
-From 1132ca05e1003cc6bf9aaec92b8914eb2cc52e99 Mon Sep 17 00:00:00 2001
+From 7442849937cc698cadbc71d6a3ce40cc1c62f7a1 Mon Sep 17 00:00:00 2001
From: Felix Salfelder <felix at salfelder.org>
Date: Thu, 16 Feb 2012 08:45:58 +0100
Subject: use $DESTDIR as a pre-prefix, in install* targets
---
- IntegerProgramming/Makefile.in | 12 +++---
- Singular/Makefile.in | 85 ++++++++++++++++++----------------------
- factory/GNUmakefile.in | 25 ++++++------
- kernel/Makefile.in | 20 +++++-----
- libfac/Makefile.in | 14 +++----
- omalloc/Makefile.in | 22 +++++------
+ IntegerProgramming/Makefile.in | 12 +++---
+ Singular/Makefile.in | 85 +++++++++++++++++++-----------------------
+ factory/GNUmakefile.in | 25 +++++++------
+ kernel/Makefile.in | 20 +++++-----
+ libfac/Makefile.in | 14 +++----
+ omalloc/Makefile.in | 22 +++++------
6 files changed, 85 insertions(+), 93 deletions(-)
diff --git a/IntegerProgramming/Makefile.in b/IntegerProgramming/Makefile.in
-index 5b5b5e6..0c6e6af 100644
+index 50de520..05fccfe 100644
--- a/IntegerProgramming/Makefile.in
+++ b/IntegerProgramming/Makefile.in
-@@ -57,12 +57,12 @@ install-nolns: install
+@@ -63,12 +63,12 @@ install-nolns: install
install_all: install
install install-libsingular: $(MAIN1) $(MAIN2) $(MAIN3) $(MAIN4) $(LLL)
@@ -36,10 +36,10 @@ index 5b5b5e6..0c6e6af 100644
install-bindist: $(MAIN1) $(MAIN2) $(MAIN3) $(MAIN4)
${MKINSTALLDIRS} ${install_bindir}
diff --git a/Singular/Makefile.in b/Singular/Makefile.in
-index c6a3ecb..8f004e6 100644
+index c4a6e78..3e02df1 100644
--- a/Singular/Makefile.in
+++ b/Singular/Makefile.in
-@@ -560,51 +560,42 @@ install_all: install
+@@ -556,51 +556,42 @@ install_all: install
install-nolns: all installbin-nolns installslib-nolns
installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
@@ -96,7 +96,7 @@ index c6a3ecb..8f004e6 100644
+ ${INSTALL_DATA} $$file $(DESTDIR)${slibdir}; \
done
- install-libsingular: libsingular
+ install-libsingular: libsingular installslib-nolns
- ${MKINSTALLDIRS} ${includedir}/singular
+ ${MKINSTALLDIRS} $(DESTDIR)${includedir}/singular
for file in *.$(SO_SUFFIX); do \
@@ -111,7 +111,7 @@ index c6a3ecb..8f004e6 100644
done
uninstall: uninstallbin
-@@ -654,23 +645,23 @@ LIB/all.lib: LIB/all.lib.tmpl
+@@ -650,23 +641,23 @@ LIB/all.lib: LIB/all.lib.tmpl
install-bindist: $(HEADERS) $(SOURCES) Makefile depend
echo "#define MAKE_DISTRIBUTION " > distrib.h
@@ -149,7 +149,7 @@ index c6a3ecb..8f004e6 100644
tar:
tar cf Singular-${SINGULAR_VERSION}-src.tar ${DISTFILES}
-@@ -768,8 +759,8 @@ mpsr_Tok.og: iparith.inc mpsr_Tok.cc
+@@ -764,8 +755,8 @@ mpsr_Tok.og: iparith.inc mpsr_Tok.cc
$(CXXG) ${CXXFLAGSG} ${CPPFLAGS} ${CXXTEMPLFLAGSG} ${DEFSG} -c mpsr_Tok.cc -o mpsr_Tok.og
installg: Singularg
@@ -160,7 +160,7 @@ index c6a3ecb..8f004e6 100644
ESingularg: mod2.h feOpt.cc version.h emacs.cc \
feOptES.inc
-@@ -848,8 +839,8 @@ mpsr_Tok.op: iparith.inc mpsr_Tok.cc
+@@ -844,8 +835,8 @@ mpsr_Tok.op: iparith.inc mpsr_Tok.cc
$(CXXP) ${CXXFLAGSP} ${CPPFLAGS} ${CXXTEMPLFLAGSP} ${DEFSP} -c mpsr_Tok.cc -o mpsr_Tok.op
installp: Singularp
@@ -172,10 +172,10 @@ index c6a3ecb..8f004e6 100644
##
## dependencies
diff --git a/factory/GNUmakefile.in b/factory/GNUmakefile.in
-index ad1dcf1..1e8d80d 100644
+index 61d0db2..85d866b 100644
--- a/factory/GNUmakefile.in
+++ b/factory/GNUmakefile.in
-@@ -642,21 +642,22 @@ install_all: install libsingcf_p.a
+@@ -543,21 +543,22 @@ install_all: install libsingcf_p.a
install-nolns: install
installcf: cf
@@ -211,7 +211,7 @@ index ad1dcf1..1e8d80d 100644
installmem: mem
$(MKINSTALLDIRS) $(libdir)
diff --git a/kernel/Makefile.in b/kernel/Makefile.in
-index 13db562..7b8b77b 100644
+index adc9cd9..6f58083 100644
--- a/kernel/Makefile.in
+++ b/kernel/Makefile.in
@@ -48,7 +48,7 @@ PIPE = @PIPE@
@@ -285,10 +285,10 @@ index 13db562..7b8b77b 100644
##
diff --git a/libfac/Makefile.in b/libfac/Makefile.in
-index ef7bc5a..62faadb 100644
+index c2b38eb..1f2953f 100644
--- a/libfac/Makefile.in
+++ b/libfac/Makefile.in
-@@ -147,13 +147,13 @@ libsingfac_p.a: $(PROFOBJ)
+@@ -146,13 +146,13 @@ libsingfac_p.a: $(PROFOBJ)
install-nolns: install
install install-libsingular: all
@@ -310,7 +310,7 @@ index ef7bc5a..62faadb 100644
install_all: install libsingfac_p.a
-${INSTALL_DATA} libsingfac_p.a ${libdir}
diff --git a/omalloc/Makefile.in b/omalloc/Makefile.in
-index 79cd909..4956179 100644
+index 98a7e95..8661ca2 100644
--- a/omalloc/Makefile.in
+++ b/omalloc/Makefile.in
@@ -185,17 +185,17 @@ install-libsingular:
diff --git a/debian/patches/0007-add-working-all-target-to-Makefile.in.patch b/debian/patches/0003-add-working-all-target-to-Makefile.in.patch
similarity index 92%
rename from debian/patches/0007-add-working-all-target-to-Makefile.in.patch
rename to debian/patches/0003-add-working-all-target-to-Makefile.in.patch
index 66a80f0..55bd938 100644
--- a/debian/patches/0007-add-working-all-target-to-Makefile.in.patch
+++ b/debian/patches/0003-add-working-all-target-to-Makefile.in.patch
@@ -1,15 +1,15 @@
-From 6f30888279821baa8715124aab14bd03f94f7b8f Mon Sep 17 00:00:00 2001
+From 3f2e4c8db622992d1b99da8f3d470899340b2c2c Mon Sep 17 00:00:00 2001
From: Felix Salfelder <felix at salfelder.org>
Date: Thu, 16 Feb 2012 11:07:25 +0100
Subject: add working 'all' target to Makefile.in
now 'make\ {all,install}' works as usual and expected
---
- Makefile.in | 14 +++++++++-----
+ Makefile.in | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/Makefile.in b/Makefile.in
-index 8e78512..3797c90 100644
+index 0d6db8f..f2eaa65 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,8 +24,12 @@ GUNZIP = @GUNZIP@
diff --git a/debian/patches/0003-tag-more-examples.patch b/debian/patches/0003-tag-more-examples.patch
deleted file mode 100644
index 4c6a256..0000000
--- a/debian/patches/0003-tag-more-examples.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From d101cf4aac289d77496e41f917efd1b7938d91c8 Mon Sep 17 00:00:00 2001
-From: "Bernhard R. Link" <brlink at debian.org>
-Date: Sat, 3 Mar 2012 10:21:04 +0100
-Subject: tag more examples
-
-Add a way to tag all examples from a .lib file included.
-
-Use this new feature to tag some libs needed external programs,
-special features or significant memory usage in order to be able
-to build documentation on more machines.
-
-Make DOC2TEX_EXAMPLE_EXCLUSIONS a make variable, so that this
-setting can also be overridden at make invocation time.
-
-Bug: http://www.singular.uni-kl.de:8002/trac/ticket/409
----
- doc/Makefile.in | 6 ++++--
- doc/doc2tex.pl | 12 ++++++++++--
- doc/examples.doc | 2 +-
- doc/pl2doc.pl | 3 ++-
- doc/singular.doc | 6 +++---
- 5 files changed, 20 insertions(+), 9 deletions(-)
-
-diff --git a/doc/Makefile.in b/doc/Makefile.in
-index 39ed588..7482778 100644
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -67,10 +67,12 @@ endif
- DOC_SUBDIR = ./d2t_singular
- EX_SUBDIR = ./examples
- CHKSUM_DB = ${DOC_SUBDIR}/chksum
-+DOC2TEX_EXAMPLE_EXCLUSIONS = @DOC2TEX_EXAMPLE_EXCLUSIONS@
- DOC2TEX = ${PERL} ./doc2tex.pl -docdir ${DOC_SUBDIR} \
- -Singular ${SINGULAR} -verbose ${VERBOSE} -make ${MAKE} \
-- -exdir ${EX_SUBDIR} @DOC2TEX_EXAMPLE_EXCLUSIONS@
--PL2DOC = ${PERL} ./pl2doc.pl -db ${CHKSUM_DB}
-+ -exdir ${EX_SUBDIR} ${DOC2TEX_EXAMPLE_EXCLUSIONS}
-+TAG =
-+PL2DOC = ${PERL} ./pl2doc.pl ${TAG} -db ${CHKSUM_DB}
-
- # t2h stuff
- TMP_DIR = @TMP_DIR@
-diff --git a/doc/doc2tex.pl b/doc/doc2tex.pl
-index 3254be2..12a3382 100755
---- a/doc/doc2tex.pl
-+++ b/doc/doc2tex.pl
-@@ -539,7 +539,7 @@ sub HandleRef
-
- sub HandleLib
- {
-- my($lib, $proc, $n_fun, $n_ex, $section, $tex_file);
-+ my($lib, $proc, $n_fun, $n_ex, $section, $tex_file, $tag);
-
- if (/^\@c\s*lib\s+([^\.]+)\.lib(.*)/)
- {
-@@ -552,6 +552,14 @@ sub HandleLib
- print TEX $_;
- return;
- }
-+ if (/tag:(\w+)/)
-+ {
-+ $tag = "TAG='-tag ".$1."'";
-+ }
-+ else
-+ {
-+ $tag = '';
-+ }
-
- $proc = $1 if (/^:(.*?) /);
- $n_fun = 1 if ($no_fun || /no_fun/);
-@@ -574,7 +582,7 @@ sub HandleLib
- if ($make)
- {
- print "<lib $lib " if ($verbose);
-- System("$make $make_opts VERBOSE=$verbose $tex_file");
-+ System("$make $make_opts $tag VERBOSE=$verbose $tex_file");
- }
-
- # make sure file exists
-diff --git a/doc/examples.doc b/doc/examples.doc
-index 613f4b4..637c421 100644
---- a/doc/examples.doc
-+++ b/doc/examples.doc
-@@ -787,7 +787,7 @@ which allows ignoring all but the first j entries of vectors when
- forming the pairs in the standard basis computation.
-
- @smallexample
-- at c example
-+ at c example tag:dynlib
- ring r=0,(x,y),dp;
- module mo=[x^2-y^2,1,0,0],[xy+y^2,0,1,0],[y^2,0,0,1];
- print(mo);
-diff --git a/doc/pl2doc.pl b/doc/pl2doc.pl
-index 1c28af0..cc3a5a2 100755
---- a/doc/pl2doc.pl
-+++ b/doc/pl2doc.pl
-@@ -20,6 +20,7 @@ while (@ARGV && $ARGV[0] =~ /^-/)
- $_ = shift(@ARGV);
- if (/^-o$/) { $out_file = shift(@ARGV); next;}
- if (/^-db$/) { $db_file = shift(@ARGV); next;}
-+ if (/^-tag$/) { $tag = $tag . " tag:" . shift(@ARGV); next;}
- if (/^-no_fun$/) { $no_fun = 1;next;}
- if (/^-doc$/) { $doc = 1; next;}
- if (/^-h(elp)?$/) { print $Usage; exit;}
-@@ -120,7 +121,7 @@ unless ($no_fun)
- ($ex = &CleanUpExample($lib, $example{$procs[$i]})))
- {
- print LDOC "\@strong{Example:}\n";
-- print LDOC "\@smallexample\n\@c example\n";
-+ print LDOC "\@smallexample\n\@c example$tag\n";
- print LDOC $ex;
- print LDOC "\n\@c example\n\@end smallexample\n";
- }
-diff --git a/doc/singular.doc b/doc/singular.doc
-index ca3274d..c14fa5d 100644
---- a/doc/singular.doc
-+++ b/doc/singular.doc
-@@ -442,7 +442,7 @@ LIB "all.lib";
- @c ---------------------------------------------------------
- @node normaliz_lib, pointid_lib, normal_lib, Commutative algebra
- @subsection normaliz_lib
-- at c lib normaliz.lib
-+ at c lib normaliz.lib tag:normaliz
- @c ----------------------------------------------------------
- @node pointid_lib, primdec_lib, normaliz_lib, Commutative algebra
- @subsection pointid_lib
-@@ -474,7 +474,7 @@ LIB "all.lib";
- @c ---------------------------------------------------------
- @node sing4ti2_lib, toric_lib, sagbi_lib, Commutative algebra
- @subsection sing4ti2_lib
-- at c lib sing4ti2.lib
-+ at c lib sing4ti2.lib tag:sing4ti2
- @c ---------------------------------------------------------
- @node toric_lib, , sing4ti2_lib, Commutative algebra
- @subsection toric_lib
-@@ -531,7 +531,7 @@ iniD, reslist, sumlist, dividelist, createlist
- @c ---------------------------------------------------------
- @node sheafcoh_lib, ,reszeta_lib, Algebraic geometry
- @subsection sheafcoh_lib
-- at c lib sheafcoh.lib
-+ at c lib sheafcoh.lib tag:memory
- @c ----------------------------------------------------------------------------
- @node Singularities, Invariant theory, Algebraic geometry, SINGULAR libraries
- @section Singularities
diff --git a/debian/patches/0004-mark-hidden-sub-makes-in-doc.patch b/debian/patches/0004-mark-hidden-sub-makes-in-doc.patch
deleted file mode 100644
index 66d6ea7..0000000
--- a/debian/patches/0004-mark-hidden-sub-makes-in-doc.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From c18431b10fd3f10073a635367ee753ffb7cfc8c8 Mon Sep 17 00:00:00 2001
-From: "Bernhard R. Link" <brlink at debian.org>
-Date: Sat, 3 Mar 2012 10:24:38 +0100
-Subject: mark hidden sub makes in doc
-
-Add a + before commands invoking sub makes in doc/Makefile.in to
-avoid jobserver warnings.
-
-Bug: http://www.singular.uni-kl.de:8002/trac/ticket/410
-Applied-Upstream: https://github.com/Singular/Sources/commit/872f462d48b65926858bc2ef7f710304d026a619
----
- doc/Makefile.in | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/doc/Makefile.in b/doc/Makefile.in
-index 7482778..fd033da 100644
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -185,17 +185,17 @@ usercard.ps: usercard.dvi
- # texinfo targets
- #
- manual.tex: ${MANUAL_FILES} doc2tex.pl ${SINGULAR} singular.doc $(STANDALONE_TEXI_FILES)
-- ${DOC2TEX} -no_fun -o manual.tex singular.doc
-+ +${DOC2TEX} -no_fun -o manual.tex singular.doc
-
- singular.tex: ${MANUAL_FILES} doc2tex.pl ${LIB_TEX_FILES} ${SINGULAR} ${LIBPARSE} singular.doc $(STANDALONE_TEXI_FILES)
-- ${DOC2TEX} -o singular.tex singular.doc
-+ +${DOC2TEX} -o singular.tex singular.doc
-
- #pattern rule for tex files
- %_noEx.tex : %.doc doc2tex.pl ${SINGULAR}
-- ${DOC2TEX} -o $@ -no_ex $<
-+ +${DOC2TEX} -o $@ -no_ex $<
-
- %.tex: %.doc doc2tex.pl ${SINGULAR}
-- ${DOC2TEX} -o $@ $<
-+ +${DOC2TEX} -o $@ $<
-
- # pattern rules for lib docus
- ${DOC_SUBDIR}/%_lib.pl : ${SINGULAR_LIB_DIR}/%.lib ${LIBPARSE}
diff --git a/debian/patches/0008-miscellaneous-Makefile.in-patches.patch b/debian/patches/0004-miscellaneous-Makefile.in-patches.patch
similarity index 76%
rename from debian/patches/0008-miscellaneous-Makefile.in-patches.patch
rename to debian/patches/0004-miscellaneous-Makefile.in-patches.patch
index 73e0cb6..9a6b535 100644
--- a/debian/patches/0008-miscellaneous-Makefile.in-patches.patch
+++ b/debian/patches/0004-miscellaneous-Makefile.in-patches.patch
@@ -1,4 +1,4 @@
-From 447ea0352f53599efe33bf3e104758caf7925b05 Mon Sep 17 00:00:00 2001
+From 94e0ec4226ea3d90888384d62e52bd3cba253894 Mon Sep 17 00:00:00 2001
From: Felix Salfelder <felix at salfelder.org>
Date: Thu, 16 Feb 2012 12:37:00 +0100
Subject: miscellaneous Makefile.in patches
@@ -7,16 +7,15 @@ Subject: miscellaneous Makefile.in patches
- repair default and install targets
- remove dependency on mod2.h in kernel. "make depend" works fine
---
- Singular/Makefile.in | 46 +++++++++++++++++++++++++++++-----------------
- emacs/Makefile.in | 5 ++++-
- factory/GNUmakefile.in | 18 ++++++++++--------
- kernel/Makefile.in | 10 +++++-----
- libfac/Makefile.in | 24 ++++++++++++------------
- omalloc/Makefile.in | 6 +++---
- 6 files changed, 63 insertions(+), 46 deletions(-)
+ Singular/Makefile.in | 48 ++++++++++++++++++++++++++++++------------------
+ emacs/Makefile.in | 5 ++++-
+ factory/GNUmakefile.in | 18 ++++++++++--------
+ kernel/Makefile.in | 10 +++++-----
+ omalloc/Makefile.in | 6 +++---
+ 5 files changed, 52 insertions(+), 35 deletions(-)
diff --git a/Singular/Makefile.in b/Singular/Makefile.in
-index 8f004e6..55b13f11 100644
+index 3e02df1..3275701 100644
--- a/Singular/Makefile.in
+++ b/Singular/Makefile.in
@@ -85,7 +85,7 @@ endif
@@ -76,8 +75,8 @@ index 8f004e6..55b13f11 100644
+ touch $@
- svnver:
-@@ -472,17 +477,17 @@ TSingular: mod2.h feOpt.cc version.h emacs.cc \
+ version.h: ${SOURCES} ${HEADERS} Makefile.in mod2.h.in \
+@@ -468,17 +473,17 @@ TSingular: mod2.h feOpt.cc version.h emacs.cc \
feOpt.o: feOpt.inc feOptES.inc feOptTS.inc
extra.o: feOpt.inc
@@ -98,7 +97,7 @@ index 8f004e6..55b13f11 100644
$(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX -DTSINGULAR -I../kernel feOpt.cc -o feOptTS
./feOptTS
rm -f feOptTS feOptTS.exe
-@@ -553,11 +558,11 @@ endif
+@@ -549,11 +554,11 @@ endif
##
## install targets
##
@@ -112,7 +111,7 @@ index 8f004e6..55b13f11 100644
installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
${MKINSTALLDIRS} $(DESTDIR)${bindir}
-@@ -565,6 +570,12 @@ installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
+@@ -561,6 +566,12 @@ installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
-for file in *.so; do \
${INSTALL_PROGRAM} $$file $(DESTDIR)${bindir}; \
done
@@ -125,7 +124,7 @@ index 8f004e6..55b13f11 100644
${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} $(DESTDIR)${bindir}
${INSTALL_PROGRAM} ESingular TSingular $(DESTDIR)${bindir}
${INSTALL_PROGRAM} surfex $(DESTDIR)${bindir}
-@@ -575,10 +586,10 @@ installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
+@@ -571,10 +582,10 @@ installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
installbin-nolns: installbin
${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${install_bindir}/Singular${EXEC_EXT};
@@ -138,7 +137,16 @@ index 8f004e6..55b13f11 100644
${MKINSTALLDIRS} $(DESTDIR)${slibdir}
for file in `pwd`/LIB/*.lib; do \
${INSTALL_DATA} $$file $(DESTDIR)${slibdir}; \
-@@ -611,11 +622,12 @@ uninstallbin:
+@@ -584,7 +595,7 @@ installslib-nolns: LIB
+ ${INSTALL_DATA} $$file $(DESTDIR)${slibdir}; \
+ done
+
+-install-libsingular: libsingular installslib-nolns
++install-libsingular: libsingular installslib
+ ${MKINSTALLDIRS} $(DESTDIR)${includedir}/singular
+ for file in *.$(SO_SUFFIX); do \
+ ${INSTALL_PROGRAM} $$file $(DESTDIR)${libdir}; \
+@@ -607,11 +618,12 @@ uninstallbin:
mostlyclean:
-rm -f Singular Singular-static Singularg Singularp libparse feOpt*.inc
-rm -f *.o *.og core *.op *.so* *.dl_o*
@@ -171,13 +179,13 @@ index 86ba445..47c57e1 100644
${MKINSTALLDIRS} ${emacsdir}
${INSTALL_DATA} cmd-cmpl.el ${emacsdir}
diff --git a/factory/GNUmakefile.in b/factory/GNUmakefile.in
-index 1e8d80d..c80d6e1 100644
+index 85d866b..ad740c9 100644
--- a/factory/GNUmakefile.in
+++ b/factory/GNUmakefile.in
-@@ -455,24 +455,24 @@ distfiles := \
+@@ -384,24 +384,24 @@ distfiles := \
#
- # how to create library objets
+ # how to create library objects
-%.o: %.cc config.h factoryconf.h
+%.o: %.cc config.h |factoryconf.h
$(CXX) -c $< $(LIBCXXFLAGS) -o $@
@@ -204,7 +212,7 @@ index 1e8d80d..c80d6e1 100644
echo $*.d "\\" > $@
$(CXX) -MM $< $(DEPCXXFLAGS) >> $@
%.dtmp: %.template
-@@ -783,8 +783,10 @@ $(srcdir)/configure: configure.in
+@@ -681,8 +681,10 @@ $(srcdir)/configure: configure.in
# seems gmake needs at least a trivial command. otherwise all
# files which depend on config.h will be remade even if congig.h
# did not change.
@@ -217,17 +225,17 @@ index 1e8d80d..c80d6e1 100644
stamp-h: config.h.in config.status
CONFIG_FILES= CONFIG_HEADERS=config.h ./config.status
-@@ -800,7 +802,7 @@ config.status: configure
+@@ -695,7 +697,7 @@ config.status: configure
./config.status --recheck
# create cf_gmp.h
-cf_gmp.h: GNUmakefile gen_cf_gmp.template
+cf_gmp.h: gen_cf_gmp.template
echo "#!/bin/sh" >gen_cf_gmp.sh
- echo "GMP_H_T=\"`g++ $(LIBCXXFLAGS) -M gen_cf_gmp.cc|grep gmp.h` \"" >>gen_cf_gmp.sh
+ echo "GMP_H_T=\"`$(CXX) $(LIBCXXFLAGS) -M gen_cf_gmp.cc|grep gmp.h` \"" >>gen_cf_gmp.sh
cat gen_cf_gmp.template >>gen_cf_gmp.sh
diff --git a/kernel/Makefile.in b/kernel/Makefile.in
-index 7b8b77b..33fb6d9 100644
+index 6f58083..78d2b07 100644
--- a/kernel/Makefile.in
+++ b/kernel/Makefile.in
@@ -253,12 +253,12 @@ p_Procs_Dynamic.o p_Procs_Lib.o p_Procs_Dynamic.og p_Procs_Lib.og\
@@ -264,65 +272,8 @@ index 7b8b77b..33fb6d9 100644
cat *.d *.dd >depend
ifeq (depend,$(wildcard depend))
-diff --git a/libfac/Makefile.in b/libfac/Makefile.in
-index 62faadb..b16e306 100644
---- a/libfac/Makefile.in
-+++ b/libfac/Makefile.in
-@@ -86,40 +86,40 @@ all: OPTOBJ ${TARGETNAME} libsingfac_g.a
- OPTOBJ:
- ${MKINSTALLDIRS} OPTOBJ
-
--OPTOBJ/%.o: %.cc OPTOBJ
-+OPTOBJ/%.o: %.cc |OPTOBJ
- $(CXX) $(CXXFLAGS) $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
-
--OPTOBJ/%.o: charset/%.cc OPTOBJ
-+OPTOBJ/%.o: charset/%.cc |OPTOBJ
- $(CXX) $(CXXFLAGS) $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
-
--OPTOBJ/%.o: factor/%.cc OPTOBJ
-+OPTOBJ/%.o: factor/%.cc |OPTOBJ
- $(CXX) $(CXXFLAGS) $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
-
--OPTOBJ/tmpl_inst.o: factor/tmpl_inst.cc OPTOBJ
-+OPTOBJ/tmpl_inst.o: factor/tmpl_inst.cc
- $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
-
--OPTOBJ/%.op: %.cc OPTOBJ
-+OPTOBJ/%.op: %.cc |OPTOBJ
- $(CXX) -O -pg $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
-
--OPTOBJ/%.op: charset/%.cc OPTOBJ
-+OPTOBJ/%.op: charset/%.cc |OPTOBJ
- $(CXX) -O -pg $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
-
--OPTOBJ/%.op: factor/%.cc OPTOBJ
-+OPTOBJ/%.op: factor/%.cc |OPTOBJ
- $(CXX) -O -pg $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
-
--OPTOBJ/tmpl_inst.op: factor/tmpl_inst.cc OPTOBJ
-+OPTOBJ/tmpl_inst.op: factor/tmpl_inst.cc |OPTOBJ
- $(CXX) -O -pg $(CPPFLAGS) $(DEFS) -c $< -o $@
-
--OPTOBJ/%.og: %.cc OPTOBJ
-+OPTOBJ/%.og: %.cc |OPTOBJ
- $(CXX) -g $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
-
--OPTOBJ/%.og: charset/%.cc OPTOBJ
-+OPTOBJ/%.og: charset/%.cc |OPTOBJ
- $(CXX) -g $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
-
--OPTOBJ/%.og: factor/%.cc OPTOBJ
-+OPTOBJ/%.og: factor/%.cc |OPTOBJ
- $(CXX) -g $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
-
--OPTOBJ/tmpl_inst.og: factor/tmpl_inst.cc OPTOBJ
-+OPTOBJ/tmpl_inst.og: factor/tmpl_inst.cc |OPTOBJ
- $(CXX) -g $(CPPFLAGS) $(DEFS) -c $< -o $@
-
- libfac: OPTOBJ libfac.a
diff --git a/omalloc/Makefile.in b/omalloc/Makefile.in
-index 4956179..e3994b8 100644
+index 8661ca2..1dd2e36 100644
--- a/omalloc/Makefile.in
+++ b/omalloc/Makefile.in
@@ -180,9 +180,9 @@ configure: configure.in
diff --git a/debian/patches/0009-assert-needs-to-be-defined-after-include-assert.h.patch b/debian/patches/0005-assert-needs-to-be-defined-after-include-assert.h.patch
similarity index 66%
rename from debian/patches/0009-assert-needs-to-be-defined-after-include-assert.h.patch
rename to debian/patches/0005-assert-needs-to-be-defined-after-include-assert.h.patch
index fa4e9f5..be9bb8b 100644
--- a/debian/patches/0009-assert-needs-to-be-defined-after-include-assert.h.patch
+++ b/debian/patches/0005-assert-needs-to-be-defined-after-include-assert.h.patch
@@ -1,18 +1,18 @@
-From 3f3d1206dbe4338d751c4cea05db042945a622a3 Mon Sep 17 00:00:00 2001
+From 6f5575cb635bf80edef4add40147481d9784944b Mon Sep 17 00:00:00 2001
From: Felix Salfelder <felix at salfelder.org>
Date: Thu, 16 Feb 2012 11:23:11 +0100
-Subject: =?UTF-8?q?assert=20needs=20to=20be=20defined=20after=20#include=20"?=
- =?UTF-8?q?assert.h",=0Aalso=20if=20-Ifactory=20is=20used.?=
+Subject: =?UTF-8?q?assert=20needs=20to=20be=20defined=20after=20#include?=
+ =?UTF-8?q?=20"assert.h",=0Aalso=20if=20-Ifactory=20is=20used.?=
---
- factory/assert.h | 6 ++++++
+ factory/assert.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/factory/assert.h b/factory/assert.h
-index 5590bbc..098e8b8 100644
+index 3dd036b..d2933a1 100644
--- a/factory/assert.h
+++ b/factory/assert.h
-@@ -127,3 +127,9 @@ extern "C" {
+@@ -128,3 +128,9 @@ extern "C" {
#define PVIRT_CHARCC(msg) = 0
#endif /* NOASSERT */
/* }}} */
diff --git a/debian/patches/0010-keep-mod2.h-in-Singular.patch b/debian/patches/0006-keep-mod2.h-in-Singular.patch
similarity index 78%
rename from debian/patches/0010-keep-mod2.h-in-Singular.patch
rename to debian/patches/0006-keep-mod2.h-in-Singular.patch
index 332980d..f27f0a6 100644
--- a/debian/patches/0010-keep-mod2.h-in-Singular.patch
+++ b/debian/patches/0006-keep-mod2.h-in-Singular.patch
@@ -1,4 +1,4 @@
-From 2e1607c26618e7cac6be6bf48d866f23a40ff47f Mon Sep 17 00:00:00 2001
+From f56daa87a12ef6ae3e12bacf255b1e086dbc9cb3 Mon Sep 17 00:00:00 2001
From: Felix Salfelder <felix at salfelder.org>
Date: Wed, 22 Feb 2012 11:18:38 +0100
Subject: keep mod2.h in Singular/
@@ -6,193 +6,193 @@ Subject: keep mod2.h in Singular/
don't copy mod2.h generated in Singular/ to kernel/
to avoid time stamp issues
---
- Singular/Makefile.in | 2 +-
- Singular/Minor.cc | 2 +-
- Singular/MinorInterface.cc | 2 +-
- Singular/MinorProcessor.cc | 2 +-
- Singular/attrib.cc | 2 +-
- Singular/calcSVD.cc | 2 +-
- Singular/claptmpl.cc | 2 +-
- Singular/cntrlc.cc | 2 +-
- Singular/configure | 1 -
- Singular/configure.in | 1 -
- Singular/eigenval_ip.cc | 2 +-
- Singular/emacs.cc | 2 +-
- Singular/extra.cc | 2 +-
- Singular/feOpt.cc | 2 +-
- Singular/fehelp.cc | 2 +-
- Singular/fglm.cc | 2 +-
- Singular/gms.cc | 2 +-
- Singular/grammar.cc | 2 +-
- Singular/grammar.y | 2 +-
- Singular/interpolation.cc | 2 +-
- Singular/iparith.cc | 2 +-
- Singular/ipassign.cc | 2 +-
- Singular/ipconv.cc | 2 +-
- Singular/ipid.cc | 2 +-
- Singular/iplib.cc | 2 +-
- Singular/ipprint.cc | 2 +-
- Singular/ipshell.cc | 2 +-
- Singular/janet.cc | 2 +-
- Singular/libparse.l | 2 +-
- Singular/lists.cc | 2 +-
- Singular/maps_ip.cc | 2 +-
- Singular/minpoly.cc | 2 +-
- Singular/misc_ip.cc | 2 +-
- Singular/mpsr_Error.cc | 2 +-
- Singular/mpsr_Get.cc | 2 +-
- Singular/mpsr_GetMisc.cc | 2 +-
- Singular/mpsr_GetPoly.cc | 2 +-
- Singular/mpsr_Put.cc | 2 +-
- Singular/mpsr_PutPoly.cc | 2 +-
- Singular/mpsr_Tok.cc | 2 +-
- Singular/mpsr_sl.cc | 2 +-
- Singular/ndbm.cc | 2 +-
- Singular/pcv.cc | 2 +-
- Singular/pipeLink.cc | 2 +-
- Singular/scanner.cc | 2 +-
- Singular/scanner.l | 2 +-
- Singular/sdb.cc | 2 +-
- Singular/silink.cc | 2 +-
- Singular/sing_dbm.cc | 2 +-
- Singular/sing_win.cc | 2 +-
- Singular/slInit_Dynamic.cc | 2 +-
- Singular/slInit_Static.cc | 2 +-
- Singular/ssiLink.cc | 2 +-
- Singular/subexpr.cc | 2 +-
- Singular/tesths.cc | 2 +-
- Singular/walk.cc | 2 +-
- Singular/walk_ip.cc | 2 +-
- Singular/wrapper.cc | 2 +-
- kernel/F4.cc | 2 +-
- kernel/F5cData.cc | 2 +-
- kernel/F5cLists.cc | 2 +-
- kernel/GMPrat.cc | 2 +-
- kernel/Number.h | 2 +-
- kernel/Poly.h | 2 +-
- kernel/PowerSeries.h | 2 +-
- kernel/clapconv.cc | 2 +-
- kernel/clapsing.cc | 2 +-
- kernel/dError.c | 2 +-
- kernel/digitech.cc | 2 +-
- kernel/digitech.h | 2 +-
- kernel/eigenval.cc | 2 +-
- kernel/f5c.cc | 2 +-
- kernel/f5data.cc | 2 +-
- kernel/f5gb.cc | 2 +-
- kernel/f5lists.cc | 2 +-
- kernel/fast_maps.cc | 2 +-
- kernel/fast_mult.cc | 2 +-
- kernel/fast_mult.h | 2 +-
- kernel/feResource.cc | 2 +-
- kernel/febase.cc | 2 +-
- kernel/fegetopt.c | 2 +-
- kernel/feread.cc | 2 +-
- kernel/fereadl.c | 2 +-
- kernel/ffields.cc | 2 +-
- kernel/fglmcomb.cc | 2 +-
- kernel/fglmgauss.cc | 2 +-
- kernel/fglmhom.cc | 2 +-
- kernel/fglmvec.cc | 2 +-
- kernel/fglmzero.cc | 2 +-
- kernel/gfan.cc | 2 +-
- kernel/gnumpc.cc | 2 +-
- kernel/gnumpfl.cc | 2 +-
- kernel/gr_kstd2.cc | 2 +-
- kernel/gring.cc | 2 +-
- kernel/hdegree.cc | 2 +-
- kernel/hilb.cc | 2 +-
- kernel/hutil.cc | 2 +-
- kernel/ideals.cc | 2 +-
- kernel/int64vec.cc | 2 +-
- kernel/intvec.cc | 2 +-
- kernel/kbuckets.cc | 2 +-
- kernel/khstd.cc | 2 +-
- kernel/kspoly.cc | 2 +-
- kernel/kstd1.cc | 2 +-
- kernel/kstd2.cc | 2 +-
- kernel/kstdfac.cc | 2 +-
- kernel/kutil.cc | 2 +-
- kernel/linearAlgebra.cc | 2 +-
- kernel/longalg.cc | 2 +-
- kernel/longrat.cc | 2 +-
- kernel/longrat0.cc | 2 +-
- kernel/longtrans.cc | 2 +-
- kernel/lplist.cc | 2 +-
- kernel/maps.cc | 2 +-
- kernel/matpol.cc | 2 +-
- kernel/misc.cc | 2 +-
- kernel/mmalloc.cc | 2 +-
- kernel/mmstd.c | 2 +-
- kernel/mod_raw.cc | 2 +-
- kernel/modulop.cc | 2 +-
- kernel/mpr_base.cc | 2 +-
- kernel/mpr_complex.cc | 2 +-
- kernel/mpr_inout.cc | 2 +-
- kernel/mpr_numeric.cc | 2 +-
- kernel/multicnt.cc | 2 +-
- kernel/ncSACache.cc | 2 +-
- kernel/ncSAFormula.cc | 2 +-
- kernel/ncSAMult.cc | 2 +-
- kernel/npolygon.cc | 2 +-
- kernel/numbers.cc | 2 +-
- kernel/pDebug.cc | 2 +-
- kernel/pInline0.cc | 2 +-
- kernel/pInline1.cc | 2 +-
- kernel/pInline2.cc | 2 +-
- kernel/pShallowCopyDelete.cc | 2 +-
- kernel/p_Mult_q.cc | 2 +-
- kernel/p_Mult_q.h | 2 +-
- kernel/p_Procs_Dynamic.cc | 2 +-
- kernel/p_Procs_Generate.cc | 2 +-
- kernel/p_Procs_Lib.cc | 2 +-
- kernel/p_Procs_Static.cc | 2 +-
- kernel/p_polys.cc | 2 +-
- kernel/page.c | 2 +-
- kernel/polys-impl.cc | 2 +-
- kernel/polys.cc | 2 +-
- kernel/polys0.cc | 2 +-
- kernel/polys1.cc | 2 +-
- kernel/prCopy.cc | 2 +-
- kernel/ratgring.cc | 2 +-
- kernel/ring.cc | 2 +-
- kernel/ringgb.cc | 2 +-
- kernel/ringgb.h | 2 +-
- kernel/rintegers.cc | 2 +-
- kernel/rmodulo2m.cc | 2 +-
- kernel/rmodulon.cc | 2 +-
- kernel/sbuckets.cc | 2 +-
- kernel/sca.cc | 2 +-
- kernel/semic.cc | 2 +-
- kernel/shiftgb.cc | 2 +-
- kernel/shortfl.cc | 2 +-
- kernel/sparsmat.cc | 2 +-
- kernel/spectrum.cc | 2 +-
- kernel/splist.cc | 2 +-
- kernel/summator.cc | 2 +-
- kernel/syz.cc | 2 +-
- kernel/syz0.cc | 2 +-
- kernel/syz1.cc | 2 +-
- kernel/syz2.cc | 2 +-
- kernel/syz3.cc | 2 +-
- kernel/tgb.cc | 2 +-
- kernel/tgbgauss.cc | 2 +-
- kernel/tgbgauss.h | 2 +-
- kernel/timer.cc | 2 +-
- kernel/tmult.cc | 2 +-
- kernel/units.cc | 2 +-
- kernel/walkMain.cc | 2 +-
- kernel/walkProc.cc | 2 +-
- kernel/walkSupport.cc | 2 +-
- kernel/weight.cc | 2 +-
- kernel/weight0.c | 2 +-
+ Singular/Makefile.in | 2 +-
+ Singular/Minor.cc | 2 +-
+ Singular/MinorInterface.cc | 2 +-
+ Singular/MinorProcessor.cc | 2 +-
+ Singular/attrib.cc | 2 +-
+ Singular/calcSVD.cc | 2 +-
+ Singular/claptmpl.cc | 2 +-
+ Singular/cntrlc.cc | 2 +-
+ Singular/configure | 1 -
+ Singular/configure.in | 1 -
+ Singular/eigenval_ip.cc | 2 +-
+ Singular/emacs.cc | 2 +-
+ Singular/extra.cc | 2 +-
+ Singular/feOpt.cc | 2 +-
+ Singular/fehelp.cc | 2 +-
+ Singular/fglm.cc | 2 +-
+ Singular/gms.cc | 2 +-
+ Singular/grammar.cc | 2 +-
+ Singular/grammar.y | 2 +-
+ Singular/interpolation.cc | 2 +-
+ Singular/iparith.cc | 2 +-
+ Singular/ipassign.cc | 2 +-
+ Singular/ipconv.cc | 2 +-
+ Singular/ipid.cc | 2 +-
+ Singular/iplib.cc | 2 +-
+ Singular/ipprint.cc | 2 +-
+ Singular/ipshell.cc | 2 +-
+ Singular/janet.cc | 2 +-
+ Singular/libparse.l | 2 +-
+ Singular/lists.cc | 2 +-
+ Singular/maps_ip.cc | 2 +-
+ Singular/minpoly.cc | 2 +-
+ Singular/misc_ip.cc | 2 +-
+ Singular/mpsr_Error.cc | 2 +-
+ Singular/mpsr_Get.cc | 2 +-
+ Singular/mpsr_GetMisc.cc | 2 +-
+ Singular/mpsr_GetPoly.cc | 2 +-
+ Singular/mpsr_Put.cc | 2 +-
+ Singular/mpsr_PutPoly.cc | 2 +-
+ Singular/mpsr_Tok.cc | 2 +-
+ Singular/mpsr_sl.cc | 2 +-
+ Singular/ndbm.cc | 2 +-
+ Singular/pcv.cc | 2 +-
+ Singular/pipeLink.cc | 2 +-
+ Singular/scanner.cc | 2 +-
+ Singular/scanner.l | 2 +-
+ Singular/sdb.cc | 2 +-
+ Singular/silink.cc | 2 +-
+ Singular/sing_dbm.cc | 2 +-
+ Singular/sing_win.cc | 2 +-
+ Singular/slInit_Dynamic.cc | 2 +-
+ Singular/slInit_Static.cc | 2 +-
+ Singular/ssiLink.cc | 2 +-
+ Singular/subexpr.cc | 2 +-
+ Singular/tesths.cc | 2 +-
+ Singular/walk.cc | 2 +-
+ Singular/walk_ip.cc | 2 +-
+ Singular/wrapper.cc | 2 +-
+ kernel/F4.cc | 2 +-
+ kernel/F5cData.cc | 2 +-
+ kernel/F5cLists.cc | 2 +-
+ kernel/GMPrat.cc | 2 +-
+ kernel/Number.h | 2 +-
+ kernel/Poly.h | 2 +-
+ kernel/PowerSeries.h | 2 +-
+ kernel/clapconv.cc | 2 +-
+ kernel/clapsing.cc | 2 +-
+ kernel/dError.c | 2 +-
+ kernel/digitech.cc | 2 +-
+ kernel/digitech.h | 2 +-
+ kernel/eigenval.cc | 2 +-
+ kernel/f5c.cc | 2 +-
+ kernel/f5data.cc | 2 +-
+ kernel/f5gb.cc | 2 +-
+ kernel/f5lists.cc | 2 +-
+ kernel/fast_maps.cc | 2 +-
+ kernel/fast_mult.cc | 2 +-
+ kernel/fast_mult.h | 2 +-
+ kernel/feResource.cc | 2 +-
+ kernel/febase.cc | 2 +-
+ kernel/fegetopt.c | 2 +-
+ kernel/feread.cc | 2 +-
+ kernel/fereadl.c | 2 +-
+ kernel/ffields.cc | 2 +-
+ kernel/fglmcomb.cc | 2 +-
+ kernel/fglmgauss.cc | 2 +-
+ kernel/fglmhom.cc | 2 +-
+ kernel/fglmvec.cc | 2 +-
+ kernel/fglmzero.cc | 2 +-
+ kernel/gfan.cc | 2 +-
+ kernel/gnumpc.cc | 2 +-
+ kernel/gnumpfl.cc | 2 +-
+ kernel/gr_kstd2.cc | 2 +-
+ kernel/gring.cc | 2 +-
+ kernel/hdegree.cc | 2 +-
+ kernel/hilb.cc | 2 +-
+ kernel/hutil.cc | 2 +-
+ kernel/ideals.cc | 2 +-
+ kernel/int64vec.cc | 2 +-
+ kernel/intvec.cc | 2 +-
+ kernel/kbuckets.cc | 2 +-
+ kernel/khstd.cc | 2 +-
+ kernel/kspoly.cc | 2 +-
+ kernel/kstd1.cc | 2 +-
+ kernel/kstd2.cc | 2 +-
+ kernel/kstdfac.cc | 2 +-
+ kernel/kutil.cc | 2 +-
+ kernel/linearAlgebra.cc | 2 +-
+ kernel/longalg.cc | 2 +-
+ kernel/longrat.cc | 2 +-
+ kernel/longrat0.cc | 2 +-
+ kernel/longtrans.cc | 2 +-
+ kernel/lplist.cc | 2 +-
+ kernel/maps.cc | 2 +-
+ kernel/matpol.cc | 2 +-
+ kernel/misc.cc | 2 +-
+ kernel/mmalloc.cc | 2 +-
+ kernel/mmstd.c | 2 +-
+ kernel/mod_raw.cc | 2 +-
+ kernel/modulop.cc | 2 +-
+ kernel/mpr_base.cc | 2 +-
+ kernel/mpr_complex.cc | 2 +-
+ kernel/mpr_inout.cc | 2 +-
+ kernel/mpr_numeric.cc | 2 +-
+ kernel/multicnt.cc | 2 +-
+ kernel/ncSACache.cc | 2 +-
+ kernel/ncSAFormula.cc | 2 +-
+ kernel/ncSAMult.cc | 2 +-
+ kernel/npolygon.cc | 2 +-
+ kernel/numbers.cc | 2 +-
+ kernel/pDebug.cc | 2 +-
+ kernel/pInline0.cc | 2 +-
+ kernel/pInline1.cc | 2 +-
+ kernel/pInline2.cc | 2 +-
+ kernel/pShallowCopyDelete.cc | 2 +-
+ kernel/p_Mult_q.cc | 2 +-
+ kernel/p_Mult_q.h | 2 +-
+ kernel/p_Procs_Dynamic.cc | 2 +-
+ kernel/p_Procs_Generate.cc | 2 +-
+ kernel/p_Procs_Lib.cc | 2 +-
+ kernel/p_Procs_Static.cc | 2 +-
+ kernel/p_polys.cc | 2 +-
+ kernel/page.c | 2 +-
+ kernel/polys-impl.cc | 2 +-
+ kernel/polys.cc | 2 +-
+ kernel/polys0.cc | 2 +-
+ kernel/polys1.cc | 2 +-
+ kernel/prCopy.cc | 2 +-
+ kernel/ratgring.cc | 2 +-
+ kernel/ring.cc | 2 +-
+ kernel/ringgb.cc | 2 +-
+ kernel/ringgb.h | 2 +-
+ kernel/rintegers.cc | 2 +-
+ kernel/rmodulo2m.cc | 2 +-
+ kernel/rmodulon.cc | 2 +-
+ kernel/sbuckets.cc | 2 +-
+ kernel/sca.cc | 2 +-
+ kernel/semic.cc | 2 +-
+ kernel/shiftgb.cc | 2 +-
+ kernel/shortfl.cc | 2 +-
+ kernel/sparsmat.cc | 2 +-
+ kernel/spectrum.cc | 2 +-
+ kernel/splist.cc | 2 +-
+ kernel/summator.cc | 2 +-
+ kernel/syz.cc | 2 +-
+ kernel/syz0.cc | 2 +-
+ kernel/syz1.cc | 2 +-
+ kernel/syz2.cc | 2 +-
+ kernel/syz3.cc | 2 +-
+ kernel/tgb.cc | 2 +-
+ kernel/tgbgauss.cc | 2 +-
+ kernel/tgbgauss.h | 2 +-
+ kernel/timer.cc | 2 +-
+ kernel/tmult.cc | 2 +-
+ kernel/units.cc | 2 +-
+ kernel/walkMain.cc | 2 +-
+ kernel/walkProc.cc | 2 +-
+ kernel/walkSupport.cc | 2 +-
+ kernel/weight.cc | 2 +-
+ kernel/weight0.c | 2 +-
180 files changed, 178 insertions(+), 180 deletions(-)
diff --git a/Singular/Makefile.in b/Singular/Makefile.in
-index 55b13f11..890b347 100644
+index 3275701..f1b93ae 100644
--- a/Singular/Makefile.in
+++ b/Singular/Makefile.in
-@@ -605,7 +605,7 @@ install-libsingular: libsingular
+@@ -601,7 +601,7 @@ install-libsingular: libsingular installslib
${INSTALL_PROGRAM} $$file $(DESTDIR)${libdir}; \
done
${INSTALL_PROGRAM} libsingular.h $(DESTDIR)${includedir}
@@ -212,7 +212,7 @@ index 402d7e6..4e358c5 100644
#include <kernel/polys.h>
#include <Minor.h>
diff --git a/Singular/MinorInterface.cc b/Singular/MinorInterface.cc
-index 50ceae8..8d2a1c4 100644
+index c79f694..508f979 100644
--- a/Singular/MinorInterface.cc
+++ b/Singular/MinorInterface.cc
@@ -1,4 +1,4 @@
@@ -232,10 +232,10 @@ index 1c08156..6ff81aa 100644
#include <kernel/polys.h>
#include <MinorProcessor.h>
diff --git a/Singular/attrib.cc b/Singular/attrib.cc
-index 570f4e2..8d9e38b 100644
+index 1f016ef..bbef31e 100644
--- a/Singular/attrib.cc
+++ b/Singular/attrib.cc
-@@ -13,7 +13,7 @@
+@@ -12,7 +12,7 @@
#include <ctype.h>
#include <unistd.h>
@@ -256,10 +256,10 @@ index bf80b3c..1e889dd 100644
#ifdef HAVE_SVD
diff --git a/Singular/claptmpl.cc b/Singular/claptmpl.cc
-index 1038422..6b33638 100644
+index 0fa6109..512b353 100644
--- a/Singular/claptmpl.cc
+++ b/Singular/claptmpl.cc
-@@ -7,7 +7,7 @@
+@@ -6,7 +6,7 @@
* ABSTRACT - instantiation of all templates
*/
@@ -269,10 +269,10 @@ index 1038422..6b33638 100644
//using namespace std;
#ifdef HAVE_FACTORY
diff --git a/Singular/cntrlc.cc b/Singular/cntrlc.cc
-index c327a19..5d0a81f 100644
+index 374d05b..ed1a67e 100644
--- a/Singular/cntrlc.cc
+++ b/Singular/cntrlc.cc
-@@ -17,7 +17,7 @@
+@@ -16,7 +16,7 @@
#include <signal.h>
#include <sys/types.h>
#include <sys/wait.h>
@@ -282,32 +282,29 @@ index c327a19..5d0a81f 100644
#include <Singular/tok.h>
#include <Singular/ipshell.h>
diff --git a/Singular/configure b/Singular/configure
-index 6615b4a..a173565 100755
+index adc70b4..3a3b6a5 100755
--- a/Singular/configure
+++ b/Singular/configure
-@@ -6343,7 +6343,6 @@ cat >> $CONFIG_STATUS <<EOF
- EOF
- cat >> $CONFIG_STATUS <<\EOF
- \
-- cp mod2.h ../kernel/mod2.h; \
- if test "$CONFIG_HEADERS"; then echo timestamp > stamp-h; fi
- exit 0
- EOF
+@@ -10416,4 +10416,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
+-
diff --git a/Singular/configure.in b/Singular/configure.in
-index 9442595..ac9aab5 100644
+index a230b0f..c190733 100644
--- a/Singular/configure.in
+++ b/Singular/configure.in
-@@ -1374,5 +1374,4 @@ if test "$ac_cv_singuname" = "ix86-Win"; then
+@@ -1505,5 +1505,4 @@ if test "$ac_cv_singuname" = "ix86-Win"; then
fi
AC_OUTPUT(${OUTPUT_MAKEFILES}, \
- cp mod2.h ../kernel/mod2.h; \
if test "$CONFIG_HEADERS"; then echo timestamp > stamp-h; fi)
diff --git a/Singular/eigenval_ip.cc b/Singular/eigenval_ip.cc
-index 8a69599..7ae982d 100644
+index 5f53709..b9f6030 100644
--- a/Singular/eigenval_ip.cc
+++ b/Singular/eigenval_ip.cc
-@@ -6,7 +6,7 @@
+@@ -5,7 +5,7 @@
* ABSTRACT: eigenvalues of constant square matrices
*/
@@ -317,10 +314,10 @@ index 8a69599..7ae982d 100644
#ifdef HAVE_EIGENVAL
diff --git a/Singular/emacs.cc b/Singular/emacs.cc
-index ced2f19..19e2f43 100644
+index 4c800d0..7ef7227 100644
--- a/Singular/emacs.cc
+++ b/Singular/emacs.cc
-@@ -18,7 +18,7 @@
+@@ -17,7 +17,7 @@
#ifdef ix86_Win
#include <windows.h>
#endif
@@ -330,7 +327,7 @@ index ced2f19..19e2f43 100644
#include <omalloc/omalloc.h>
diff --git a/Singular/extra.cc b/Singular/extra.cc
-index 9a8f021..47ec69b 100644
+index b984faf..cbceeb2 100644
--- a/Singular/extra.cc
+++ b/Singular/extra.cc
@@ -12,7 +12,7 @@
@@ -340,13 +337,13 @@ index 9a8f021..47ec69b 100644
-#include <kernel/mod2.h>
+#include <Singular/mod2.h>
#include <misc_ip.h>
-
- #ifdef TIME_WITH_SYS_TIME
+ #include <blackbox.h>
+ #include <newstruct.h>
diff --git a/Singular/feOpt.cc b/Singular/feOpt.cc
-index 2421ba0..17308fa 100644
+index 81fca1c..166eb2a 100644
--- a/Singular/feOpt.cc
+++ b/Singular/feOpt.cc
-@@ -8,7 +8,7 @@
+@@ -7,7 +7,7 @@
#include <string.h>
#include <stdlib.h>
@@ -356,10 +353,10 @@ index 2421ba0..17308fa 100644
#if !defined(GENERATE_OPTION_INDEX) && !defined(ESINGULAR) && !defined(TSINGULAR)
#include <kernel/options.h>
diff --git a/Singular/fehelp.cc b/Singular/fehelp.cc
-index 3c39bf9..305330a 100644
+index 106c7a5..310c44b 100644
--- a/Singular/fehelp.cc
+++ b/Singular/fehelp.cc
-@@ -13,7 +13,7 @@
+@@ -12,7 +12,7 @@
#include <stdlib.h>
#include <time.h>
@@ -369,10 +366,10 @@ index 3c39bf9..305330a 100644
#include <Singular/tok.h>
#include <omalloc/omalloc.h>
diff --git a/Singular/fglm.cc b/Singular/fglm.cc
-index 41b489b..71f4cb3 100644
+index cecd356..4c09f8f 100644
--- a/Singular/fglm.cc
+++ b/Singular/fglm.cc
-@@ -16,7 +16,7 @@
+@@ -15,7 +15,7 @@
* lying in a 0-dimensional ideal.
*/
@@ -382,10 +379,10 @@ index 41b489b..71f4cb3 100644
#ifdef HAVE_FACTORY
#include <Singular/tok.h>
diff --git a/Singular/gms.cc b/Singular/gms.cc
-index 7e7880e..1b19df4 100644
+index e204043..dc9060e 100644
--- a/Singular/gms.cc
+++ b/Singular/gms.cc
-@@ -6,7 +6,7 @@
+@@ -5,7 +5,7 @@
* ABSTRACT: Gauss-Manin system normal form
*/
@@ -395,10 +392,10 @@ index 7e7880e..1b19df4 100644
#ifdef HAVE_GMS
diff --git a/Singular/grammar.cc b/Singular/grammar.cc
-index 72ca79a..7caf741 100644
+index b8affd1..5e37495 100644
--- a/Singular/grammar.cc
+++ b/Singular/grammar.cc
-@@ -319,7 +319,7 @@
+@@ -76,7 +76,7 @@
#include <stdarg.h>
#include <string.h>
@@ -408,7 +405,7 @@ index 72ca79a..7caf741 100644
#include <omalloc/omalloc.h>
#include <Singular/tok.h>
diff --git a/Singular/grammar.y b/Singular/grammar.y
-index e3cfc5b..afc979a 100644
+index 0ef2c4d..f3da01b 100644
--- a/Singular/grammar.y
+++ b/Singular/grammar.y
@@ -12,7 +12,7 @@
@@ -421,12 +418,12 @@ index e3cfc5b..afc979a 100644
#include <omalloc/omalloc.h>
#include <Singular/tok.h>
diff --git a/Singular/interpolation.cc b/Singular/interpolation.cc
-index c93edd7..5716d4a 100644
+index 03d5459..da89864 100644
--- a/Singular/interpolation.cc
+++ b/Singular/interpolation.cc
-@@ -3,7 +3,7 @@
+@@ -2,7 +2,7 @@
+ * Computer Algebra System SINGULAR *
****************************************/
- /* $Id: interpolation.cc 14320 2011-07-04 14:48:27Z hannes $ */
-#include <kernel/mod2.h>
+#include <Singular/mod2.h>
@@ -434,7 +431,7 @@ index c93edd7..5716d4a 100644
#include <kernel/febase.h>
#include <kernel/ideals.h>
diff --git a/Singular/iparith.cc b/Singular/iparith.cc
-index 884d724..fd51f29 100644
+index 92b5c15..c728f36 100644
--- a/Singular/iparith.cc
+++ b/Singular/iparith.cc
@@ -12,7 +12,7 @@
@@ -447,10 +444,10 @@ index 884d724..fd51f29 100644
#include <kernel/options.h>
#include <Singular/ipid.h>
diff --git a/Singular/ipassign.cc b/Singular/ipassign.cc
-index 76d25d3..9a0b0ac 100644
+index 34ea0da..266f22b 100644
--- a/Singular/ipassign.cc
+++ b/Singular/ipassign.cc
-@@ -12,7 +12,7 @@
+@@ -11,7 +11,7 @@
#include <string.h>
#include <ctype.h>
@@ -460,10 +457,10 @@ index 76d25d3..9a0b0ac 100644
#include <kernel/options.h>
#include <Singular/ipid.h>
diff --git a/Singular/ipconv.cc b/Singular/ipconv.cc
-index 202ddf1..0c8e1b5 100644
+index a9a7696..431141d 100644
--- a/Singular/ipconv.cc
+++ b/Singular/ipconv.cc
-@@ -6,7 +6,7 @@
+@@ -5,7 +5,7 @@
* ABSTRACT: automatic type conversions
*/
@@ -471,9 +468,9 @@ index 202ddf1..0c8e1b5 100644
+#include <Singular/mod2.h>
#include <Singular/tok.h>
#include <Singular/ipid.h>
- #include <kernel/intvec.h>
+ #include <kernel/bigintmat.h>
diff --git a/Singular/ipid.cc b/Singular/ipid.cc
-index a989211..c36198c 100644
+index 175f2b7..71cc0fe 100644
--- a/Singular/ipid.cc
+++ b/Singular/ipid.cc
@@ -7,7 +7,7 @@
@@ -486,7 +483,7 @@ index a989211..c36198c 100644
#include <omalloc/omalloc.h>
#include <Singular/tok.h>
diff --git a/Singular/iplib.cc b/Singular/iplib.cc
-index bccbc4c..821e92a 100644
+index e22af65..569961d 100644
--- a/Singular/iplib.cc
+++ b/Singular/iplib.cc
@@ -11,7 +11,7 @@
@@ -499,10 +496,10 @@ index bccbc4c..821e92a 100644
#include <Singular/tok.h>
#include <kernel/options.h>
diff --git a/Singular/ipprint.cc b/Singular/ipprint.cc
-index 6adf3a1..16a05d8 100644
+index ede2210..d8f3916 100644
--- a/Singular/ipprint.cc
+++ b/Singular/ipprint.cc
-@@ -6,7 +6,7 @@
+@@ -5,7 +5,7 @@
* ABSTRACT: interpreter: printing
*/
@@ -512,7 +509,7 @@ index 6adf3a1..16a05d8 100644
#include <Singular/ipid.h>
#include <omalloc/omalloc.h>
diff --git a/Singular/ipshell.cc b/Singular/ipshell.cc
-index c4553fc..2aec463 100644
+index b716caa..6d0a25d 100644
--- a/Singular/ipshell.cc
+++ b/Singular/ipshell.cc
@@ -11,7 +11,7 @@
@@ -538,10 +535,10 @@ index d381a46..a0d24ba 100755
#include <kernel/polys.h>
#include <kernel/numbers.h>
diff --git a/Singular/libparse.l b/Singular/libparse.l
-index c69af26..c85079b 100644
+index 645fdae..f05b329 100644
--- a/Singular/libparse.l
+++ b/Singular/libparse.l
-@@ -7,7 +7,7 @@
+@@ -6,7 +6,7 @@
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
@@ -551,10 +548,10 @@ index c69af26..c85079b 100644
#include <Singular/utils.h>
#define HAVE_LIBPARSER
diff --git a/Singular/lists.cc b/Singular/lists.cc
-index d66f29d..d043fca 100644
+index 15daae1..d3fff37 100644
--- a/Singular/lists.cc
+++ b/Singular/lists.cc
-@@ -8,7 +8,7 @@
+@@ -7,7 +7,7 @@
// to produce a non-inline version from lists.h
#define LISTS_CC
@@ -564,10 +561,10 @@ index d66f29d..d043fca 100644
#include <kernel/febase.h>
//#include "ipid.h"
diff --git a/Singular/maps_ip.cc b/Singular/maps_ip.cc
-index c74e8fd..cf34eaa 100644
+index 9fe8339..b0670f8 100644
--- a/Singular/maps_ip.cc
+++ b/Singular/maps_ip.cc
-@@ -6,7 +6,7 @@
+@@ -5,7 +5,7 @@
* ABSTRACT - the mapping of polynomials to other rings
*/
@@ -577,10 +574,10 @@ index c74e8fd..cf34eaa 100644
#include <kernel/febase.h>
#include <kernel/polys.h>
diff --git a/Singular/minpoly.cc b/Singular/minpoly.cc
-index c081a54..8538700 100644
+index c319099..87bb58e 100644
--- a/Singular/minpoly.cc
+++ b/Singular/minpoly.cc
-@@ -5,7 +5,7 @@
+@@ -6,7 +6,7 @@
#include<cmath>
@@ -590,7 +587,7 @@ index c081a54..8538700 100644
#include "minpoly.h"
diff --git a/Singular/misc_ip.cc b/Singular/misc_ip.cc
-index 43c1629..99de664 100644
+index 343d5ff..ae207b4 100644
--- a/Singular/misc_ip.cc
+++ b/Singular/misc_ip.cc
@@ -14,7 +14,7 @@
@@ -603,10 +600,10 @@ index 43c1629..99de664 100644
#include <kernel/longrat.h>
#include <Singular/misc_ip.h>
diff --git a/Singular/mpsr_Error.cc b/Singular/mpsr_Error.cc
-index be4b923..0d1142f 100644
+index c189743..44a0b28 100644
--- a/Singular/mpsr_Error.cc
+++ b/Singular/mpsr_Error.cc
-@@ -12,7 +12,7 @@
+@@ -11,7 +11,7 @@
* Change History (most recent first):
*
***************************************************************/
@@ -616,10 +613,10 @@ index be4b923..0d1142f 100644
#ifdef HAVE_MPSR
diff --git a/Singular/mpsr_Get.cc b/Singular/mpsr_Get.cc
-index 6708165..e305e34 100644
+index c681b03..3fac95a 100644
--- a/Singular/mpsr_Get.cc
+++ b/Singular/mpsr_Get.cc
-@@ -13,7 +13,7 @@
+@@ -12,7 +12,7 @@
*
***************************************************************/
@@ -629,10 +626,10 @@ index 6708165..e305e34 100644
#ifdef HAVE_MPSR
diff --git a/Singular/mpsr_GetMisc.cc b/Singular/mpsr_GetMisc.cc
-index fda7ac3..457b01e 100644
+index 641b82f..58b536b 100644
--- a/Singular/mpsr_GetMisc.cc
+++ b/Singular/mpsr_GetMisc.cc
-@@ -13,7 +13,7 @@
+@@ -12,7 +12,7 @@
*
***************************************************************/
@@ -642,10 +639,10 @@ index fda7ac3..457b01e 100644
#ifdef HAVE_MPSR
diff --git a/Singular/mpsr_GetPoly.cc b/Singular/mpsr_GetPoly.cc
-index de57603..4d885ee 100644
+index 24bd201..88eef83 100644
--- a/Singular/mpsr_GetPoly.cc
+++ b/Singular/mpsr_GetPoly.cc
-@@ -12,7 +12,7 @@
+@@ -10,7 +10,7 @@
*
*
***************************************************************/
@@ -655,10 +652,10 @@ index de57603..4d885ee 100644
#ifdef HAVE_MPSR
#include "mylimits.h"
diff --git a/Singular/mpsr_Put.cc b/Singular/mpsr_Put.cc
-index ca868a5..46c336f 100644
+index 539e408..449ff9e 100644
--- a/Singular/mpsr_Put.cc
+++ b/Singular/mpsr_Put.cc
-@@ -14,7 +14,7 @@
+@@ -13,7 +13,7 @@
* Updated putting routines to MP and MPP v1.1
*
***************************************************************/
@@ -668,10 +665,10 @@ index ca868a5..46c336f 100644
#ifdef HAVE_MPSR
diff --git a/Singular/mpsr_PutPoly.cc b/Singular/mpsr_PutPoly.cc
-index 51c67de..7c19889 100644
+index bcd93f4..bf57ac8 100644
--- a/Singular/mpsr_PutPoly.cc
+++ b/Singular/mpsr_PutPoly.cc
-@@ -15,7 +15,7 @@
+@@ -13,7 +13,7 @@
* Updated routines to MP and MPP v1.1
*
***************************************************************/
@@ -681,10 +678,10 @@ index 51c67de..7c19889 100644
#ifdef HAVE_MPSR
diff --git a/Singular/mpsr_Tok.cc b/Singular/mpsr_Tok.cc
-index 8d8873c..a006d79 100644
+index a3801f5..a6818df 100644
--- a/Singular/mpsr_Tok.cc
+++ b/Singular/mpsr_Tok.cc
-@@ -18,7 +18,7 @@
+@@ -16,7 +16,7 @@
#include <sys/types.h>
#include <unistd.h>
@@ -694,11 +691,11 @@ index 8d8873c..a006d79 100644
#ifdef HAVE_MPSR
diff --git a/Singular/mpsr_sl.cc b/Singular/mpsr_sl.cc
-index 39224f3..84f0db2 100644
+index 1253e38..5e8f571 100644
--- a/Singular/mpsr_sl.cc
+++ b/Singular/mpsr_sl.cc
-@@ -9,7 +9,7 @@
- * Version: $Id: mpsr_sl.cc 13937 2011-03-07 16:10:06Z hannes $
+@@ -8,7 +8,7 @@
+ * Created: 12/00
*******************************************************************/
-#include <kernel/mod2.h>
@@ -707,10 +704,10 @@ index 39224f3..84f0db2 100644
#ifdef HAVE_MPSR
diff --git a/Singular/ndbm.cc b/Singular/ndbm.cc
-index c6f4e11..f67fe34 100644
+index c45c7df..d278a82 100644
--- a/Singular/ndbm.cc
+++ b/Singular/ndbm.cc
-@@ -14,7 +14,7 @@
+@@ -10,7 +10,7 @@
//
//**************************************************************************/
@@ -720,10 +717,10 @@ index c6f4e11..f67fe34 100644
#ifndef HPUX_9
#include <strings.h>
diff --git a/Singular/pcv.cc b/Singular/pcv.cc
-index de543be..d463a09 100644
+index 0f5091c..d9391f1 100644
--- a/Singular/pcv.cc
+++ b/Singular/pcv.cc
-@@ -6,7 +6,7 @@
+@@ -5,7 +5,7 @@
* ABSTRACT: conversion between polys and coef vectors
*/
@@ -733,10 +730,10 @@ index de543be..d463a09 100644
#ifdef HAVE_PCV
//#if !defined(HAVE_DYNAMIC_LOADING) || defined(BUILD_MODULE)
diff --git a/Singular/pipeLink.cc b/Singular/pipeLink.cc
-index 755efd6..25bb557 100644
+index 913c88b..47e3b77 100644
--- a/Singular/pipeLink.cc
+++ b/Singular/pipeLink.cc
-@@ -17,7 +17,7 @@
+@@ -16,7 +16,7 @@
#include <sys/socket.h>
@@ -746,10 +743,10 @@ index 755efd6..25bb557 100644
#include "tok.h"
#include "ipid.h"
diff --git a/Singular/scanner.cc b/Singular/scanner.cc
-index bbe8eea..16cbbfc 100644
+index aa186ce..9847fa1 100644
--- a/Singular/scanner.cc
+++ b/Singular/scanner.cc
-@@ -561,7 +561,7 @@ char *yytext;
+@@ -560,7 +560,7 @@ char *yytext;
#include <stdlib.h>
#include <ctype.h>
@@ -759,10 +756,10 @@ index bbe8eea..16cbbfc 100644
#include <Singular/tok.h>
#include <Singular/stype.h>
diff --git a/Singular/scanner.l b/Singular/scanner.l
-index 384072b..aad2f7f 100644
+index 8298e71..b78f242 100644
--- a/Singular/scanner.l
+++ b/Singular/scanner.l
-@@ -8,7 +8,7 @@
+@@ -7,7 +7,7 @@
#include <stdlib.h>
#include <ctype.h>
@@ -772,10 +769,10 @@ index 384072b..aad2f7f 100644
#include <Singular/tok.h>
#include <Singular/stype.h>
diff --git a/Singular/sdb.cc b/Singular/sdb.cc
-index 7460449..300bea0 100644
+index ea0011f..be15a91 100644
--- a/Singular/sdb.cc
+++ b/Singular/sdb.cc
-@@ -8,7 +8,7 @@
+@@ -7,7 +7,7 @@
#include <unistd.h> // for unlink,fork,execlp,getpid
#include <sys/wait.h> // for wait
@@ -785,10 +782,10 @@ index 7460449..300bea0 100644
#include <kernel/options.h>
#include <omalloc/omalloc.h>
diff --git a/Singular/silink.cc b/Singular/silink.cc
-index 90c11da..a96b7e3 100644
+index 811923e..91d0044 100644
--- a/Singular/silink.cc
+++ b/Singular/silink.cc
-@@ -13,7 +13,7 @@
+@@ -12,7 +12,7 @@
#include <sys/stat.h>
#include <unistd.h>
@@ -798,10 +795,10 @@ index 90c11da..a96b7e3 100644
#include <kernel/options.h>
#include <omalloc/omalloc.h>
diff --git a/Singular/sing_dbm.cc b/Singular/sing_dbm.cc
-index cb84bb2..2fb06c7 100644
+index bcbd993..fe8990d 100644
--- a/Singular/sing_dbm.cc
+++ b/Singular/sing_dbm.cc
-@@ -16,7 +16,7 @@
+@@ -12,7 +12,7 @@
# include <fcntl.h>
# include <errno.h>
@@ -811,10 +808,10 @@ index cb84bb2..2fb06c7 100644
#ifdef HAVE_DBM
diff --git a/Singular/sing_win.cc b/Singular/sing_win.cc
-index b2fc5ea..a961016 100644
+index 00a7062..30dc60f 100644
--- a/Singular/sing_win.cc
+++ b/Singular/sing_win.cc
-@@ -7,7 +7,7 @@
+@@ -6,7 +6,7 @@
* ABSTRACT: Windows specific routines
*/
@@ -824,10 +821,10 @@ index b2fc5ea..a961016 100644
#include <windows.h>
#include <winuser.h>
diff --git a/Singular/slInit_Dynamic.cc b/Singular/slInit_Dynamic.cc
-index f93653e..8c179ee 100644
+index 746dfec..ca8e2bd 100644
--- a/Singular/slInit_Dynamic.cc
+++ b/Singular/slInit_Dynamic.cc
-@@ -14,7 +14,7 @@
+@@ -13,7 +13,7 @@
* MP link Extension inits
*
***************************************************************/
@@ -837,10 +834,10 @@ index f93653e..8c179ee 100644
#include <Singular/slInit.h>
#include <kernel/mod_raw.h>
diff --git a/Singular/slInit_Static.cc b/Singular/slInit_Static.cc
-index ffe3eed..fef9eac 100644
+index 648dd73..ab2d621 100644
--- a/Singular/slInit_Static.cc
+++ b/Singular/slInit_Static.cc
-@@ -14,7 +14,7 @@
+@@ -13,7 +13,7 @@
* MP link Extension inits
*
***************************************************************/
@@ -850,7 +847,7 @@ index ffe3eed..fef9eac 100644
#include <Singular/slInit.h>
diff --git a/Singular/ssiLink.cc b/Singular/ssiLink.cc
-index 0705a7d..f216dc8 100644
+index 96bac4f..1e5df92 100644
--- a/Singular/ssiLink.cc
+++ b/Singular/ssiLink.cc
@@ -22,7 +22,7 @@
@@ -863,7 +860,7 @@ index 0705a7d..f216dc8 100644
#include <Singular/tok.h>
diff --git a/Singular/subexpr.cc b/Singular/subexpr.cc
-index bba1b6d..1f63592 100644
+index c557dbe..87c50bd 100644
--- a/Singular/subexpr.cc
+++ b/Singular/subexpr.cc
@@ -11,7 +11,7 @@
@@ -873,13 +870,13 @@ index bba1b6d..1f63592 100644
-#include <kernel/mod2.h>
+#include <Singular/mod2.h>
#include <kernel/intvec.h>
+ #include <kernel/bigintmat.h>
#include <Singular/tok.h>
- #include <kernel/options.h>
diff --git a/Singular/tesths.cc b/Singular/tesths.cc
-index 475d942..10e9cc0 100644
+index d68b38e..bc88c8e 100644
--- a/Singular/tesths.cc
+++ b/Singular/tesths.cc
-@@ -14,7 +14,7 @@
+@@ -12,7 +12,7 @@
#include <stdlib.h>
#include <time.h>
#include <errno.h>
@@ -889,10 +886,10 @@ index 475d942..10e9cc0 100644
#include <kernel/options.h>
#include <Singular/ipshell.h>
diff --git a/Singular/walk.cc b/Singular/walk.cc
-index 34ba272..f4bc159 100644
+index 33e602a..0c33eeb 100644
--- a/Singular/walk.cc
+++ b/Singular/walk.cc
-@@ -46,7 +46,7 @@
+@@ -45,7 +45,7 @@
#include <sys/types.h>
@@ -902,10 +899,10 @@ index 34ba272..f4bc159 100644
#include <Singular/cntrlc.h>
#include <kernel/options.h>
diff --git a/Singular/walk_ip.cc b/Singular/walk_ip.cc
-index a315433..01a58a4 100644
+index b1627f0..8afc077 100644
--- a/Singular/walk_ip.cc
+++ b/Singular/walk_ip.cc
-@@ -12,7 +12,7 @@
+@@ -11,7 +11,7 @@
#include <ctype.h>
#include <math.h>
@@ -926,7 +923,7 @@ index 07a2e2f..7884e9f 100755
#include <kernel/polys.h>
#include <kernel/kstd1.h>
diff --git a/kernel/F4.cc b/kernel/F4.cc
-index 3e56e0b..22c7699 100644
+index 93cfedb..d72939c 100644
--- a/kernel/F4.cc
+++ b/kernel/F4.cc
@@ -1,4 +1,4 @@
@@ -985,11 +982,10 @@ index 4428d15..05f52b7 100644
#include <kernel/febase.h>
#include <kernel/ring.h>
diff --git a/kernel/Poly.h b/kernel/Poly.h
-index 481e96a..d95614b 100644
+index de7d2b9..f2f913a 100644
--- a/kernel/Poly.h
+++ b/kernel/Poly.h
-@@ -4,7 +4,7 @@
-
+@@ -1,6 +1,6 @@
#ifndef POLYCPP_HEADER
#define POLYCPP_HEADER
-#include <kernel/mod2.h>
@@ -1010,10 +1006,10 @@ index 809d0b5..7c3f764 100644
template <class traits> class PowerSeriesInputIterator:
public std::
diff --git a/kernel/clapconv.cc b/kernel/clapconv.cc
-index a043330..3cf1386 100644
+index 6be51df..f0c1b7c 100644
--- a/kernel/clapconv.cc
+++ b/kernel/clapconv.cc
-@@ -8,7 +8,7 @@
+@@ -7,7 +7,7 @@
*/
@@ -1023,10 +1019,10 @@ index a043330..3cf1386 100644
#include <omalloc/omalloc.h>
#include <kernel/structs.h>
diff --git a/kernel/clapsing.cc b/kernel/clapsing.cc
-index 2159b6a..e822a0a 100644
+index a3f37a4..a3f23e1 100644
--- a/kernel/clapsing.cc
+++ b/kernel/clapsing.cc
-@@ -8,7 +8,7 @@
+@@ -7,7 +7,7 @@
*/
//#define FACTORIZE2_DEBUG
@@ -1036,10 +1032,10 @@ index 2159b6a..e822a0a 100644
#ifdef HAVE_FACTORY
#define SI_DONT_HAVE_GLOBAL_VARS
diff --git a/kernel/dError.c b/kernel/dError.c
-index 61a5076..18c9ec4 100644
+index 5ea1d19..6c229cb 100644
--- a/kernel/dError.c
+++ b/kernel/dError.c
-@@ -12,7 +12,7 @@
+@@ -11,7 +11,7 @@
#define DERROR_C
#include <stdarg.h>
#include <stdio.h>
@@ -1049,13 +1045,13 @@ index 61a5076..18c9ec4 100644
#ifdef HAVE_CONFIG_H
#include <omalloc/omalloc.h>
diff --git a/kernel/digitech.cc b/kernel/digitech.cc
-index 89f6a44..a03ccdf 100644
+index 25df89f..6039e43 100644
--- a/kernel/digitech.cc
+++ b/kernel/digitech.cc
-@@ -2,7 +2,7 @@
+@@ -1,7 +1,7 @@
+ /****************************************
* Computer Algebra System SINGULAR *
****************************************/
- /* $Id: digitech.cc 13628 2010-11-10 16:07:34Z hannes $ */
-#include <kernel/mod2.h>
+#include <Singular/mod2.h>
#include <kernel/ring.h>
@@ -1074,10 +1070,10 @@ index b8d0fd3..a1ceb37 100644
void bit_reduce(poly & f,ring r);
poly uni_subst_bits(poly outer_uni, poly inner_multi, ring r);
diff --git a/kernel/eigenval.cc b/kernel/eigenval.cc
-index c2dad58..2c4d628 100644
+index a0934a3..d2ce108 100644
--- a/kernel/eigenval.cc
+++ b/kernel/eigenval.cc
-@@ -6,7 +6,7 @@
+@@ -5,7 +5,7 @@
* ABSTRACT: eigenvalues of constant square matrices
*/
@@ -1097,10 +1093,10 @@ index c1e3b33..caebac9 100644
#include <unistd.h>
#include <kernel/structs.h>
diff --git a/kernel/f5data.cc b/kernel/f5data.cc
-index d5c716a..7033b45 100644
+index d872f61..d606a4e 100644
--- a/kernel/f5data.cc
+++ b/kernel/f5data.cc
-@@ -6,7 +6,7 @@
+@@ -5,7 +5,7 @@
/*
* ABSTRACT: lpolynomial definition
*/
@@ -1133,12 +1129,12 @@ index ae0bcab..4546a17 100644
#ifdef HAVE_F5
#include <kernel/kutil.h>
diff --git a/kernel/fast_maps.cc b/kernel/fast_maps.cc
-index 4866aed..205abb3 100644
+index 619c4fd..c38fd20 100644
--- a/kernel/fast_maps.cc
+++ b/kernel/fast_maps.cc
-@@ -8,7 +8,7 @@
+@@ -7,7 +7,7 @@
+ * Author: obachman (Olaf Bachmann)
* Created: 02/01
- * Version: $Id: fast_maps.cc 13210 2010-09-17 13:36:19Z seelisch $
*******************************************************************/
-#include <kernel/mod2.h>
+#include <Singular/mod2.h>
@@ -1146,13 +1142,13 @@ index 4866aed..205abb3 100644
#include <kernel/options.h>
#include <kernel/p_polys.h>
diff --git a/kernel/fast_mult.cc b/kernel/fast_mult.cc
-index 95b40c4..39f12c4 100644
+index 120a29a..ae42b3b 100644
--- a/kernel/fast_mult.cc
+++ b/kernel/fast_mult.cc
-@@ -2,7 +2,7 @@
+@@ -1,7 +1,7 @@
+ /****************************************
* Computer Algebra System SINGULAR *
****************************************/
- /* $Id: fast_mult.cc 14278 2011-06-14 13:49:47Z hannes $ */
-#include <kernel/mod2.h>
+#include <Singular/mod2.h>
#include <kernel/ring.h>
@@ -1171,10 +1167,10 @@ index 43a4344..41e97e4 100644
poly unifastmult(poly f,poly g, ring r);
poly multifastmult(poly f, poly g, ring r);
diff --git a/kernel/feResource.cc b/kernel/feResource.cc
-index ba0385c..5bb750f 100644
+index 30ace22..01bb816 100644
--- a/kernel/feResource.cc
+++ b/kernel/feResource.cc
-@@ -10,7 +10,7 @@
+@@ -9,7 +9,7 @@
#include <unistd.h>
#include <string.h>
@@ -1184,10 +1180,10 @@ index ba0385c..5bb750f 100644
#define HAVE_PUTENV 1
#endif
diff --git a/kernel/febase.cc b/kernel/febase.cc
-index b8a7789..6d1bbd4 100644
+index 865c9d7..725eca2 100644
--- a/kernel/febase.cc
+++ b/kernel/febase.cc
-@@ -8,7 +8,7 @@
+@@ -7,7 +7,7 @@
/* I need myfread in standalone_parser */
#ifndef STANDALONE_PARSER
@@ -1197,10 +1193,10 @@ index b8a7789..6d1bbd4 100644
#include <stdlib.h>
#include <stdio.h>
diff --git a/kernel/fegetopt.c b/kernel/fegetopt.c
-index 6bac789..bf312ee 100644
+index 47fd931..3cf3db8 100644
--- a/kernel/fegetopt.c
+++ b/kernel/fegetopt.c
-@@ -32,7 +32,7 @@
+@@ -31,7 +31,7 @@
*/
@@ -1210,10 +1206,10 @@ index 6bac789..bf312ee 100644
#ifndef __STDC__
# ifndef const
diff --git a/kernel/feread.cc b/kernel/feread.cc
-index a77285b..f3e7f12 100644
+index d861fc6..8f67c5e 100644
--- a/kernel/feread.cc
+++ b/kernel/feread.cc
-@@ -6,7 +6,7 @@
+@@ -5,7 +5,7 @@
* ABSTRACT: input from ttys, simulating fgets
*/
@@ -1223,10 +1219,10 @@ index a77285b..f3e7f12 100644
// ----------------------------------------
// system settings:
diff --git a/kernel/fereadl.c b/kernel/fereadl.c
-index 9f3407b..21873b8 100644
+index d2f6c1c..1c495be 100644
--- a/kernel/fereadl.c
+++ b/kernel/fereadl.c
-@@ -7,7 +7,7 @@
+@@ -6,7 +6,7 @@
*/
@@ -1236,10 +1232,10 @@ index 9f3407b..21873b8 100644
#include <omalloc/omalloc.h>
#include <kernel/structs.h>
diff --git a/kernel/ffields.cc b/kernel/ffields.cc
-index 91ed4e3..c1143c8 100644
+index be5aeb7..255e590 100644
--- a/kernel/ffields.cc
+++ b/kernel/ffields.cc
-@@ -7,7 +7,7 @@
+@@ -6,7 +6,7 @@
*/
#include <string.h>
@@ -1249,10 +1245,10 @@ index 91ed4e3..c1143c8 100644
#include <kernel/febase.h>
#include <omalloc/omalloc.h>
diff --git a/kernel/fglmcomb.cc b/kernel/fglmcomb.cc
-index 3d3eaa1..d19eead 100644
+index d8b42a2..4c11eab 100644
--- a/kernel/fglmcomb.cc
+++ b/kernel/fglmcomb.cc
-@@ -8,7 +8,7 @@
+@@ -7,7 +7,7 @@
* ABSTRACT -
*/
@@ -1262,10 +1258,10 @@ index 3d3eaa1..d19eead 100644
#ifdef HAVE_FACTORY
#include <kernel/options.h>
diff --git a/kernel/fglmgauss.cc b/kernel/fglmgauss.cc
-index 5764597..d3b3ee4 100644
+index 933e26c..b64613a 100644
--- a/kernel/fglmgauss.cc
+++ b/kernel/fglmgauss.cc
-@@ -9,7 +9,7 @@
+@@ -8,7 +8,7 @@
* to find linear dependecies of fglmVectors.
*/
@@ -1275,10 +1271,10 @@ index 5764597..d3b3ee4 100644
#ifdef HAVE_FACTORY
#include <kernel/structs.h>
diff --git a/kernel/fglmhom.cc b/kernel/fglmhom.cc
-index 468dc2c..61219da 100644
+index 16ead96..4636bea 100644
--- a/kernel/fglmhom.cc
+++ b/kernel/fglmhom.cc
-@@ -10,7 +10,7 @@
+@@ -9,7 +9,7 @@
*/
@@ -1288,10 +1284,10 @@ index 468dc2c..61219da 100644
#include <factoryconf.h>
#ifndef NOSTREAMIO
diff --git a/kernel/fglmvec.cc b/kernel/fglmvec.cc
-index b9f90da..c2d8579 100644
+index a0a4300..75abda1 100644
--- a/kernel/fglmvec.cc
+++ b/kernel/fglmvec.cc
-@@ -12,7 +12,7 @@
+@@ -11,7 +11,7 @@
* specialized for this purpose.
*/
@@ -1301,10 +1297,10 @@ index b9f90da..c2d8579 100644
#ifdef HAVE_FACTORY
#include <omalloc/omalloc.h>
diff --git a/kernel/fglmzero.cc b/kernel/fglmzero.cc
-index e9d3dae..b3bd181 100644
+index 2db865f..0a02105 100644
--- a/kernel/fglmzero.cc
+++ b/kernel/fglmzero.cc
-@@ -18,7 +18,7 @@
+@@ -17,7 +17,7 @@
* o FindUnivariatePolys added
*/
@@ -1327,10 +1323,10 @@ index ca08a3c..55c9431 100644
#ifdef HAVE_FANS
#include <kernel/options.h>
diff --git a/kernel/gnumpc.cc b/kernel/gnumpc.cc
-index da6d51c..e20b0ab 100644
+index 62ea1f0..e3a28a8 100644
--- a/kernel/gnumpc.cc
+++ b/kernel/gnumpc.cc
-@@ -8,7 +8,7 @@
+@@ -7,7 +7,7 @@
* ngc == number gnu complex
*/
@@ -1340,10 +1336,10 @@ index da6d51c..e20b0ab 100644
#include <kernel/febase.h>
#include <omalloc/omalloc.h>
diff --git a/kernel/gnumpfl.cc b/kernel/gnumpfl.cc
-index 4d49b11..c3d7c5c 100644
+index 8438dd5..eb7294b 100644
--- a/kernel/gnumpfl.cc
+++ b/kernel/gnumpfl.cc
-@@ -8,7 +8,7 @@
+@@ -7,7 +7,7 @@
* ngf == number gnu floats
*/
@@ -1353,10 +1349,10 @@ index 4d49b11..c3d7c5c 100644
#include <kernel/febase.h>
#include <omalloc/omalloc.h>
diff --git a/kernel/gr_kstd2.cc b/kernel/gr_kstd2.cc
-index dc014e8..1fe8521 100644
+index 27e0152..c311b81 100644
--- a/kernel/gr_kstd2.cc
+++ b/kernel/gr_kstd2.cc
-@@ -6,7 +6,7 @@
+@@ -5,7 +5,7 @@
* ABSTRACT - Kernel: noncomm. alg. of Buchberger
*/
@@ -1366,10 +1362,10 @@ index dc014e8..1fe8521 100644
#ifdef HAVE_PLURAL
diff --git a/kernel/gring.cc b/kernel/gring.cc
-index 5abd2cb..1feb027 100644
+index bfbde4f..c811cca 100644
--- a/kernel/gring.cc
+++ b/kernel/gring.cc
-@@ -17,7 +17,7 @@
+@@ -16,7 +16,7 @@
#define OM_TRACK 5
#endif
@@ -1379,10 +1375,10 @@ index 5abd2cb..1feb027 100644
#ifdef HAVE_PLURAL
#define PLURAL_INTERNAL_DECLARATIONS
diff --git a/kernel/hdegree.cc b/kernel/hdegree.cc
-index 4706f5b..df561e6 100644
+index 2e3053e..6d4cecd 100644
--- a/kernel/hdegree.cc
+++ b/kernel/hdegree.cc
-@@ -6,7 +6,7 @@
+@@ -5,7 +5,7 @@
* ABSTRACT - dimension, multiplicity, HC, kbase
*/
@@ -1392,10 +1388,10 @@ index 4706f5b..df561e6 100644
#include <kernel/structs.h>
diff --git a/kernel/hilb.cc b/kernel/hilb.cc
-index 64abe8a..e38b0f4 100644
+index e629397..f687164 100644
--- a/kernel/hilb.cc
+++ b/kernel/hilb.cc
-@@ -6,7 +6,7 @@
+@@ -5,7 +5,7 @@
* ABSTRACT - Hilbert series
*/
@@ -1405,10 +1401,10 @@ index 64abe8a..e38b0f4 100644
#include <kernel/febase.h>
#include <omalloc/omalloc.h>
diff --git a/kernel/hutil.cc b/kernel/hutil.cc
-index 4e76eb7..62788b1 100644
+index 493e69f..44fa8b3 100644
--- a/kernel/hutil.cc
+++ b/kernel/hutil.cc
-@@ -6,7 +6,7 @@
+@@ -5,7 +5,7 @@
* ABSTRACT: Utilities for staircase operations
*/
@@ -1418,10 +1414,10 @@ index 4e76eb7..62788b1 100644
#include <kernel/febase.h>
#include <omalloc/omalloc.h>
diff --git a/kernel/ideals.cc b/kernel/ideals.cc
-index 8d8f8f6..d68e749 100644
+index 224c48e..92db602 100644
--- a/kernel/ideals.cc
+++ b/kernel/ideals.cc
-@@ -7,7 +7,7 @@
+@@ -6,7 +6,7 @@
*/
/* includes */
@@ -1431,10 +1427,10 @@ index 8d8f8f6..d68e749 100644
#ifndef NDEBUG
# define MYTEST 0
diff --git a/kernel/int64vec.cc b/kernel/int64vec.cc
-index 4937c7a..2b76231 100644
+index ef39725..31a6323 100644
--- a/kernel/int64vec.cc
+++ b/kernel/int64vec.cc
-@@ -5,7 +5,7 @@
+@@ -4,7 +4,7 @@
/*
* ABSTRACT: class int64vec: lists/vectors of int64
*/
@@ -1444,10 +1440,10 @@ index 4937c7a..2b76231 100644
#include <kernel/febase.h>
#include <kernel/int64vec.h>
diff --git a/kernel/intvec.cc b/kernel/intvec.cc
-index 95b1fa4..a734f88 100644
+index 075d1ea..7688255 100644
--- a/kernel/intvec.cc
+++ b/kernel/intvec.cc
-@@ -7,7 +7,7 @@
+@@ -6,7 +6,7 @@
*/
#ifndef INTVEC_CC
#define INTVEC_CC
@@ -1457,12 +1453,12 @@ index 95b1fa4..a734f88 100644
#include <kernel/options.h>
#include <kernel/intvec.h>
diff --git a/kernel/kbuckets.cc b/kernel/kbuckets.cc
-index 0c6f388..0826e8e 100644
+index 7a6833d..650bff3 100644
--- a/kernel/kbuckets.cc
+++ b/kernel/kbuckets.cc
-@@ -3,7 +3,7 @@
+@@ -2,7 +2,7 @@
+ * Computer Algebra System SINGULAR *
****************************************/
- /* $Id: kbuckets.cc 14278 2011-06-14 13:49:47Z hannes $ */
-#include <kernel/mod2.h>
+#include <Singular/mod2.h>
@@ -1470,10 +1466,10 @@ index 0c6f388..0826e8e 100644
#include <omalloc/omalloc.h>
#include <kernel/p_polys.h>
diff --git a/kernel/khstd.cc b/kernel/khstd.cc
-index 421afdc..1a2aa5f 100644
+index 51039c4..23c863d 100644
--- a/kernel/khstd.cc
+++ b/kernel/khstd.cc
-@@ -6,7 +6,7 @@
+@@ -5,7 +5,7 @@
* ABSTRACT:utils for hilbert driven kStd
*/
@@ -1483,10 +1479,10 @@ index 421afdc..1a2aa5f 100644
#include <kernel/options.h>
#include <kernel/polys.h>
diff --git a/kernel/kspoly.cc b/kernel/kspoly.cc
-index 6288e4a..0cbe7d5 100644
+index 372aa41..0bb1c9e 100644
--- a/kernel/kspoly.cc
+++ b/kernel/kspoly.cc
-@@ -7,7 +7,7 @@
+@@ -6,7 +6,7 @@
*/
// #define PDEBUG 2
@@ -1496,10 +1492,10 @@ index 6288e4a..0cbe7d5 100644
#include <kernel/kutil.h>
#include <kernel/numbers.h>
diff --git a/kernel/kstd1.cc b/kernel/kstd1.cc
-index 1c10f05..690a9f9 100644
+index dd98db2..a055f4d 100644
--- a/kernel/kstd1.cc
+++ b/kernel/kstd1.cc
-@@ -14,7 +14,7 @@
+@@ -13,7 +13,7 @@
// define if buckets should be used
#define MORA_USE_BUCKETS
@@ -1509,10 +1505,10 @@ index 1c10f05..690a9f9 100644
#ifndef NDEBUG
diff --git a/kernel/kstd2.cc b/kernel/kstd2.cc
-index 663fc1d..b064a59 100644
+index 719097e..0e921cf 100644
--- a/kernel/kstd2.cc
+++ b/kernel/kstd2.cc
-@@ -13,7 +13,7 @@
+@@ -12,7 +12,7 @@
// define to enable tailRings
#define HAVE_TAIL_RING
@@ -1522,10 +1518,10 @@ index 663fc1d..b064a59 100644
#ifndef NDEBUG
# define MYTEST 0
diff --git a/kernel/kstdfac.cc b/kernel/kstdfac.cc
-index 6d598e3..10c4800 100644
+index 437a9d5..3c6b003 100644
--- a/kernel/kstdfac.cc
+++ b/kernel/kstdfac.cc
-@@ -6,7 +6,7 @@
+@@ -5,7 +5,7 @@
* ABSTRACT - Kernel: factorizing alg. of Buchberger
*/
@@ -1535,7 +1531,7 @@ index 6d598e3..10c4800 100644
#include <kernel/options.h>
#include <kernel/polys.h>
diff --git a/kernel/kutil.cc b/kernel/kutil.cc
-index 2b10ea5..a464baf 100644
+index 1e3341c..86d1e6b 100644
--- a/kernel/kutil.cc
+++ b/kernel/kutil.cc
@@ -10,7 +10,7 @@
@@ -1548,10 +1544,10 @@ index 2b10ea5..a464baf 100644
#ifndef NDEBUG
# define MYTEST 0
diff --git a/kernel/linearAlgebra.cc b/kernel/linearAlgebra.cc
-index a06d10e..e3f22a7 100644
+index 74842dc..015cac2 100644
--- a/kernel/linearAlgebra.cc
+++ b/kernel/linearAlgebra.cc
-@@ -16,7 +16,7 @@
+@@ -14,7 +14,7 @@
/*****************************************************************************/
// include header files
@@ -1561,7 +1557,7 @@ index a06d10e..e3f22a7 100644
#include <kernel/polys.h>
#include <kernel/ideals.h>
diff --git a/kernel/longalg.cc b/kernel/longalg.cc
-index 730d8a1..2e179b7 100644
+index 5b26264..b86431f 100644
--- a/kernel/longalg.cc
+++ b/kernel/longalg.cc
@@ -7,7 +7,7 @@
@@ -1574,10 +1570,10 @@ index 730d8a1..2e179b7 100644
#include <omalloc/omalloc.h>
#include <kernel/febase.h>
diff --git a/kernel/longrat.cc b/kernel/longrat.cc
-index bf7614e..4370f46 100644
+index 396c48f..844010f 100644
--- a/kernel/longrat.cc
+++ b/kernel/longrat.cc
-@@ -6,7 +6,7 @@
+@@ -5,7 +5,7 @@
* ABSTRACT: computation with long rational numbers (Hubert Grassmann)
*/
@@ -1587,10 +1583,10 @@ index bf7614e..4370f46 100644
#include <kernel/longrat.h>
diff --git a/kernel/longrat0.cc b/kernel/longrat0.cc
-index a550a2e..ee9b596 100644
+index f4d1e32..7ecaabe 100644
--- a/kernel/longrat0.cc
+++ b/kernel/longrat0.cc
-@@ -9,7 +9,7 @@
+@@ -8,7 +8,7 @@
#include <stdio.h>
#include <string.h>
@@ -1613,10 +1609,10 @@ index cf2ebef..88d48ab 100644
#include <omalloc/omalloc.h>
#include <kernel/febase.h>
diff --git a/kernel/lplist.cc b/kernel/lplist.cc
-index cd41992..12151e9 100644
+index 0f5fdc3..35bacb9 100644
--- a/kernel/lplist.cc
+++ b/kernel/lplist.cc
-@@ -5,7 +5,7 @@
+@@ -4,7 +4,7 @@
/*
* ABSTRACT: list interface
*/
@@ -1626,10 +1622,10 @@ index cd41992..12151e9 100644
#ifdef HAVE_F5
diff --git a/kernel/maps.cc b/kernel/maps.cc
-index c1b5023..fa6cc80 100644
+index d323ca8..951c2c9 100644
--- a/kernel/maps.cc
+++ b/kernel/maps.cc
-@@ -6,7 +6,7 @@
+@@ -5,7 +5,7 @@
* ABSTRACT - the mapping of polynomials to other rings
*/
@@ -1639,10 +1635,10 @@ index c1b5023..fa6cc80 100644
#include <kernel/febase.h>
#include <kernel/polys.h>
diff --git a/kernel/matpol.cc b/kernel/matpol.cc
-index 5e5147f..0d9c215 100644
+index 304c249..16b0ea7 100644
--- a/kernel/matpol.cc
+++ b/kernel/matpol.cc
-@@ -10,7 +10,7 @@
+@@ -9,7 +9,7 @@
#include <stdio.h>
#include <math.h>
@@ -1665,10 +1661,10 @@ index 4ba410c..21ecce5 100644
#include <omalloc/omalloc.h>
#include <kernel/structs.h>
diff --git a/kernel/mmalloc.cc b/kernel/mmalloc.cc
-index 238d10d..6659b24 100644
+index 2050e59..0a3b6d4 100644
--- a/kernel/mmalloc.cc
+++ b/kernel/mmalloc.cc
-@@ -7,7 +7,7 @@
+@@ -6,7 +6,7 @@
*/
#include <stdlib.h>
@@ -1678,10 +1674,10 @@ index 238d10d..6659b24 100644
#include <omalloc/omalloc.h>
#include <new>
diff --git a/kernel/mmstd.c b/kernel/mmstd.c
-index e3f144a..80aeb53 100644
+index 6ccb824..f2fd277 100644
--- a/kernel/mmstd.c
+++ b/kernel/mmstd.c
-@@ -7,7 +7,7 @@
+@@ -6,7 +6,7 @@
* i.e. (malloc/realloc/free)
*/
@@ -1691,10 +1687,10 @@ index e3f144a..80aeb53 100644
#include <omalloc/omalloc.h>
#include <Singular/static.h>
diff --git a/kernel/mod_raw.cc b/kernel/mod_raw.cc
-index e388b82..4971140 100644
+index 14e4667..64519a8 100644
--- a/kernel/mod_raw.cc
+++ b/kernel/mod_raw.cc
-@@ -17,7 +17,7 @@
+@@ -16,7 +16,7 @@
#include <sys/stat.h>
@@ -1717,7 +1713,7 @@ index 8b9089f..126d712 100644
#include <kernel/structs.h>
#include <kernel/febase.h>
diff --git a/kernel/mpr_base.cc b/kernel/mpr_base.cc
-index e67757c..f1a50b9 100644
+index 100b670..19a5695 100644
--- a/kernel/mpr_base.cc
+++ b/kernel/mpr_base.cc
@@ -8,7 +8,7 @@
@@ -1730,10 +1726,10 @@ index e67757c..f1a50b9 100644
#include <omalloc/mylimits.h>
#include <omalloc/omalloc.h>
diff --git a/kernel/mpr_complex.cc b/kernel/mpr_complex.cc
-index bea595f..b5427f9 100644
+index 9fb1056..255e14f 100644
--- a/kernel/mpr_complex.cc
+++ b/kernel/mpr_complex.cc
-@@ -11,7 +11,7 @@
+@@ -10,7 +10,7 @@
// WARNING! ALWAYS use omAlloc and FreeL when alloc. memory for some char* !!
@@ -1743,10 +1739,10 @@ index bea595f..b5427f9 100644
#include <kernel/structs.h>
#include <kernel/febase.h>
diff --git a/kernel/mpr_inout.cc b/kernel/mpr_inout.cc
-index 6957432..3499fe4 100644
+index f8c9b7e..3e13e7e 100644
--- a/kernel/mpr_inout.cc
+++ b/kernel/mpr_inout.cc
-@@ -8,7 +8,7 @@
+@@ -6,7 +6,7 @@
* ABSTRACT - multipolynomial resultant
*/
@@ -1756,10 +1752,10 @@ index 6957432..3499fe4 100644
//-> includes
diff --git a/kernel/mpr_numeric.cc b/kernel/mpr_numeric.cc
-index bf2e87a..10e7bd9 100644
+index 79c741b..55bb031 100644
--- a/kernel/mpr_numeric.cc
+++ b/kernel/mpr_numeric.cc
-@@ -9,7 +9,7 @@
+@@ -8,7 +8,7 @@
* ( root finder, vandermonde system solver, simplex )
*/
@@ -1782,10 +1778,10 @@ index 9f11b1d..de21ed3 100644
#ifdef HAVE_SPECTRUM
diff --git a/kernel/ncSACache.cc b/kernel/ncSACache.cc
-index 99eaeb5..c8a23d2 100644
+index 742ebba..86b86e5 100644
--- a/kernel/ncSACache.cc
+++ b/kernel/ncSACache.cc
-@@ -18,7 +18,7 @@
+@@ -17,7 +17,7 @@
#endif
@@ -1795,10 +1791,10 @@ index 99eaeb5..c8a23d2 100644
#ifndef NDEBUG
#define OUTPUT 1
diff --git a/kernel/ncSAFormula.cc b/kernel/ncSAFormula.cc
-index b5c6cef..f26ddc3 100644
+index b4fefe0..c985bda 100644
--- a/kernel/ncSAFormula.cc
+++ b/kernel/ncSAFormula.cc
-@@ -18,7 +18,7 @@
+@@ -17,7 +17,7 @@
#endif
@@ -1808,10 +1804,10 @@ index b5c6cef..f26ddc3 100644
#ifdef HAVE_PLURAL
diff --git a/kernel/ncSAMult.cc b/kernel/ncSAMult.cc
-index d562476..80ae708 100644
+index e654af0..7f975f2 100644
--- a/kernel/ncSAMult.cc
+++ b/kernel/ncSAMult.cc
-@@ -18,7 +18,7 @@
+@@ -17,7 +17,7 @@
#endif
@@ -1834,10 +1830,10 @@ index afb939b..b54d941 100644
#ifdef HAVE_SPECTRUM
diff --git a/kernel/numbers.cc b/kernel/numbers.cc
-index 73714de..fe59242 100644
+index 61b68a7..35c08b2 100644
--- a/kernel/numbers.cc
+++ b/kernel/numbers.cc
-@@ -9,7 +9,7 @@
+@@ -8,7 +8,7 @@
#include <string.h>
#include <stdlib.h>
@@ -1847,10 +1843,10 @@ index 73714de..fe59242 100644
#include <kernel/febase.h>
#include <kernel/kstd1.h>
diff --git a/kernel/pDebug.cc b/kernel/pDebug.cc
-index 6ce992f..68bdfb1 100644
+index 6d31e4b..931983f 100644
--- a/kernel/pDebug.cc
+++ b/kernel/pDebug.cc
-@@ -15,7 +15,7 @@
+@@ -14,7 +14,7 @@
#include <stdio.h>
@@ -1860,10 +1856,10 @@ index 6ce992f..68bdfb1 100644
// do the following to always enforce checking of pSetm
diff --git a/kernel/pInline0.cc b/kernel/pInline0.cc
-index 4160627..73a9de7 100644
+index f851034..7eb90cb 100644
--- a/kernel/pInline0.cc
+++ b/kernel/pInline0.cc
-@@ -10,7 +10,7 @@
+@@ -9,7 +9,7 @@
*******************************************************************/
#ifndef PINLINE0_CC
@@ -1873,10 +1869,10 @@ index 4160627..73a9de7 100644
#define PINLINE0_CC
#undef DO_PINLINE0
diff --git a/kernel/pInline1.cc b/kernel/pInline1.cc
-index 68bf114..a1ad691 100644
+index 40563b6..e30321d 100644
--- a/kernel/pInline1.cc
+++ b/kernel/pInline1.cc
-@@ -11,7 +11,7 @@
+@@ -10,7 +10,7 @@
#ifndef PINLINE1_CC
#define PINLINE1_CC
@@ -1886,10 +1882,10 @@ index 68bf114..a1ad691 100644
#ifdef PDEBUG
diff --git a/kernel/pInline2.cc b/kernel/pInline2.cc
-index 5aafa5b..c8229b4 100644
+index 5b4ede8..b71b8ad 100644
--- a/kernel/pInline2.cc
+++ b/kernel/pInline2.cc
-@@ -10,7 +10,7 @@
+@@ -9,7 +9,7 @@
*******************************************************************/
#ifndef PINLINE2_CC
#define PINLINE2_CC
@@ -1899,12 +1895,12 @@ index 5aafa5b..c8229b4 100644
#ifdef PDEBUG
diff --git a/kernel/pShallowCopyDelete.cc b/kernel/pShallowCopyDelete.cc
-index 3aef21c..aa32ca7 100644
+index 24cdff5..3c0be0a 100644
--- a/kernel/pShallowCopyDelete.cc
+++ b/kernel/pShallowCopyDelete.cc
-@@ -8,7 +8,7 @@
+@@ -7,7 +7,7 @@
+ * Author: obachman (Olaf Bachmann)
* Created: 8/00
- * Version: $Id: pShallowCopyDelete.cc 13032 2010-07-17 20:38:50Z krueger $
*******************************************************************/
-#include <kernel/mod2.h>
+#include <Singular/mod2.h>
@@ -1912,12 +1908,12 @@ index 3aef21c..aa32ca7 100644
#include <kernel/ring.h>
#include <kernel/pShallowCopyDelete.h>
diff --git a/kernel/p_Mult_q.cc b/kernel/p_Mult_q.cc
-index a638570..35f2349 100644
+index bbb07ef..cbec90e 100644
--- a/kernel/p_Mult_q.cc
+++ b/kernel/p_Mult_q.cc
-@@ -8,7 +8,7 @@
+@@ -7,7 +7,7 @@
+ * Author: obachman (Olaf Bachmann)
* Created: 8/00
- * Version: $Id: p_Mult_q.cc 13032 2010-07-17 20:38:50Z krueger $
*******************************************************************/
-#include <kernel/mod2.h>
+#include <Singular/mod2.h>
@@ -1925,12 +1921,12 @@ index a638570..35f2349 100644
/***************************************************************
*
diff --git a/kernel/p_Mult_q.h b/kernel/p_Mult_q.h
-index 9000e51..87f57ee 100644
+index 4da031f..8ec326f 100644
--- a/kernel/p_Mult_q.h
+++ b/kernel/p_Mult_q.h
-@@ -9,7 +9,7 @@
+@@ -8,7 +8,7 @@
+ * Author: obachman (Olaf Bachmann)
* Created: 8/00
- * Version: $Id: p_Mult_q.h 13032 2010-07-17 20:38:50Z krueger $
*******************************************************************/
-#include <kernel/mod2.h>
+#include <Singular/mod2.h>
@@ -1938,12 +1934,12 @@ index 9000e51..87f57ee 100644
// Use buckets if min(pLength(p), pLength(q)) >= MIN_LENGTH_BUCKET
diff --git a/kernel/p_Procs_Dynamic.cc b/kernel/p_Procs_Dynamic.cc
-index 9e8bd31..800c3d4 100644
+index 8f30e78..58f1249 100644
--- a/kernel/p_Procs_Dynamic.cc
+++ b/kernel/p_Procs_Dynamic.cc
-@@ -8,7 +8,7 @@
+@@ -7,7 +7,7 @@
+ * Author: obachman (Olaf Bachmann)
* Created: 12/00
- * Version: $Id: p_Procs_Dynamic.cc 13051 2010-07-22 14:33:35Z hannes $
*******************************************************************/
-#include <kernel/mod2.h>
+#include <Singular/mod2.h>
@@ -1951,10 +1947,10 @@ index 9e8bd31..800c3d4 100644
#include <kernel/p_polys.h>
#include <kernel/ring.h>
diff --git a/kernel/p_Procs_Generate.cc b/kernel/p_Procs_Generate.cc
-index 5733285..3b25bac 100644
+index af1003d..5ed8398 100644
--- a/kernel/p_Procs_Generate.cc
+++ b/kernel/p_Procs_Generate.cc
-@@ -15,7 +15,7 @@
+@@ -14,7 +14,7 @@
#include <stdlib.h>
#include <string.h>
@@ -1964,12 +1960,12 @@ index 5733285..3b25bac 100644
#ifdef p_Procs_Static
diff --git a/kernel/p_Procs_Lib.cc b/kernel/p_Procs_Lib.cc
-index 33a3b9f..28bcdfb 100644
+index 5ff7c37..4014665 100644
--- a/kernel/p_Procs_Lib.cc
+++ b/kernel/p_Procs_Lib.cc
-@@ -8,7 +8,7 @@
+@@ -7,7 +7,7 @@
+ * Author: obachman (Olaf Bachmann)
* Created: 12/00
- * Version: $Id: p_Procs_Lib.cc 13052 2010-07-22 14:34:50Z hannes $
*******************************************************************/
-#include <kernel/mod2.h>
+#include <Singular/mod2.h>
@@ -1977,12 +1973,12 @@ index 33a3b9f..28bcdfb 100644
#include <kernel/p_polys.h>
#include <kernel/ring.h>
diff --git a/kernel/p_Procs_Static.cc b/kernel/p_Procs_Static.cc
-index c7b571a..ad11c01 100644
+index a3aa326..a93f493 100644
--- a/kernel/p_Procs_Static.cc
+++ b/kernel/p_Procs_Static.cc
-@@ -8,7 +8,7 @@
+@@ -7,7 +7,7 @@
+ * Author: obachman (Olaf Bachmann)
* Created: 12/00
- * Version: $Id: p_Procs_Static.cc 13051 2010-07-22 14:33:35Z hannes $
*******************************************************************/
-#include <kernel/mod2.h>
+#include <Singular/mod2.h>
@@ -1990,10 +1986,10 @@ index c7b571a..ad11c01 100644
#include <kernel/p_polys.h>
#include <kernel/ring.h>
diff --git a/kernel/p_polys.cc b/kernel/p_polys.cc
-index 70c2bd2..32a84b3 100644
+index 01c15c6..4e90501 100644
--- a/kernel/p_polys.cc
+++ b/kernel/p_polys.cc
-@@ -10,7 +10,7 @@
+@@ -9,7 +9,7 @@
*******************************************************************/
@@ -2013,10 +2009,10 @@ index 19681d5..4011a14 100644
#include <stdlib.h>
#include <unistd.h>
diff --git a/kernel/polys-impl.cc b/kernel/polys-impl.cc
-index 8afebcd..f0206f9 100644
+index d247b65..a1b751d 100644
--- a/kernel/polys-impl.cc
+++ b/kernel/polys-impl.cc
-@@ -18,7 +18,7 @@
+@@ -17,7 +17,7 @@
#include <stdio.h>
#include <string.h>
@@ -2026,10 +2022,10 @@ index 8afebcd..f0206f9 100644
#include <omalloc/omalloc.h>
#ifdef PDEBUG
diff --git a/kernel/polys.cc b/kernel/polys.cc
-index 65b0049..443994f 100644
+index 0bb2b1d..08638b7 100644
--- a/kernel/polys.cc
+++ b/kernel/polys.cc
-@@ -11,7 +11,7 @@
+@@ -10,7 +10,7 @@
#include <stdio.h>
#include <string.h>
#include <ctype.h>
@@ -2039,10 +2035,10 @@ index 65b0049..443994f 100644
#include <omalloc/omalloc.h>
#include <kernel/febase.h>
diff --git a/kernel/polys0.cc b/kernel/polys0.cc
-index 2047151..6d24da9 100644
+index 87aea68..d5ec8fd 100644
--- a/kernel/polys0.cc
+++ b/kernel/polys0.cc
-@@ -8,7 +8,7 @@
+@@ -7,7 +7,7 @@
*/
/* includes */
@@ -2052,10 +2048,10 @@ index 2047151..6d24da9 100644
#include <kernel/numbers.h>
#include <kernel/ring.h>
diff --git a/kernel/polys1.cc b/kernel/polys1.cc
-index b7e6c35..382631d 100644
+index fa743fd..a3e0e39 100644
--- a/kernel/polys1.cc
+++ b/kernel/polys1.cc
-@@ -10,7 +10,7 @@
+@@ -8,7 +8,7 @@
/* includes */
#include <string.h>
@@ -2065,10 +2061,10 @@ index b7e6c35..382631d 100644
#include <kernel/numbers.h>
#include <kernel/ffields.h>
diff --git a/kernel/prCopy.cc b/kernel/prCopy.cc
-index 1d7064d..9d26195 100644
+index d335eda..7273cff 100644
--- a/kernel/prCopy.cc
+++ b/kernel/prCopy.cc
-@@ -6,7 +6,7 @@
+@@ -5,7 +5,7 @@
* ABSTRACT - implementation of functions for Copy/Move/Delete for Polys
*/
@@ -2078,12 +2074,12 @@ index 1d7064d..9d26195 100644
#include <kernel/p_polys.h>
#include <kernel/numbers.h>
diff --git a/kernel/ratgring.cc b/kernel/ratgring.cc
-index bc8697b..c88937c 100644
+index 48d7a6f..6dc7a5c 100644
--- a/kernel/ratgring.cc
+++ b/kernel/ratgring.cc
-@@ -8,7 +8,7 @@
+@@ -7,7 +7,7 @@
+ * Author: levandov (Viktor Levandovsky)
* Created: 8/00 - 11/00
- * Version: $Id: ratgring.cc 13262 2010-09-23 15:01:24Z levandov $
*******************************************************************/
-#include <kernel/mod2.h>
+#include <Singular/mod2.h>
@@ -2091,10 +2087,10 @@ index bc8697b..c88937c 100644
#ifdef HAVE_RATGRING
#include <kernel/gring.h>
diff --git a/kernel/ring.cc b/kernel/ring.cc
-index 418c3cb..477a73b 100644
+index d4a0bd2..6b30f7f 100644
--- a/kernel/ring.cc
+++ b/kernel/ring.cc
-@@ -9,7 +9,7 @@
+@@ -7,7 +7,7 @@
/* includes */
#include <math.h>
@@ -2104,10 +2100,10 @@ index 418c3cb..477a73b 100644
#include <kernel/options.h>
#include <omalloc/omalloc.h>
diff --git a/kernel/ringgb.cc b/kernel/ringgb.cc
-index 9f3814b..2bbb4fb 100644
+index c1d510f..60e33c9 100644
--- a/kernel/ringgb.cc
+++ b/kernel/ringgb.cc
-@@ -8,7 +8,7 @@
+@@ -7,7 +7,7 @@
//#define HAVE_TAIL_RING
#define NO_BUCKETS
@@ -2117,10 +2113,10 @@ index 9f3814b..2bbb4fb 100644
#include <kernel/structs.h>
#include <omalloc/omalloc.h>
diff --git a/kernel/ringgb.h b/kernel/ringgb.h
-index 79b8858..9921213 100644
+index dd05f96..10f15c8 100644
--- a/kernel/ringgb.h
+++ b/kernel/ringgb.h
-@@ -7,7 +7,7 @@
+@@ -6,7 +6,7 @@
*/
#ifndef RINGGB_HEADER
#define RINGGB_HEADER
@@ -2130,10 +2126,10 @@ index 79b8858..9921213 100644
#ifdef HAVE_RINGS
#include <kernel/polys.h>
diff --git a/kernel/rintegers.cc b/kernel/rintegers.cc
-index 95b1f15..86b10f6 100644
+index 199315a..5b3af34 100644
--- a/kernel/rintegers.cc
+++ b/kernel/rintegers.cc
-@@ -7,7 +7,7 @@
+@@ -6,7 +6,7 @@
*/
#include <string.h>
@@ -2143,10 +2139,10 @@ index 95b1f15..86b10f6 100644
#include <kernel/structs.h>
#include <kernel/febase.h>
diff --git a/kernel/rmodulo2m.cc b/kernel/rmodulo2m.cc
-index 3c61878..986174a 100644
+index 23e8635..13efb52 100644
--- a/kernel/rmodulo2m.cc
+++ b/kernel/rmodulo2m.cc
-@@ -7,7 +7,7 @@
+@@ -6,7 +6,7 @@
*/
#include <string.h>
@@ -2156,10 +2152,10 @@ index 3c61878..986174a 100644
#ifdef HAVE_RINGS
#include <omalloc/mylimits.h>
diff --git a/kernel/rmodulon.cc b/kernel/rmodulon.cc
-index b2a05b5..cfbe541 100644
+index e90aab7..17b2720 100644
--- a/kernel/rmodulon.cc
+++ b/kernel/rmodulon.cc
-@@ -7,7 +7,7 @@
+@@ -6,7 +6,7 @@
*/
#include <string.h>
@@ -2169,12 +2165,12 @@ index b2a05b5..cfbe541 100644
#include <kernel/structs.h>
#include <kernel/febase.h>
diff --git a/kernel/sbuckets.cc b/kernel/sbuckets.cc
-index 839c7c8..6d4a110 100644
+index a99f0c5..2293b27 100644
--- a/kernel/sbuckets.cc
+++ b/kernel/sbuckets.cc
-@@ -9,7 +9,7 @@
+@@ -8,7 +8,7 @@
+ * Author: obachman (Olaf Bachmann)
* Created: 9/00
- * Version: $Id: sbuckets.cc 13210 2010-09-17 13:36:19Z seelisch $
*******************************************************************/
-#include <kernel/mod2.h>
+#include <Singular/mod2.h>
@@ -2182,10 +2178,10 @@ index 839c7c8..6d4a110 100644
#include <kernel/sbuckets.h>
#include <omalloc/omalloc.h>
diff --git a/kernel/sca.cc b/kernel/sca.cc
-index 6147086..ff2cd80 100644
+index e28496f..f0b9d4b 100644
--- a/kernel/sca.cc
+++ b/kernel/sca.cc
-@@ -19,7 +19,7 @@
+@@ -18,7 +18,7 @@
#endif
// #define PDEBUG 2
@@ -2208,10 +2204,10 @@ index fed3484..dced520 100644
#ifdef HAVE_SPECTRUM
diff --git a/kernel/shiftgb.cc b/kernel/shiftgb.cc
-index 3dc9189..6be6893 100644
+index 04a73f6..fc09395 100644
--- a/kernel/shiftgb.cc
+++ b/kernel/shiftgb.cc
-@@ -6,7 +6,7 @@
+@@ -5,7 +5,7 @@
* ABSTRACT: kernel: utils for shift GB and free GB
*/
@@ -2221,10 +2217,10 @@ index 3dc9189..6be6893 100644
#ifdef HAVE_SHIFTBBA
#include <kernel/febase.h>
diff --git a/kernel/shortfl.cc b/kernel/shortfl.cc
-index 9bed2bb..dd29897 100644
+index fa1646a..31c3f66 100644
--- a/kernel/shortfl.cc
+++ b/kernel/shortfl.cc
-@@ -8,7 +8,7 @@
+@@ -7,7 +7,7 @@
*/
#include <string.h>
@@ -2234,10 +2230,10 @@ index 9bed2bb..dd29897 100644
#include <kernel/structs.h>
#include <kernel/febase.h>
diff --git a/kernel/sparsmat.cc b/kernel/sparsmat.cc
-index 2bfbde6..9626efd 100644
+index d3d1bed..ad245a6 100644
--- a/kernel/sparsmat.cc
+++ b/kernel/sparsmat.cc
-@@ -7,7 +7,7 @@
+@@ -6,7 +6,7 @@
* ABSTRACT: operations with sparse matrices (bareiss, ...)
*/
@@ -2273,10 +2269,10 @@ index c1db0ae..7a4b65a 100644
#ifdef HAVE_SPECTRUM
diff --git a/kernel/summator.cc b/kernel/summator.cc
-index be1cb41..8814eae 100644
+index 5351586..ce70f0b 100644
--- a/kernel/summator.cc
+++ b/kernel/summator.cc
-@@ -18,7 +18,7 @@
+@@ -17,7 +17,7 @@
#define OM_TRACK 5
#endif
@@ -2286,10 +2282,10 @@ index be1cb41..8814eae 100644
#include <kernel/summator.h>
#include <kernel/options.h>
diff --git a/kernel/syz.cc b/kernel/syz.cc
-index 1061e56..eecb98c 100644
+index 2283bf0..bcca57f 100644
--- a/kernel/syz.cc
+++ b/kernel/syz.cc
-@@ -8,7 +8,7 @@
+@@ -7,7 +7,7 @@
*/
@@ -2299,10 +2295,10 @@ index 1061e56..eecb98c 100644
#include <omalloc/omalloc.h>
#include <kernel/polys.h>
diff --git a/kernel/syz0.cc b/kernel/syz0.cc
-index c2d8cbe..69e2c44 100644
+index e5e4d2b..2d92449 100644
--- a/kernel/syz0.cc
+++ b/kernel/syz0.cc
-@@ -7,7 +7,7 @@
+@@ -6,7 +6,7 @@
*/
@@ -2312,10 +2308,10 @@ index c2d8cbe..69e2c44 100644
#include <omalloc/omalloc.h>
#include <kernel/polys.h>
diff --git a/kernel/syz1.cc b/kernel/syz1.cc
-index 1367c52..7aea035 100644
+index c8537c4..f815067 100644
--- a/kernel/syz1.cc
+++ b/kernel/syz1.cc
-@@ -6,7 +6,7 @@
+@@ -5,7 +5,7 @@
* ABSTRACT: resolutions
*/
@@ -2325,10 +2321,10 @@ index 1367c52..7aea035 100644
#include <kernel/options.h>
#include <omalloc/omalloc.h>
diff --git a/kernel/syz2.cc b/kernel/syz2.cc
-index 636001d..67b6310 100644
+index 83acf72..5014240 100644
--- a/kernel/syz2.cc
+++ b/kernel/syz2.cc
-@@ -6,7 +6,7 @@
+@@ -5,7 +5,7 @@
* ABSTRACT: resolutions
*/
@@ -2338,10 +2334,10 @@ index 636001d..67b6310 100644
#include <kernel/options.h>
#include <omalloc/omalloc.h>
diff --git a/kernel/syz3.cc b/kernel/syz3.cc
-index aff65e7..e225cd1 100644
+index b4edc9b..175258f 100644
--- a/kernel/syz3.cc
+++ b/kernel/syz3.cc
-@@ -6,7 +6,7 @@
+@@ -5,7 +5,7 @@
* ABSTRACT: resolutions
*/
@@ -2351,10 +2347,10 @@ index aff65e7..e225cd1 100644
#include <kernel/options.h>
#include <omalloc/omalloc.h>
diff --git a/kernel/tgb.cc b/kernel/tgb.cc
-index c92976e..b226497 100644
+index 335f221..895c227 100644
--- a/kernel/tgb.cc
+++ b/kernel/tgb.cc
-@@ -14,7 +14,7 @@
+@@ -13,7 +13,7 @@
///@TODO: delay nur auf Sugarvergr?erung
///@TODO: grade aus ecartS, setze dazu strat->honey; und nutze p.ecart
///@TODO: no tail reductions in syz comp
@@ -2364,10 +2360,10 @@ index c92976e..b226497 100644
#include <kernel/tgb.h>
#include <kernel/tgb_internal.h>
diff --git a/kernel/tgbgauss.cc b/kernel/tgbgauss.cc
-index 681a38a..ed14563 100644
+index 05ff12d..67c2a15 100644
--- a/kernel/tgbgauss.cc
+++ b/kernel/tgbgauss.cc
-@@ -5,7 +5,7 @@
+@@ -4,7 +4,7 @@
/*
* ABSTRACT: gauss implementation for F4
*/
@@ -2377,10 +2373,10 @@ index 681a38a..ed14563 100644
#include <kernel/tgbgauss.h>
#include <omalloc/omalloc.h>
diff --git a/kernel/tgbgauss.h b/kernel/tgbgauss.h
-index 3c9ab04..dc6cbc1 100644
+index 994a208..8ab56fc 100644
--- a/kernel/tgbgauss.h
+++ b/kernel/tgbgauss.h
-@@ -7,7 +7,7 @@
+@@ -6,7 +6,7 @@
/*
* ABSTRACT: gauss implementation for F4 header
*/
@@ -2390,10 +2386,10 @@ index 3c9ab04..dc6cbc1 100644
//#include "tgb_internal.h"
diff --git a/kernel/timer.cc b/kernel/timer.cc
-index 06d1ff4..a6ceedc 100644
+index 4a382bf..7623fa8 100644
--- a/kernel/timer.cc
+++ b/kernel/timer.cc
-@@ -9,7 +9,7 @@
+@@ -8,7 +8,7 @@
#include <sys/resource.h>
#include <unistd.h>
@@ -2403,12 +2399,12 @@ index 06d1ff4..a6ceedc 100644
int timerv = 0;
static double timer_resolution = TIMER_RESOLUTION;
diff --git a/kernel/tmult.cc b/kernel/tmult.cc
-index 99113d9..05e8d8c 100644
+index c26c61e..647e6e3 100644
--- a/kernel/tmult.cc
+++ b/kernel/tmult.cc
-@@ -5,7 +5,7 @@
+@@ -4,7 +4,7 @@
+ * tmult.cc: p_Mult_nn with pthreads - experimental
*
- * Version: $Id: tmult.cc 14320 2011-07-04 14:48:27Z hannes $
*******************************************************************/
-#include <kernel/mod2.h>
+#include <Singular/mod2.h>
@@ -2416,10 +2412,10 @@ index 99113d9..05e8d8c 100644
#include <kernel/numbers.h>
#include <kernel/polys.h>
diff --git a/kernel/units.cc b/kernel/units.cc
-index 854dc5f..f15d0d9 100644
+index 37f7416..3c40728 100644
--- a/kernel/units.cc
+++ b/kernel/units.cc
-@@ -6,7 +6,7 @@
+@@ -5,7 +5,7 @@
* ABSTRACT: procedures to compute with units
*/
@@ -2429,10 +2425,10 @@ index 854dc5f..f15d0d9 100644
#include <kernel/febase.h>
#include <kernel/numbers.h>
diff --git a/kernel/walkMain.cc b/kernel/walkMain.cc
-index 762a36a..6ca067c 100644
+index c0ac32a..1f5b530 100644
--- a/kernel/walkMain.cc
+++ b/kernel/walkMain.cc
-@@ -7,7 +7,7 @@
+@@ -6,7 +6,7 @@
*
*/
#include <string.h>
@@ -2442,12 +2438,12 @@ index 762a36a..6ca067c 100644
#include <kernel/intvec.h>
#include <kernel/int64vec.h>
diff --git a/kernel/walkProc.cc b/kernel/walkProc.cc
-index f90020a..223a9ca 100644
+index 18945b7..8e39c5a 100644
--- a/kernel/walkProc.cc
+++ b/kernel/walkProc.cc
-@@ -3,7 +3,7 @@
+@@ -2,7 +2,7 @@
+ * Computer Algebra System SINGULAR *
****************************************/
- /* $Id: walkProc.cc 13210 2010-09-17 13:36:19Z seelisch $ */
-#include <kernel/mod2.h>
+#include <Singular/mod2.h>
@@ -2466,10 +2462,10 @@ index ea9c1fa..ada42f7 100644
#include <kernel/int64vec.h>
#include <kernel/polys.h>
diff --git a/kernel/weight.cc b/kernel/weight.cc
-index b1ea7d1..ee073aa 100644
+index 23a8779..936187b 100644
--- a/kernel/weight.cc
+++ b/kernel/weight.cc
-@@ -8,7 +8,7 @@
+@@ -7,7 +7,7 @@
*/
#include <math.h>
@@ -2479,10 +2475,10 @@ index b1ea7d1..ee073aa 100644
#include <omalloc/omalloc.h>
#include <kernel/polys.h>
diff --git a/kernel/weight0.c b/kernel/weight0.c
-index 3efb3a7..ffbe6a4 100644
+index 80454d9..04746d5 100644
--- a/kernel/weight0.c
+++ b/kernel/weight0.c
-@@ -9,7 +9,7 @@
+@@ -8,7 +8,7 @@
#include <math.h>
#include <string.h>
diff --git a/debian/patches/0011-move-libreadline-to-main-binary.patch b/debian/patches/0007-move-libreadline-to-main-binary.patch
similarity index 89%
rename from debian/patches/0011-move-libreadline-to-main-binary.patch
rename to debian/patches/0007-move-libreadline-to-main-binary.patch
index 793b659..1f5e471 100644
--- a/debian/patches/0011-move-libreadline-to-main-binary.patch
+++ b/debian/patches/0007-move-libreadline-to-main-binary.patch
@@ -1,4 +1,4 @@
-From 439991ea2c21afa4f7b32b0ce66c6eda434c955a Mon Sep 17 00:00:00 2001
+From aea42a0d0b9fbee7789e41923b5aa8a8cbd802de Mon Sep 17 00:00:00 2001
From: "Bernhard R. Link" <brlink at debian.org>
Date: Sun, 26 Feb 2012 13:38:14 +0100
Subject: move libreadline to main binary
@@ -6,14 +6,14 @@ Subject: move libreadline to main binary
and link Singular binary against libsingular instead of carrying a copy
of everything.
---
- Singular/Makefile.in | 8 +++++---
- kernel/Makefile.in | 17 +++++++++--------
- kernel/febase.cc | 41 +++++++++++++++++++++++++++++++++++++++++
- kernel/feread.cc | 27 +--------------------------
+ Singular/Makefile.in | 8 +++++---
+ kernel/Makefile.in | 17 +++++++++--------
+ kernel/febase.cc | 41 +++++++++++++++++++++++++++++++++++++++++
+ kernel/feread.cc | 27 +--------------------------
4 files changed, 56 insertions(+), 37 deletions(-)
diff --git a/Singular/Makefile.in b/Singular/Makefile.in
-index 890b347..2d55202 100644
+index f1b93ae..8db7465 100644
--- a/Singular/Makefile.in
+++ b/Singular/Makefile.in
@@ -132,7 +132,7 @@ HAVE_MPSR = @HAVE_MPSR@
@@ -43,19 +43,19 @@ index 890b347..2d55202 100644
libsingular: libsingular.${SO_SUFFIX}
diff --git a/kernel/Makefile.in b/kernel/Makefile.in
-index 33fb6d9..edc1e63 100644
+index 78d2b07..727364e 100644
--- a/kernel/Makefile.in
+++ b/kernel/Makefile.in
@@ -91,7 +91,7 @@ endif
# normal C++ source files
- CXXSOURCES=clapconv.cc \
+ CXXSOURCES=bigintmat.cc clapconv.cc \
clapsing.cc \
- febase.cc feread.cc feResource.cc \
+ febase.cc feResource.cc \
ffields.cc hdegree.cc hilb.cc hutil.cc \
sca.cc gring.cc gr_kstd2.cc summator.cc ncSAMult.cc ncSAFormula.cc \
ideals.cc intvec.cc int64vec.cc \
-@@ -119,7 +119,7 @@ CXXSOURCES=clapconv.cc \
+@@ -119,7 +119,7 @@ CXXSOURCES=bigintmat.cc clapconv.cc \
CXXSOURCES2 = SingularBuilder.cpp
# normal C source files
@@ -74,14 +74,14 @@ index 33fb6d9..edc1e63 100644
SOURCES=${CSOURCES} ${CXXSOURCES} \
prCopyTemplate.cc \
-@@ -177,13 +178,13 @@ HEADERS=hutil.h idrec.h stairc.h ideals.h \
+@@ -177,13 +178,13 @@ HEADERS=bigintmat.h hutil.h idrec.h stairc.h ideals.h \
p_Procs_Dynamic.h p_Procs_Impl.h p_Procs_Set.h \
- p_Procs.h p_Procs_Static.h p_Mult_q.h gfan.h
+ p_Procs.h p_Procs_Static.h p_Mult_q.h
-DISTFILES=${SOURCES} ${HEADERS} ${ESOURCES} \
+DISTFILES=${SOURCES} ${HEADERS} ${ESOURCES} ${ECSOURCES} \
Makefile.in \
- mod2.h.in testgh install-sh mkinstalldirs \
+ mkinstalldirs \
prCopy.pl
OBJS := $(CXXSOURCES:.cc=.o) $(CSOURCES:.c=.o) #$(CXXSOURCES2:.cpp=.o)
@@ -111,10 +111,10 @@ index 33fb6d9..edc1e63 100644
ifeq (depend,$(wildcard depend))
diff --git a/kernel/febase.cc b/kernel/febase.cc
-index 6d1bbd4..466a07c 100644
+index 725eca2..971f7fd 100644
--- a/kernel/febase.cc
+++ b/kernel/febase.cc
-@@ -27,6 +27,47 @@
+@@ -26,6 +26,47 @@
#include <kernel/dError.h>
#include <kernel/options.h>
@@ -163,10 +163,10 @@ index 6d1bbd4..466a07c 100644
/*0 implementation */
diff --git a/kernel/feread.cc b/kernel/feread.cc
-index f3e7f12..0b34d0e 100644
+index 8f67c5e..522ed9c 100644
--- a/kernel/feread.cc
+++ b/kernel/feread.cc
-@@ -36,10 +36,6 @@
+@@ -30,10 +30,6 @@
#include <unistd.h>
#endif
@@ -177,7 +177,7 @@ index f3e7f12..0b34d0e 100644
extern char *iiArithGetCmd(int);
/* ===================================================================*/
-@@ -295,23 +291,11 @@ char * fe_fgets_stdin_drl(const char *pr,char *s, int size)
+@@ -289,23 +285,11 @@ char * fe_fgets_stdin_drl(const char *pr,char *s, int size)
}
#endif
@@ -202,7 +202,7 @@ index f3e7f12..0b34d0e 100644
{
#if (defined(HAVE_READLINE) || defined(HAVE_LIBREADLINE)) && !defined(HAVE_DYN_RL) && !defined(HAVE_FEREAD)
/* Allow conditional parsing of the ~/.inputrc file. */
-@@ -399,12 +383,3 @@ static char * fe_fgets_stdin_init(const char *pr,char *s, int size)
+@@ -393,12 +377,3 @@ static char * fe_fgets_stdin_init(const char *pr,char *s, int size)
#endif
}
diff --git a/debian/patches/0012-default-path-settings.patch b/debian/patches/0008-default-path-settings.patch
similarity index 89%
rename from debian/patches/0012-default-path-settings.patch
rename to debian/patches/0008-default-path-settings.patch
index d0a398b..fdf349e 100644
--- a/debian/patches/0012-default-path-settings.patch
+++ b/debian/patches/0008-default-path-settings.patch
@@ -1,4 +1,4 @@
-From 8e1a0ace599552add19f1643ae4930b35e819df0 Mon Sep 17 00:00:00 2001
+From e8dffdd2d0a41af2676cbbed091c69a3cfa04e9a Mon Sep 17 00:00:00 2001
From: "Bernhard R. Link" <brlink at debian.org>
Date: Sat, 25 Feb 2012 13:47:46 +0100
Subject: default path settings
@@ -12,14 +12,14 @@ Subject: default path settings
- remove %b/.. and %r/.. from default search path in order to
not look into /usr/lib/LIB for libraries.
---
- kernel/feResource.cc | 14 ++++++--------
+ kernel/feResource.cc | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/kernel/feResource.cc b/kernel/feResource.cc
-index 5bb750f..445cc6d 100644
+index 01bb816..950929a 100644
--- a/kernel/feResource.cc
+++ b/kernel/feResource.cc
-@@ -76,13 +76,11 @@ static feResourceConfig_s feResourceConfigs[] =
+@@ -75,13 +75,11 @@ static feResourceConfig_s feResourceConfigs[] =
"%b/LIB;"
"%b/MOD;"
"%r/LIB;"
@@ -36,7 +36,7 @@ index 5bb750f..445cc6d 100644
{"DefaultDir",'d', feResDir, "SINGULAR_DEFAULT_DIR", SINGULAR_DEFAULT_DIR, (char *)""},
{"InfoFile", 'i', feResFile, "SINGULAR_INFO_FILE", "%r/info/singular.hlp", (char *)""},
{"IdxFile", 'x', feResFile, "SINGULAR_IDX_FILE", "%r/doc/singular.idx", (char *)""},
-@@ -95,8 +93,8 @@ static feResourceConfig_s feResourceConfigs[] =
+@@ -94,8 +92,8 @@ static feResourceConfig_s feResourceConfigs[] =
{"Path", 'p', feResPath, NULL, "%b;$PATH", (char *)""},
#ifdef ESINGULAR
@@ -47,7 +47,7 @@ index 5bb750f..445cc6d 100644
{"SingularEmacs",'M', feResBinary,"ESINGULAR_SINGULAR", "%b/Singular", (char *)""},
{"EmacsLoad", 'l', feResFile, "ESINGULAR_EMACS_LOAD", "%e/.emacs-singular", (char *)""},
{"EmacsDir", 'e', feResDir, "ESINGULAR_EMACS_DIR", "%r/emacs", (char *)""},
-@@ -105,7 +103,7 @@ static feResourceConfig_s feResourceConfigs[] =
+@@ -104,7 +102,7 @@ static feResourceConfig_s feResourceConfigs[] =
#ifdef ix86_Win
{"rxvt", 'X', feResBinary,"RXVT", "%b/rxvt", (char *)""},
#else
diff --git a/debian/patches/0009-fix-NTL-negate-namespace-issue.patch b/debian/patches/0009-fix-NTL-negate-namespace-issue.patch
new file mode 100644
index 0000000..6389cfe
--- /dev/null
+++ b/debian/patches/0009-fix-NTL-negate-namespace-issue.patch
@@ -0,0 +1,28 @@
+From f904878e4a22df56f70d62070b3478717e644c3c Mon Sep 17 00:00:00 2001
+From: Felix Salfelder <felix at salfelder.org>
+Date: Sun, 14 Jul 2013 08:55:12 +0200
+Subject: fix NTL::negate namespace issue
+
+---
+ factory/cf_chinese.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/factory/cf_chinese.cc b/factory/cf_chinese.cc
+index 2761c95..6ee8215 100644
+--- a/factory/cf_chinese.cc
++++ b/factory/cf_chinese.cc
+@@ -211,12 +211,12 @@ CanonicalForm Farey ( const CanonicalForm & f, const CanonicalForm & q )
+ ZZ NTLc= convertFacCF2NTLZZ (c);
+ bool lessZero= (sign (NTLc) == -1);
+ if (lessZero)
+- negate (NTLc, NTLc);
++ NTL::negate (NTLc, NTLc);
+ ZZ NTLnum, NTLden;
+ if (ReconstructRational (NTLnum, NTLden, NTLc, NTLq, bound, bound))
+ {
+ if (lessZero)
+- negate (NTLnum, NTLnum);
++ NTL::negate (NTLnum, NTLnum);
+ CanonicalForm num= convertNTLZZX2CF (to_ZZX (NTLnum), Variable (1));
+ CanonicalForm den= convertNTLZZX2CF (to_ZZX (NTLden), Variable (1));
+ On (SW_RATIONAL);
diff --git a/debian/patches/0010-install-factory.h-where-libfac-expects-it.patch b/debian/patches/0010-install-factory.h-where-libfac-expects-it.patch
new file mode 100644
index 0000000..e390b85
--- /dev/null
+++ b/debian/patches/0010-install-factory.h-where-libfac-expects-it.patch
@@ -0,0 +1,22 @@
+From 80af528c075a9215ceb425f9221350be1a184fc3 Mon Sep 17 00:00:00 2001
+From: Felix Salfelder <felix at salfelder.org>
+Date: Mon, 15 Jul 2013 20:34:30 +0200
+Subject: install factory.h where libfac expects it.
+
+---
+ factory/GNUmakefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/factory/GNUmakefile.in b/factory/GNUmakefile.in
+index ad740c9..f2b9c96 100644
+--- a/factory/GNUmakefile.in
++++ b/factory/GNUmakefile.in
+@@ -549,7 +549,7 @@ installcf: cf
+ $(INSTALL_DATA) $(libfactory) $(DESTDIR)$(libdir)/$(libfactory)
+ -$(INSTALL_DATA) libsingcf_g.a $(DESTDIR)$(libdir)/libsingcf_g.a
+ -$(INSTALL_DATA) libsingcf_p.a $(DESTDIR)$(libdir)/libsingcf_p.a
+- $(INSTALL_DATA) factory.h $(DESTDIR)$(includedir)/factory.h
++ $(INSTALL_DATA) factory.h $(DESTDIR)$(includedir)/factory/factory.h
+ $(INSTALL_DATA) cf_gmp.h $(DESTDIR)$(includedir)/factory/cf_gmp.h
+ $(INSTALL_DATA) factoryconf.h $(DESTDIR)$(includedir)/factory/factoryconf.h
+ # FIXME: what is templatedir?
diff --git a/debian/patches/0013-fix-licence-of-minpoly.-GPL.patch b/debian/patches/0013-fix-licence-of-minpoly.-GPL.patch
deleted file mode 100644
index 277cc2e..0000000
--- a/debian/patches/0013-fix-licence-of-minpoly.-GPL.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 27e029636862d5ac4d8c20c466d37e79f762e7f8 Mon Sep 17 00:00:00 2001
-From: Hans Schoenemann <hannes at mathematik.uni-kl.de>
-Date: Tue, 24 Apr 2012 15:06:48 +0200
-Subject: fix: licence of minpoly.*: GPL
-
-Von: Sebastian Jambor <sebastian at momo.math.rwth-aachen.de>
-Datum: 23. April 2012 17:44:14 MESZ
-An: pfister at mathematik.uni-kl.de
-Betreff: Copyright
-> Lieber Gerhard,
->
-> Mohamed hat mir die Mail bezueglich Copyright weitergeleitet. Ich wusste
-> nicht, dass das Probleme bereiten wuerde. Von mir aus koennt ihr den Code
-> unter die GPL setzen (oder auch unter jede andere Lizenz, die euch sinnvoll
-> erscheint). Es waere nur nett, wenn ich irgendwo als Autor auftauchen wuerde.
->
-> Viele Gruesse
-> Sebastian
----
- Singular/minpoly.cc | 9 +++++----
- Singular/minpoly.h | 3 ++-
- 2 files changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/Singular/minpoly.cc b/Singular/minpoly.cc
-index 8538700..8bc7018 100644
---- a/Singular/minpoly.cc
-+++ b/Singular/minpoly.cc
-@@ -1,7 +1,8 @@
--/***********************************************
-- * Copyright (C) 2011 Sebastian Jambor *
-- * sebastian at momo.math.rwth-aachen.de *
-- ***********************************************/
-+/*************************************************
-+ * Author: Sebastian Jambor, 2011 *
-+ * GPL (email from 23. April 2012 17:44:14 MESZ) *
-+ * sebastian at momo.math.rwth-aachen.de *
-+ ************************************************/
-
-
- #include<cmath>
-diff --git a/Singular/minpoly.h b/Singular/minpoly.h
-index 8e910b6..28d0f98 100644
---- a/Singular/minpoly.h
-+++ b/Singular/minpoly.h
-@@ -1,5 +1,6 @@
- /***********************************************************************************
-- * Copyright (C) 2011 Sebastian Jambor *
-+ * Author: Sebastian Jambor, 2011 *
-+ * (C) GPL (email from 23. April 2012 17:44:14 MESZ) *
- * sebastian at momo.math.rwth-aachen.de *
- * *
- * Implementation of an algorithm to compute the minimal polynomial of a *
diff --git a/debian/patches/series b/debian/patches/series
index d6f8803..97877e1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,13 +1,10 @@
-0001-avoid-segfault-in-internal-help-parser.patch
-0002-tag-MP-using-examples.patch
-0003-tag-more-examples.patch
-0004-mark-hidden-sub-makes-in-doc.patch
-0005-tag-gfan-using-examples.patch
-0006-use-DESTDIR-as-a-pre-prefix-in-install-targets.patch
-0007-add-working-all-target-to-Makefile.in.patch
-0008-miscellaneous-Makefile.in-patches.patch
-0009-assert-needs-to-be-defined-after-include-assert.h.patch
-0010-keep-mod2.h-in-Singular.patch
-0011-move-libreadline-to-main-binary.patch
-0012-default-path-settings.patch
-0013-fix-licence-of-minpoly.-GPL.patch
+0001-tag-gfan-using-examples.patch
+0002-use-DESTDIR-as-a-pre-prefix-in-install-targets.patch
+0003-add-working-all-target-to-Makefile.in.patch
+0004-miscellaneous-Makefile.in-patches.patch
+0005-assert-needs-to-be-defined-after-include-assert.h.patch
+0006-keep-mod2.h-in-Singular.patch
+0007-move-libreadline-to-main-binary.patch
+0008-default-path-settings.patch
+0009-fix-NTL-negate-namespace-issue.patch
+0010-install-factory.h-where-libfac-expects-it.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/singular.git
More information about the debian-science-commits
mailing list