[SCM] an open source computer algebra system branch, debian, updated. 3f1c419ac4981d4babdd737ac18bd16c080a761a
Bernhard R. Link
brlink at debian.org
Sat Mar 3 21:58:07 UTC 2012
The following commit has been merged in the debian branch:
commit 6d2f91281ea311cd98d439f157ed8c7fdc0abf8b
Author: Bernhard R. Link <brlink at debian.org>
Date: Sat Mar 3 11:37:24 2012 +0100
tag more examples in documentation to be able to built it on Debian
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 28f7660..3941320 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,5 +1,5 @@
# see git-dpm(1) from git-dpm package
-8540879674bcba6e1b5f6f4c1439439586fc55fa
+72d7d5a0c878cdb7c0d54c835e210b71f92f9259
72d7d5a0c878cdb7c0d54c835e210b71f92f9259
af80c455bead480e8e21703ac28b5a5965265887
af80c455bead480e8e21703ac28b5a5965265887
diff --git a/debian/patches/0011-tag-MP-using-examples.patch b/debian/patches/0011-tag-MP-using-examples.patch
new file mode 100644
index 0000000..d713d60
--- /dev/null
+++ b/debian/patches/0011-tag-MP-using-examples.patch
@@ -0,0 +1,97 @@
+From 1a8090bb38c2e2f323ff52980789c04bdc3e03c6 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.
+---
+ 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/0012-tag-gfan-using-examples.patch b/debian/patches/0012-tag-gfan-using-examples.patch
new file mode 100644
index 0000000..6173041
--- /dev/null
+++ b/debian/patches/0012-tag-gfan-using-examples.patch
@@ -0,0 +1,447 @@
+From 7f413a32db09b1a62c5546af1e1432bb47eceed4 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
+
+Tag all examples in cones.doc, so that the manual can be built
+even if compiled without gfan support.
+---
+ doc/cones.doc | 96 ++++++++++++++++++++++++++++----------------------------
+ 1 files changed, 48 insertions(+), 48 deletions(-)
+
+diff --git a/doc/cones.doc b/doc/cones.doc
+index 0a6b855..944d2f1 100644
+--- a/doc/cones.doc
++++ b/doc/cones.doc
+@@ -53,7 +53,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
+- at c example
++ at c example tag:gfan
+ // 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,
+ if either bit is 0, then program computes the information itself.
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ // 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
+ canonicalized version of the cone, no more redundant inequalities and equations
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[11][3]=
+ 0,-1,1,
+ -1,1,0,
+@@ -284,7 +284,7 @@ cone
+ local version of the given cone around the given point of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[3][3]=
+ 1,0,0,
+ 0,1,0,
+@@ -316,7 +316,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
+- at c example
++ at c example tag:gfan
+ intmat M[2][2]=
+ 1,0,
+ 0,1;
+@@ -353,7 +353,7 @@ int
+ 1 iff the cone contains a point with positive coordinates in its relative interior; 0 otherwise
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,1,
+ 1,-1;
+@@ -381,7 +381,7 @@ int
+ 1 iff the given cone contains the given point in its relative interior; 0 otherwise
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[2][2]=
+ 1,0,
+ 0,1;
+@@ -409,7 +409,7 @@ int
+ ambient dimension of the cone;
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,0,
+ 0,1;
+@@ -439,7 +439,7 @@ int
+ codimension of the cone;
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[1][2]=
+ 1,0;
+ cone c1=coneViaRays(M1);
+@@ -467,7 +467,7 @@ int
+ dimension of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[1][2]=
+ 1,0;
+ cone c1=coneViaRays(M1);
+@@ -493,7 +493,7 @@ cone
+ the dual of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,0,
+ 0,1;
+@@ -526,7 +526,7 @@ intmat
+ equations given by the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,0,
+ 0,1;
+@@ -556,7 +556,7 @@ intmat
+ inner normal vectors of the facets of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,0,
+ 0,1;
+@@ -586,7 +586,7 @@ intmat
+ generating vectors of the lineality space of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[5][3]=
+ 1,0,0,
+ 0,1,0,
+@@ -613,7 +613,7 @@ intmat
+ generating vectors of the span of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[3][5]=
+ 1,0,0,0,0,
+ 0,1,0,0,0,
+@@ -638,7 +638,7 @@ intmat
+ generating vectors of the orthogonal complement of the span of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[3][5]=
+ 1,0,0,0,0,
+ 0,1,0,0,0,
+@@ -663,7 +663,7 @@ intmat
+ inequalities given by the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,0,
+ 0,1;
+@@ -693,7 +693,7 @@ int
+ dimension of the lineality space of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[3][3]=
+ 1,0,0,
+ 0,1,0,
+@@ -724,7 +724,7 @@ cone
+ the lineality space of the cone as a new cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[3][3]=
+ 1,0,0,
+ 0,1,0,
+@@ -758,7 +758,7 @@ intvec
+ linear forms of the cone (can be set by setLinearForms); returns empty intmat 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;
+@@ -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
+ the negated (or negative) of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[2][2]=
+ 1,0,
+ 0,1;
+@@ -835,7 +835,7 @@ int
+ quotient of Z^n intersected with the span of the cone with Z^n intersected with its lineality space
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[3][2]=
+ 1,0,
+ 0,1,
+@@ -860,7 +860,7 @@ intmat
+ rays of the cone outside the lineality space, rays inside the lineality space will be ignored
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,0,
+ 0,1;
+@@ -891,7 +891,7 @@ intvec
+ point in the relative interior of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ 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)
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[3][2]=
+ 1,0,
+ 0,1,
+@@ -943,7 +943,7 @@ intvec
+ special-purpose interior point which supports recognition of symmetries among non-intersecting cones (used in implementation of fans)
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,0,
+ 0,1;
+@@ -971,7 +971,7 @@ int
+ 1 iff c1 contains c2 as a face; 0 otherwise
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[2][2]=
+ 1,0,
+ 0,1;
+@@ -1001,7 +1001,7 @@ cone
+ the intersection of the two cones
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,0,
+ 0,1;
+@@ -1040,7 +1040,7 @@ int
+ 1 iff the cone is the entire ambient space; 0 otherwise
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ cone c1;
+ isFullSpace(c1);
+ intmat M2[2][2]=
+@@ -1072,7 +1072,7 @@ int
+ 1 iff the cone is just the origin of the ambient space; 0 otherwise
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ cone c1; // full cone in zero-dimensional ambient space
+ isOrigin(c1);
+ intmat M2[2][2]=
+@@ -1105,7 +1105,7 @@ int
+ 1 iff the cone resp. fan is simplicial; 0 otherwise
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[3][3]=
+ 1,0,0,
+ 0,1,0,
+@@ -1154,7 +1154,7 @@ isSimplicial(f);
+ adds the information of a linear form to the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[2][3]=
+ -1,0,0,
+ 0,-1,0;
+@@ -1180,7 +1180,7 @@ getLinearForms(c);
+ adds the information of a multiplicity to the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[2][3]=
+ -1,0,0,
+ 0,-1,0;
+@@ -1321,7 +1321,7 @@ cone
+ 1 iff c is contained in the collection of cones that is f; 0 otherwise
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ fan f=emptyFan(2);
+ intmat M[2][2]=
+ 1,0,
+@@ -1347,7 +1347,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
+- at c example
++ at c example tag:gfan
+ 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
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ fan f=emptyFan(3);
+ f;
+ intmat M[3][3]=
+@@ -1403,7 +1403,7 @@ int
+ 1 iff cone is compatible with the fan; 0 otherwise
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ fan f=emptyFan(3);
+ intmat M1[3][3]=
+ 1,0,0,
+@@ -1441,7 +1441,7 @@ isCompatible(f,c3);
+ @c 1 iff the fan is complete; 0 otherwise
+ @c @item @strong{Example:}
+ @c @smallexample
+- at c @c example
++ at c @c example tag:gfan
+ @c fan f=fullFan(2);
+ @c isComplete(f);
+ @c fan g=emptyFan(2);
+@@ -1481,7 +1481,7 @@ int
+ 1 iff the fan is pure; 0 otherwise
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ fan f=fullFan(2);
+ isPure(f);
+ fan g=emptyFan(2);
+@@ -1513,7 +1513,7 @@ int
+ number of maximal cones in f
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ fan f=emptyFan(3);
+ nmaxcones(f);
+ intmat M1[3][3]=
+@@ -1546,7 +1546,7 @@ int
+ number of cones in f
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ fan f=emptyFan(3);
+ ncones(f);
+ intmat M1[3][3]=
+@@ -1579,7 +1579,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
+- at c example
++ at c example tag:gfan
+ 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
+ @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,
+ if flags is 0, then program computes the information itself.
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ // 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,
+ if either bit is 0, then program computes the information itself.
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat IE[2][3]=
+ 1,0,0,
+ 0,1,0;
+@@ -1752,7 +1752,7 @@ intmat
+ vertices of p
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[4][3]=
+ 1,0,0,
+ 1,2,0,
diff --git a/debian/patches/0013-tag-more-examples.patch b/debian/patches/0013-tag-more-examples.patch
new file mode 100644
index 0000000..c625c8b
--- /dev/null
+++ b/debian/patches/0013-tag-more-examples.patch
@@ -0,0 +1,142 @@
+From 735beb2a8d5414b069d0c4a6ab66e1318e3c4920 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.
+---
+ 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/0014-add-doc-submakes.patch b/debian/patches/0014-add-doc-submakes.patch
new file mode 100644
index 0000000..404723a
--- /dev/null
+++ b/debian/patches/0014-add-doc-submakes.patch
@@ -0,0 +1,37 @@
+From 72d7d5a0c878cdb7c0d54c835e210b71f92f9259 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: add doc submakes
+
+Add a + before commands invoking sub makes in doc/Makefile.in to
+avoid jobserver warnings.
+---
+ doc/Makefile.in | 8 ++++----
+ 1 files 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/series b/debian/patches/series
index 383871d..d42608a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,7 @@
0008-assert-needs-to-be-defined-after-include-assert.h.patch
0009-keep-mod2.h-in-Singular.patch
0010-move-libreadline-to-main-binary.patch
+0011-tag-MP-using-examples.patch
+0012-tag-gfan-using-examples.patch
+0013-tag-more-examples.patch
+0014-add-doc-submakes.patch
--
an open source computer algebra system
More information about the debian-science-commits
mailing list