[singular] 04/04: Imported Debian patch 4.0.3+ds-1
Jerome Benoit
calculus-guest at moszumanska.debian.org
Tue Feb 23 02:58:37 UTC 2016
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository singular.
commit 3e24e9a78a0ba86e05df88255d86173ba237ff4c
Author: Jerome Benoit <calculus at rezozer.net>
Date: Tue Feb 23 03:57:44 2016 +0100
Imported Debian patch 4.0.3+ds-1
---
debian/changelog | 16 +-
debian/control | 35 +-
debian/copyright | 6 +-
debian/libsingular4-dbg.lintian-overrides | 2 -
debian/patches/debianization-gather-headers.patch | 8 +-
.../patches/debianization-rename-libraries.patch | 2 +-
debian/patches/debianization.patch | 8 +-
debian/patches/series | 3 +-
debian/patches/upstream-autotools-help2man.patch | 2 +-
.../upstream-lintian-spelling-error-silence.patch | 546 +++++++++++++++++++++
...eam-neutralize-tests-singular_dm_syzextra.patch | 40 --
debian/patches/upstream-tests-omalloc-harden.patch | 91 ----
debian/rules | 3 -
13 files changed, 589 insertions(+), 173 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0722d4e..4711bb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,19 @@
-singular (4.0.3+ds-0) UNRELEASED; urgency=medium
+singular (4.0.3+ds-1) unstable; urgency=medium
+ * New upstream version.
* Debianization:
- - debian/repack, harden.
+ - debian/control:
+ - Standards Version, bump to 3.9.7 (no change);
+ - Homepage and Vcs-* fields, secure;
+ - debug symbol package, drop off in favour of automatic generation;
+ - upgrade scheme, harden (Closes: #800961);
+ - debian/copyright, refresh;
+ - debian/rules:
+ - debug symbol package, drop off in favour of automatic generation;
+ - debian/repack, harden;
+ - minor fix (submitted).
- -- Jerome Benoit <calculus at rezozer.net> Mon, 22 Feb 2016 22:32:17 +0000
+ -- Jerome Benoit <calculus at rezozer.net> Tue, 23 Feb 2016 02:55:40 +0000
singular (4.0.2-p2+ds-3) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 28591c4..1286ea6 100644
--- a/debian/control
+++ b/debian/control
@@ -13,10 +13,10 @@ Build-Depends:
Build-Depends-Indep:
doxygen,
rdfind, symlinks
-Standards-Version: 3.9.6
-Homepage: http://www.singular.uni-kl.de/
-Vcs-Git: git://anonscm.debian.org/debian-science/packages/singular.git
-Vcs-Browser: http://anonscm.debian.org/cgit/debian-science/packages/singular.git
+Standards-Version: 3.9.7
+Homepage: https://www.singular.uni-kl.de/
+Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/singular.git
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/singular.git
Package: singular
Architecture: any
@@ -63,6 +63,8 @@ Section: libdevel
Architecture: all
Depends: ${misc:Depends}
Multi-Arch: foreign
+Replaces: libsingular-dev (<< 4), libsingular-3-0-4-3
+Breaks: libsingular-dev (<< 4), libsingular-3-0-4-3
Description: Computer Algebra System for Polynomial Computations -- common dev package
SINGULAR is a Computer Algebra System (CAS) for polynomial computations with
emphasis on the special needs of commutative algebra, algebraic geometry,
@@ -76,6 +78,8 @@ Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends: libsingular4 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Multi-Arch: same
+Replaces: singular (<< 4), libsingular (<< 4), libsingular-3-0-4-3
+Breaks: singular (<< 4), libsingular (<< 4), libsingular-3-0-4-3
Description: Computer Algebra System for Polynomial Computations -- module package
SINGULAR is a Computer Algebra System (CAS) for polynomial computations with
emphasis on the special needs of commutative algebra, algebraic geometry,
@@ -92,6 +96,8 @@ Recommends:
python-polybori (>= 0.8.3)
Suggests: graphicsmagick-imagemagick-compat | imagemagick
Multi-Arch: foreign
+Replaces: singular (<< 4), libsingular (<< 4), libsingular-3-0-4-3
+Breaks: singular (<< 4), libsingular (<< 4), libsingular-3-0-4-3
Description: Computer Algebra System for Polynomial Computations -- shared data
SINGULAR is a Computer Algebra System (CAS) for polynomial computations with
emphasis on the special needs of commutative algebra, algebraic geometry,
@@ -104,6 +110,8 @@ Architecture: any
Depends: libsingular4 (= ${binary:Version}), singular-data (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: singular-modules (= ${binary:Version})
Multi-Arch: foreign
+Replaces: singular (<< 4)
+Breaks: singular (<< 4)
Description: Computer Algebra System for Polynomial Computations -- console user interface
SINGULAR is a Computer Algebra System (CAS) for polynomial computations with
emphasis on the special needs of commutative algebra, algebraic geometry,
@@ -115,6 +123,8 @@ Package: singular-ui-emacs
Architecture: any
Depends: singular-ui (= ${binary:Version}), emacs, ${shlibs:Depends}, ${misc:Depends}
Multi-Arch: foreign
+Replaces: singular (<< 4)
+Breaks: singular (<< 4)
Description: Computer Algebra System for Polynomial Computations -- emacs user interface
SINGULAR is a Computer Algebra System (CAS) for polynomial computations with
emphasis on the special needs of commutative algebra, algebraic geometry,
@@ -126,6 +136,8 @@ Package: singular-ui-xterm
Architecture: any
Depends: singular-ui (= ${binary:Version}), xterm, ${shlibs:Depends}, ${misc:Depends}
Multi-Arch: foreign
+Replaces: singular (<< 4)
+Breaks: singular (<< 4)
Description: Computer Algebra System for Polynomial Computations -- xterm user interface
SINGULAR is a Computer Algebra System (CAS) for polynomial computations with
emphasis on the special needs of commutative algebra, algebraic geometry,
@@ -134,21 +146,6 @@ Description: Computer Algebra System for Polynomial Computations -- xterm user i
This package contains the SINGULAR command-line interface within a (new)
terminal window.
-Package: libsingular4-dbg
-Provides: libsingular-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: libsingular4 (= ${binary:Version}), ${misc:Depends}
-Conflicts: libsingular-dbg
-Multi-Arch: same
-Description: Computer Algebra System for Polynomial Computations -- debug symbols package
- SINGULAR is a Computer Algebra System (CAS) for polynomial computations with
- emphasis on the special needs of commutative algebra, algebraic geometry,
- and singularity theory.
- .
- This package provides the debugging symbols.
-
Package: singular-doc
Section: doc
Architecture: all
diff --git a/debian/copyright b/debian/copyright
index 9064cac..9ba2fb1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
Upstream-Name: singular
Upstream-Contact: Singular Team <singular at mathematik.uni-kl.de>
-Source: http://www.singular.uni-kl.de/
+Source: https://www.singular.uni-kl.de/
Comment:
The upstream source tarball is repacked to drop off the regenerated material
(mainly autotools related) and material provided by other packages (mainly
@@ -9,7 +9,7 @@ Comment:
Files: *
Copyright:
- 1986-2015 Singular Team <singular at mathematik.uni-kl.de>
+ 1986-2016 Singular Team <singular at mathematik.uni-kl.de>
Wolfram Decker
Gert-Martin Greuel
Gerhard Pfister
@@ -142,7 +142,7 @@ License: public-domain
Files: debian/*
Copyright:
- 2014-2015 Jerome Benoit <calculus at rezozer.net>
+ 2014-2016 Jerome Benoit <calculus at rezozer.net>
2008-2009 Tim Abbott <tabbott at mit.edu>
License: GPL-3+
Comment:
diff --git a/debian/libsingular4-dbg.lintian-overrides b/debian/libsingular4-dbg.lintian-overrides
deleted file mode 100644
index 0e801a4..0000000
--- a/debian/libsingular4-dbg.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# the upstream source ball contains only EMPTY ChangeLog files
-libsingular4-dbg: no-upstream-changelog
diff --git a/debian/patches/debianization-gather-headers.patch b/debian/patches/debianization-gather-headers.patch
index b8ec50e..bda12c1 100644
--- a/debian/patches/debianization-gather-headers.patch
+++ b/debian/patches/debianization-gather-headers.patch
@@ -107,7 +107,7 @@ Last-Update: 2014-12-28
--- a/libpolys/coeffs/Makefile.am
+++ b/libpolys/coeffs/Makefile.am
-@@ -20,7 +20,7 @@
+@@ -21,7 +21,7 @@
libcoeffs_la_SOURCES = $(SOURCES)
@@ -239,9 +239,9 @@ Last-Update: 2014-12-28
--- a/Makefile.am
+++ b/Makefile.am
-@@ -28,7 +28,7 @@
- $(srcdir)/git-version-gen $(srcdir)/.tarball-git-version > $(distdir)/.tarball-git-version
-
+@@ -32,7 +32,7 @@
+ -mkdir $(datadir)/info
+ -mv $(datadir)/singular/singular.hlp $(datadir)/info/.
-configheaderdir = ${includedir}/$(DEB_HOST_MULTIARCH)/singular
+configheaderdir = ${includedir}/$(DEB_HOST_MULTIARCH)/singular/singular
diff --git a/debian/patches/debianization-rename-libraries.patch b/debian/patches/debianization-rename-libraries.patch
index 56bffa8..c24c7a2 100644
--- a/debian/patches/debianization-rename-libraries.patch
+++ b/debian/patches/debianization-rename-libraries.patch
@@ -156,7 +156,7 @@ Last-Update: 2015-10-15
libparse_LDFLAGS = ${AM_LDFLAGS}
%.1: %
-@@ -253,7 +253,7 @@
+@@ -255,7 +255,7 @@
check_PROGRAMS=$(TESTS)
test_SOURCES = test.cc
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index e1e0191..c435dc5 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -15,11 +15,11 @@ Last-Update: 2015-10-15
-dox emacs redhat desktop
+dox emacs desktop
- EXTRA_DIST = README README.md README.pkg autogen.sh git-version-gen doxy redhat/singular.spec.in GPL2 GPL3
-
-@@ -28,7 +28,7 @@
- $(srcdir)/git-version-gen $(srcdir)/.tarball-git-version > $(distdir)/.tarball-git-version
+ EXTRA_DIST = README README.md README.pkg autogen.sh git-version-gen doxy redhat/singular.spec.in GPL2 GPL3 doc/doc.tbz2
+@@ -32,7 +32,7 @@
+ -mkdir $(datadir)/info
+ -mv $(datadir)/singular/singular.hlp $(datadir)/info/.
-configheaderdir = ${includedir}/singular
+configheaderdir = ${includedir}/$(DEB_HOST_MULTIARCH)/singular
diff --git a/debian/patches/series b/debian/patches/series
index 039a208..b74bb84 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
-upstream-tests-omalloc-harden.patch
+upstream-lintian-spelling-error-silence.patch
upstream-tests-omalloc-getlucky.patch
-upstream-neutralize-tests-singular_dm_syzextra.patch
upstream-autotools-help2man.patch
upstream-autotools-help2man-extra.patch
debianization.patch
diff --git a/debian/patches/upstream-autotools-help2man.patch b/debian/patches/upstream-autotools-help2man.patch
index 1713c33..63a54aa 100644
--- a/debian/patches/upstream-autotools-help2man.patch
+++ b/debian/patches/upstream-autotools-help2man.patch
@@ -86,7 +86,7 @@ Last-Update: 2015-10-15
dist-hook:
$(srcdir)/git-version-gen $(srcdir)/.tarball-git-version > $(distdir)/.tarball-git-version
-@@ -21,7 +32,14 @@
+@@ -25,7 +36,14 @@
nodist_configheader_HEADERS = singularconfig.h
DISTCLEANFILES = $(nodist_configheader_HEADERS)
diff --git a/debian/patches/upstream-lintian-spelling-error-silence.patch b/debian/patches/upstream-lintian-spelling-error-silence.patch
new file mode 100644
index 0000000..b525d1e
--- /dev/null
+++ b/debian/patches/upstream-lintian-spelling-error-silence.patch
@@ -0,0 +1,546 @@
+Description: source typo
+ Correct spelling error as reported by lintian in some binraries;
+ meant to silence lintian and eventually to be submitted to the
+ upstream maintainer.
+Origin: debian
+Forwarded: https://github.com/Singular/Sources/pull/749
+Comment: spelling-error-in-binary
+Author: Jerome Benoit <calculus at rezozer.net>
+Last-Update: 2016-02-23
+
+--- a/IntegerProgramming/Buchberger.cc
++++ b/IntegerProgramming/Buchberger.cc
+@@ -1490,7 +1490,7 @@
+
+ first_iter.set_to_list(aux_list);
+ found=0;
+- // no reduction occured yet
++ // no reduction occurred yet
+
+ while(first_iter.is_at_end()==FALSE)
+ {
+@@ -1606,7 +1606,7 @@
+ {
+ first_iter.set_to_list(new_generators);
+ found=0;
+- // no reduction occured yet
++ // no reduction occurred yet
+
+ while(first_iter.element_is_marked_head_reduced()==FALSE)
+ // only the first element is tested for this flag
+@@ -2056,7 +2056,7 @@
+ {
+ first_iter.set_to_list(generators);
+ found=0;
+- // no reduction occured yet
++ // no reduction occurred yet
+
+ while(first_iter.element_is_marked_head_reduced()==FALSE)
+ // only the first element is tested for this flag
+--- a/IntegerProgramming/ideal.h
++++ b/IntegerProgramming/ideal.h
+@@ -118,7 +118,7 @@
+ // occurred:
+ // -1 indicates a "semantic" error (which occurs e.g. if some constructor
+ // argument is out of range)
+- // -2 indicates an error occured when reading from a file
++ // -2 indicates an error occurred when reading from a file
+ // -3 indicates an overflow of an integer type variable
+
+
+--- a/IntegerProgramming/matrix.h
++++ b/IntegerProgramming/matrix.h
+@@ -37,7 +37,7 @@
+ // Also used as error flag (values <0):
+ // -1 indicates a "semantic" error (which occurs e.g. if some constructor
+ // argument is out of range)
+- // -2 indicates an error occured when reading from a file
++ // -2 indicates an error occurred when reading from a file
+
+ Integer **coefficients;
+ // the matrix entries
+@@ -50,7 +50,7 @@
+ int _kernel_dimension;
+ // the number of vectors stored in H (the size of these vectors is columns)
+ // If _kernel_dimension==-2, no kernel basis has been computed yet.
+- // If _kernel_dimension==-1, an error has occured during the kernel basis
++ // If _kernel_dimension==-1, an error has occurred during the kernel basis
+ // computation.
+
+
+--- a/IntegerProgramming/term_ordering.h
++++ b/IntegerProgramming/term_ordering.h
+@@ -50,7 +50,7 @@
+ // Also the "error flag", i.e. values <0 indicate an error:
+ // -1 indicates a "semantic" error (arguments out of range, for example a
+ // negative number of variables);
+- // -2 indicates an error occured when reading from a file.
++ // -2 indicates an error occurred when reading from a file.
+
+ short weighted_ordering;
+ // the term ordering refining the weight on the weighted variables
+--- a/Singular/LIB/decodegb.lib
++++ b/Singular/LIB/decodegb.lib
+@@ -859,7 +859,7 @@
+ "USAGE: errorInsert(y,pos,val); y is matrix, pos,val are list of int's
+ @format
+ - y is a (code) word,
+- - pos = positions where errors occured,
++ - pos = positions where errors occurred,
+ - val = their corresponding values
+ @end format
+ RETURN: corresponding received word
+--- a/Singular/LIB/equising.lib
++++ b/Singular/LIB/equising.lib
+@@ -1765,9 +1765,9 @@
+ dbprint(i_print,"// finished");
+ dbprint(i_print,"// ");
+
+- if (M[2]==1) // error occured during esStratum computation
++ if (M[2]==1) // error occurred during esStratum computation
+ {
+- print("Some error has occured during the computation");
++ print("Some error has occurred during the computation");
+ return(list(0,0));
+ }
+
+@@ -1914,14 +1914,14 @@
+ l[1][2]=ideal defining the part of the equisingularity stratum where all
+ equimultiple sections through the non-nodes of the reduced total
+ transform are trivial sections
+- l[2]=1 if some error has occured, l[2]=0 otherwise;
++ l[2]=1 if some error has occurred, l[2]=0 otherwise;
+ @end format
+ or consisting of a ring and an integer, where
+ @format
+ l[1]=ESSring is a ring extension of basering containing the ideal ES
+ (describing the ES-stratum), the ideal ES_all_triv (describing the
+ part with trival equimultiple sections) and the polynomial p_F=F,
+- l[2]=1 if some error has occured, l[2]=0 otherwise.
++ l[2]=1 if some error has occurred, l[2]=0 otherwise.
+ @end format
+ NOTE: L is supposed to be the output of hnexpansion (with the given ordering
+ of the variables appearing in f). @*
+--- a/Singular/LIB/groups.lib
++++ b/Singular/LIB/groups.lib
+@@ -940,7 +940,7 @@
+ l[1] the ideal I. Te generators of I are the generators of the
+ input ideal devided by the part of the content which have
+ prime factors less then 32003.
+- l[2] contains the prime numbers which occured in the division
++ l[2] contains the prime numbers which occurred in the division
+ EXAMPLE: example contentS; shows an example
+ "
+
+--- a/Singular/LIB/hnoether.lib
++++ b/Singular/LIB/hnoether.lib
+@@ -2881,7 +2881,7 @@
+ second entry = 0 if no change of base ring necessary
+ 1 if change of base ring necessary
+ third entry = numbers of conjugates ( if essential = 1 )
+- if some error has occured, the empty list is returned
++ if some error has occurred, the empty list is returned
+ "
+ {
+ def altring = basering;
+--- a/Singular/LIB/hyperel.lib
++++ b/Singular/LIB/hyperel.lib
+@@ -467,7 +467,7 @@
+ *(P[size(P)][1], P[size(P)][2]) - (*)infty=div(a(x)-b(x)y)
+ if there is an optional parameter s!=0, then divisor additonally
+ returns a parameter, which says, whether irreducible polynomials
+- occured during computations or not. Otherwise only warnings are
++ occurred during computations or not. Otherwise only warnings are
+ displayed on the monitor. For s=0 nothing happens.
+ Curve C: y^2+h(x)y=f(x) is defined over basering.
+ EXAMPLE: example divisor; shows an example
+@@ -664,7 +664,7 @@
+ D1,s1=divisor(D[1],0,h,f,1);
+ D2,s2=divisor(D[2],1,h,f,1);
+
+- // Only if irreducible polynomials occured in D1 !and! D2 a warning
++ // Only if irreducible polynomials occurred in D1 !and! D2 a warning
+ // is necessary.
+ if (s1==1 and s2==1)
+ {
+--- a/Singular/LIB/presolve.lib
++++ b/Singular/LIB/presolve.lib
+@@ -938,7 +938,7 @@
+ n = size(L[1]); // number of new variables
+ if( n == 0 )
+ {
+- dbprint( pr,"","// no variable occured in "+typeof(id)+", no change of ring!");
++ dbprint( pr,"","// no variable occurred in "+typeof(id)+", no change of ring!");
+ return(id);
+ }
+ if( n == nvars(P) )
+--- a/Singular/LIB/reesclos.lib
++++ b/Singular/LIB/reesclos.lib
+@@ -215,7 +215,7 @@
+ }
+ else
+ {
+- "// Compute the closure up to the maximal power of t that occured:",pow;
++ "// Compute the closure up to the maximal power of t that occurred:",pow;
+ }
+ }
+
+--- a/Singular/LIB/resolve.lib
++++ b/Singular/LIB/resolve.lib
+@@ -3890,7 +3890,7 @@
+ RETURN: a list l of 2 lists of rings
+ l[1][i] is a ring containing a basic object BO, the result of the
+ resolution.
+- l[2] contains all rings which occured during the resolution process
++ l[2] contains all rings which occurred during the resolution process
+ NOTE: result may be viewed in a human readable form using presentTree()
+ EXAMPLE: example resolve; shows an example
+ "
+--- a/Singular/LIB/tropical.lib
++++ b/Singular/LIB/tropical.lib
+@@ -596,7 +596,7 @@
+ // test now if the LIFT has the correct valuation !!!
+ // note: it may happen, that when resubstituting PARA into
+ // the replacement rules
+- // there occured some unexpected cancellation;
++ // there occurred some unexpected cancellation;
+ // we only know that for SOME
+ // solution of the zero-dimensional reduction NO
+ // canellation will occur,
+--- a/Singular/dyn_modules/pyobject/pyobject.cc
++++ b/Singular/dyn_modules/pyobject/pyobject.cc
+@@ -238,7 +238,7 @@
+ PyObject *pType, *pMessage, *pTraceback;
+ PyErr_Fetch(&pType, &pMessage, &pTraceback);
+
+- WerrorS("pyobject error occured");
++ WerrorS("pyobject error occurred");
+ WerrorS(PyString_AsString(pMessage));
+
+ Py_XDECREF(pType);
+--- a/Singular/emacs.cc
++++ b/Singular/emacs.cc
+@@ -87,7 +87,7 @@
+ {
+ error("YOU HAVE FOUND A BUG IN SINGULAR.\n"
+ "Please, email the following output to singular at mathematik.uni-kl.de\n"
+-"Bug occured at %s:%d\n"
++"Bug occurred at %s:%d\n"
+ "Message: %s\n"
+ "Version: " S_UNAME VERSION __DATE__ __TIME__,
+ file, line, msg);
+--- a/Singular/iplib.cc
++++ b/Singular/iplib.cc
+@@ -918,7 +918,7 @@
+ yylplex(newlib, libnamebuf, &lib_style, pl, autoexport);
+ if(yylp_errno)
+ {
+- Werror("Library %s: ERROR occured: in line %d, %d.", newlib, yylplineno,
++ Werror("Library %s: ERROR occurred: in line %d, %d.", newlib, yylplineno,
+ current_pos(0));
+ if(yylp_errno==YYLP_BAD_CHAR)
+ {
+--- a/Singular/libparse.cc
++++ b/Singular/libparse.cc
+@@ -3521,7 +3521,7 @@
+ yylplex(argv[0], argv[0], &lib_style,NULL);
+ if(yylp_errno)
+ {
+- printf("ERROR occured: [%d] ", yylp_errno);
++ printf("ERROR occurred: [%d] ", yylp_errno);
+ printf(yylp_errlist[yylp_errno], yylplineno);
+ printf("\n");
+ }
+--- a/Singular/libparse.ll
++++ b/Singular/libparse.ll
+@@ -980,7 +980,7 @@
+ yylplex(argv[0], argv[0], &lib_style,NULL);
+ if(yylp_errno)
+ {
+- printf("ERROR occured: [%d] ", yylp_errno);
++ printf("ERROR occurred: [%d] ", yylp_errno);
+ printf(yylp_errlist[yylp_errno], yylplineno);
+ printf("\n");
+ }
+--- a/Singular/walk_ip.cc
++++ b/Singular/walk_ip.cc
+@@ -140,7 +140,7 @@
+ break;
+
+ case WalkOverFlowError:
+- Werror( "Overflow occured.\n");
++ Werror( "Overflow occurred.\n");
+ destIdeal= NULL;
+ break;
+
+@@ -157,7 +157,7 @@
+ //Description: The main function for the Fractalwalk-Algorithm.
+ //Responsible for contact between user and walk64. Checks the
+ //input-data, and calls fractalWalk64. Returns the new groebner
+-//basis or something else if an error occured.
++//basis or something else if an error occurred.
+ ///////////////////////////////////////////////////////////////////
+ //Uses: omAlloc0,fractalWalkConsistency,omFreeSize,sizeof,IDIDEAL,
+ //fractalWalk64,rSetHdl,idrMoveR,Werror,idInit
+@@ -260,7 +260,7 @@
+ break;
+
+ case WalkOverFlowError:
+- Werror( "Overflow occured in ring %s.\n", first->Name() );
++ Werror( "Overflow occurred in ring %s.\n", first->Name() );
+ rChangeCurrRing(destRing);
+ destIdeal= NULL;
+ return destIdeal;
+--- a/factory/ChangeLog
++++ b/factory/ChangeLog
+@@ -919,7 +919,7 @@
+
+ Fri Sep 26 12:54:41 1997 Jens Schmidt <schmidt at mathematik.uni-kl.de>
+
+- * cf_assert.h: prints the function now where the assrtion occured if
++ * cf_assert.h: prints the function now where the assrtion occurred if
+ we are translating with gcc
+
+ Thu Sep 25 13:51:01 1997 Jens Schmidt <schmidt at mathematik.uni-kl.de>
+--- a/factory/facHensel.cc
++++ b/factory/facHensel.cc
+@@ -771,7 +771,7 @@
+
+ /// solve \f$ 1=\sum_{i=1}^n{\delta_{i} \prod_{j\neq i}{f_j}} \f$ mod \f$p^k\f$
+ /// over \f$ Q(\alpha) \f$ by first computing mod \f$p\f$ and if no zero divisor
+-/// occured compute it mod \f$p^k\f$
++/// occurred compute it mod \f$p^k\f$
+ CFList
+ diophantineQa (const CanonicalForm& F, const CanonicalForm& G,
+ const CFList& factors, modpk& b, const Variable& alpha)
+--- a/kernel/linear_algebra/interpolation.cc
++++ b/kernel/linear_algebra/interpolation.cc
+@@ -1224,7 +1224,7 @@
+ if (cur_result->n_generators!=generic_n_generators)
+ {
+ #ifdef writemsg
+- PrintS("wrong number of generators occured");
++ PrintS("wrong number of generators occurred");
+ #else
+ if (protocol) PrintS("ng");
+ #endif
+@@ -1250,7 +1250,7 @@
+ if (!EqualMon(cur_mon->mon,cur_gen->lt))
+ {
+ #ifdef writemsg
+- PrintS("wrong leading term occured");
++ PrintS("wrong leading term occurred");
+ #else
+ if (protocol) PrintS("lt");
+ #endif
+@@ -1265,7 +1265,7 @@
+ if (!EqualMon(generic_column_name[i],column_name[i]))
+ {
+ #ifdef writemsg
+- PrintS("wrong seq of cols occured");
++ PrintS("wrong seq of cols occurred");
+ #else
+ if (protocol) PrintS("sc");
+ #endif
+--- a/kernel/mod2.h
++++ b/kernel/mod2.h
+@@ -185,7 +185,7 @@
+
+ makes sure that all poly operations in your file are done with
+ PDEBUG == 2
+- To break after an error occured, set a debugger breakpoint on
++ To break after an error occurred, set a debugger breakpoint on
+ dErrorBreak.
+ */
+ #ifndef PDEBUG
+@@ -249,7 +249,7 @@
+
+ Some tips on possible values of OM_TRACK, OM_CHECK, OM_KEEP:
+ + To find out about an address that has been freed twice, first locate the
+- file(s) where the error occured, and then at the beginning of these files:
++ file(s) where the error occurred, and then at the beginning of these files:
+ #define OM_CHECK 3
+ #define OM_TRACK 5
+ #define OM_KEEP 1
+@@ -257,7 +257,7 @@
+ #include <omalloc/omalloc.h>
+ Under dynamic scope, do (e.g., from within the debugger):
+ om_Opts.MinCheck = 3; om_Opts.MinTrack = 5; omOpts.Keep = LONG_MAX;
+- + to find out where "memory corruption" occured, increase value of
++ + to find out where "memory corruption" occurred, increase value of
+ OM_CHECK - the higher this value is, the more consistency checks are
+ done (However a value > 3 checks the entire memory each time an omalloc
+ routine is used!)
+@@ -279,7 +279,7 @@
+ + if OM_CHECK and OM_TRACK are both undefined (or 0), or if OM_NDEBUG is
+ defined, then the "real" alloc/realloc/free macros are used, and all
+ omTest, omDebug and omCheck routines are undefined
+- + to break after an omError occured within a debugger,
++ + to break after an omError occurred within a debugger,
+ set a breakpoint on dErrorBreak
+ + to do checks from within the debugger, or to do checks with explicit
+ check level, use omTest routines.
+--- a/kernel/numeric/mpr_base.cc
++++ b/kernel/numeric/mpr_base.cc
+@@ -301,7 +301,7 @@
+ * Linear Program finds the v-distance of the point in accords[].
+ * The v-distance is the distance along the direction v to boundary of
+ * Minkowski Sum of Qi (here vector v is represented by shift[]).
+- * Returns the v-distance or -1.0 if an error occured.
++ * Returns the v-distance or -1.0 if an error occurred.
+ */
+ mprfloat vDistance( Coord_t * acoords, int dim );
+
+--- a/libpolys/coeffs/bigintmat.h
++++ b/libpolys/coeffs/bigintmat.h
+@@ -272,7 +272,7 @@
+ ///append i zero-columns to the matrix
+ void extendCols (int i);
+
+- bool add(bigintmat *b); ///< Addiert zur Matrix die Matrix b dazu. Return false => an error occured
++ bool add(bigintmat *b); ///< Addiert zur Matrix die Matrix b dazu. Return false => an error occurred
+ bool sub(bigintmat *b); ///< Subtrahiert ...
+ bool skalmult(number b, coeffs c); ///< Multipliziert zur Matrix den Skalar b hinzu
+ bool addcol(int i, int j, number a, coeffs c); ///< addiert a-faches der j-ten Spalte zur i-ten dazu
+--- a/libpolys/misc/auxiliary.h.in
++++ b/libpolys/misc/auxiliary.h.in
+@@ -220,7 +220,7 @@
+
+ makes sure that all poly operations in your file are done with
+ PDEBUG == 2
+- To break after an error occured, set a debugger breakpoint on
++ To break after an error occurred, set a debugger breakpoint on
+ dErrorBreak.
+ */
+ #ifndef PDEBUG
+@@ -284,7 +284,7 @@
+
+ Some tips on possible values of OM_TRACK, OM_CHECK, OM_KEEP:
+ + To find out about an address that has been freed twice, first locate the
+- file(s) where the error occured, and then at the beginning of these files:
++ file(s) where the error occurred, and then at the beginning of these files:
+ #define OM_CHECK 3
+ #define OM_TRACK 5
+ #define OM_KEEP 1
+@@ -292,7 +292,7 @@
+ #include <omalloc/omalloc.h>
+ Under dynamic scope, do (e.g., from within the debugger):
+ om_Opts.MinCheck = 3; om_Opts.MinTrack = 5; omOpts.Keep = LONG_MAX;
+- + to find out where "memory corruption" occured, increase value of
++ + to find out where "memory corruption" occurred, increase value of
+ OM_CHECK - the higher this value is, the more consistency checks are
+ done (However a value > 3 checks the entire memory each time an omalloc
+ routine is used!)
+@@ -314,7 +314,7 @@
+ + if OM_CHECK and OM_TRACK are both undefined (or 0), or if OM_NDEBUG is
+ defined, then the "real" alloc/realloc/free macros are used, and all
+ omTest, omDebug and omCheck routines are undefined
+- + to break after an omError occured within a debugger,
++ + to break after an omError occurred within a debugger,
+ set a breakpoint on dErrorBreak
+ + to do checks from within the debugger, or to do checks with explicit
+ check level, use omTest routines.
+--- a/libpolys/polys/nc/old.gring.cc
++++ b/libpolys/polys/nc/old.gring.cc
+@@ -3089,7 +3089,7 @@
+ {
+ if (nc_CallPlural(r->GetNC()->C, r->GetNC()->D, NULL, NULL, res, bSetupQuotient, true, true, r))
+ {
+- WarnS("Error occured while coping/setuping the NC structure!"); // No reaction!???
++ WarnS("Error occurred while coping/setuping the NC structure!"); // No reaction!???
+ return true; // error
+ }
+
+--- a/libpolys/polys/pDebug.cc
++++ b/libpolys/polys/pDebug.cc
+@@ -50,11 +50,11 @@
+
+ fprintf(stderr, "\n// ***dPolyReportError: ");
+ vfprintf(stderr, fmt, ap);
+- fprintf(stderr, "\n occured at\n");
++ fprintf(stderr, "\n occurred at\n");
+ omPrintCurrentBackTraceMax(stderr, 8);
+ if (p != NULL)
+ {
+- fprintf(stderr, " occured for poly: ");
++ fprintf(stderr, " occurred for poly: ");
+ p_wrp(p, r);
+ omPrintAddrInfo(stderr, p, " ");
+ }
+--- a/libpolys/reporter/dError.cc
++++ b/libpolys/reporter/dError.cc
+@@ -58,7 +58,7 @@
+ vfprintf(stderr, fmt, ap);
+ #if !defined(OM_NDEBUG)
+ #ifdef omPrintCurrentBackTraceMax
+- fprintf(stderr, " occured at: \n");
++ fprintf(stderr, " occurred at: \n");
+ omPrintCurrentBackTraceMax(stderr, 8);
+ #endif
+ #endif
+--- a/libpolys/reporter/reporter.h
++++ b/libpolys/reporter/reporter.h
+@@ -108,7 +108,7 @@
+ #endif
+ extern int dReportError(const char* fmt, ...);
+ #define dReportBug(s) \
+- dReportError("Bug reported: %s\n occured at %s,%d\n", s, __FILE__, __LINE__)
++ dReportError("Bug reported: %s\n occurred at %s,%d\n", s, __FILE__, __LINE__)
+
+ // this is just a dummy procedure which is called after the error
+ // has been reported. Within the debugger, set a breakpoint on this
+--- a/omalloc/omDebug.h
++++ b/omalloc/omDebug.h
+@@ -179,7 +179,7 @@
+ omError_t _status = cond; \
+ if (_status && (_status != omError_MaxError)) \
+ { \
+- _omPrintAddrInfo(stderr, _status, addr, bin_size, flags, 10, " occured for"); \
++ _omPrintAddrInfo(stderr, _status, addr, bin_size, flags, 10, " occurred for"); \
+ return _status; \
+ } \
+ } while (0)
+--- a/omalloc/omDebugCheck.c
++++ b/omalloc/omDebugCheck.c
+@@ -409,7 +409,7 @@
+ omReportError(error, report_error, OM_FLR_VAL, fmt, ap);
+ om_CallErrorHook = 1;
+
+- _omPrintAddrInfo(stderr, error, addr, bin_size, flags, 10, " occured for");
++ _omPrintAddrInfo(stderr, error, addr, bin_size, flags, 10, " occurred for");
+ om_Opts.ErrorHook();
+
+ om_Opts.MaxCheck = max_check;
+--- a/omalloc/omError.c
++++ b/omalloc/omError.c
+@@ -114,7 +114,7 @@
+ if (om_Opts.HowToReportErrors > 1)
+ {
+ #ifndef OM_NDEBUG
+- fprintf(stderr, "\n occured at: ");
++ fprintf(stderr, "\n occurred at: ");
+ if (! _omPrintCurrentBackTrace(stderr, OM_FLR_VAL))
+ fprintf(stderr, " ??");
+ #endif
+--- a/Singular/ipid.cc
++++ b/Singular/ipid.cc
+@@ -632,7 +632,7 @@
+ case LANG_SINGULAR: return "singular"; break;
+ case LANG_C: return "object"; break;
+ case LANG_NONE: return "none"; break;
+- default: return "unknow language";
++ default: return "unknown language";
+ }
+ }
+ else if (strcmp(request, "ref") == 0)
+--- a/Singular/iparith.cc
++++ b/Singular/iparith.cc
+@@ -6392,7 +6392,7 @@
+ if ((monomexpr!=NULL) && (p!=NULL) && (pTotaldegree(p)!=0) &&
+ ((unsigned long)pTotaldegree(monomexpr) > (currRing->bitmask / (unsigned long)pTotaldegree(p)/2)))
+ {
+- Warn("possible OVERFLOW in subst, max exponent is %ld, subtituting deg %d by deg %d",currRing->bitmask/2, pTotaldegree(monomexpr), pTotaldegree(p));
++ Warn("possible OVERFLOW in subst, max exponent is %ld, substituting deg %d by deg %d",currRing->bitmask/2, pTotaldegree(monomexpr), pTotaldegree(p));
+ //return TRUE;
+ }
+ if ((monomexpr==NULL)||(pNext(monomexpr)==NULL))
diff --git a/debian/patches/upstream-neutralize-tests-singular_dm_syzextra.patch b/debian/patches/upstream-neutralize-tests-singular_dm_syzextra.patch
deleted file mode 100644
index 61eff2a..0000000
--- a/debian/patches/upstream-neutralize-tests-singular_dm_syzextra.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: neutralize: tests: s/d/syzextra
- Neutralize tests for Singular/dyn_modules/syzextra
- in the automake Makefile itself as it appears that
- the involved test scripts are no more destributed;
- meant to be submitted to the upstream maintainer.
-Origin: debian
-Forwarded: https://github.com/Singular/Sources/pull/730
-Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2015-11-04
-
---- a/Singular/dyn_modules/syzextra/Makefile.am
-+++ b/Singular/dyn_modules/syzextra/Makefile.am
-@@ -22,15 +22,15 @@
- syzextra_la_CPPFLAGS = ${MYINCLUDES} ${P_PROCS_CPPFLAGS_COMMON}
- syzextra_la_LDFLAGS = ${AM_LDFLAGS} ${P_PROCS_MODULE_LDFLAGS} ${GOOGLE_PERFTOOL_LDFLAGS}
-
--AM_COLOR_TESTS=always
--
--TESTS_ENVIRONMENT = SINGULARPATH='${abs_top_builddir}/Singular/LIB:${abs_top_srcdir}/Singular/LIB:${abs_top_builddir}/libpolys/polys/.libs:${abs_top_builddir}/factory/gftables:${abs_builddir}/.libs:${abs_srcdir}'
--TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
--TESTS_ENVIRONMENT += SINGULAR_BIN_DIR='${abs_top_builddir}/Singular'
--
--TESTS=test_release.sh
--
--EXTRA_DIST = test.sh $(TESTS)
--# syzextra.tst ederc.tst test_clear_enum.tst
--
--CLEANFILES = SimpleTests.json
-+# AM_COLOR_TESTS=always
-+#
-+# TESTS_ENVIRONMENT = SINGULARPATH='${abs_top_builddir}/Singular/LIB:${abs_top_srcdir}/Singular/LIB:${abs_top_builddir}/libpolys/polys/.libs:${abs_top_builddir}/factory/gftables:${abs_builddir}/.libs:${abs_srcdir}'
-+# TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
-+# TESTS_ENVIRONMENT += SINGULAR_BIN_DIR='${abs_top_builddir}/Singular'
-+#
-+# TESTS=test_release.sh
-+#
-+# EXTRA_DIST = test.sh $(TESTS)
-+# # syzextra.tst ederc.tst test_clear_enum.tst
-+#
-+# CLEANFILES = SimpleTests.json
diff --git a/debian/patches/upstream-tests-omalloc-harden.patch b/debian/patches/upstream-tests-omalloc-harden.patch
deleted file mode 100644
index 1a8eba1..0000000
--- a/debian/patches/upstream-tests-omalloc-harden.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-Description: tests: omalloc: harden memory backtrace support
- Fix an weakness revealed on a powerpc machine. Patch extracted from
- uptream commits 78528ea and 6da2d67, and tested on a powerpc Debian
- porter by Jerome Benoit <calculus at rezozer.net>.
-Origin: upstream team
-Forwarded: https://github.com/Singular/Sources/pull/732
-Author: Hans Schoenemann <hannes at mathematik.uni-kl.de>
-Last-Update: 2015-11-14
-
---- a/omalloc/configure.ac
-+++ b/omalloc/configure.ac
-@@ -71,9 +71,6 @@
- inline,
- [ --without-inline do not inline])
- AC_ARG_WITH(
-- debug,
-- [ --without-debug disable all debugging facilities])
--AC_ARG_WITH(
- track,
- [ --without-track disable debug tracking functionality])
- AC_ARG_WITH(
-@@ -92,6 +89,9 @@
- internal_debug,
- [ --with-internal-debug
- turn on internal debugging])
-+AC_ARG_ENABLE(
-+ debug,
-+ [ --enable-debug include backtrace stuff])
- dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
- dnl compiler/make config
- dnl
-@@ -414,7 +414,7 @@
- dnl
- save_cflags="$CFLAGS"
- AC_MSG_CHECKING(whether to disable debugging)
--if test "$with_debug" != no; then
-+if test "$enable_debug" = yes; then
- AC_MSG_RESULT(no)
- CFLAGS="$CFLAGS -g"
- else
-@@ -458,10 +458,12 @@
- dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
- dnl backtrace business
- dnl
-+if test "x$with_track" != xno; then
- AC_MSG_CHECKING(whether GET_RET_ADDR works)
- AC_CACHE_VAL(ac_cv_get_return_addr_works,
- AC_TRY_RUN([
- #include <stdlib.h>
-+#define OM_GET_RETURN_ADDR_WORKS 1
- #include "omReturn.h"
- int test_return_addr()
- {
-@@ -514,11 +516,20 @@
- if test "$ac_cv_get_backtrace_works" = yes; then
- AC_DEFINE(OM_GET_BACKTRACE_WORKS,1,"Whether omInitGetBackTrace () works")
- fi
-+else
-+ AC_MSG_CHECKING(whether GET_RET_ADDR works)
-+ ac_cv_get_return_addr_works=no
-+ AC_MSG_RESULT($ac_cv_get_return_addr_works)
-+ AC_MSG_CHECKING(whether omGetBackTrace works)
-+ ac_cv_get_backtrace_works=no
-+ AC_MSG_RESULT($ac_cv_get_backtrace_works)
-+fi
-
- AC_MSG_CHECKING(whether addr2line works)
- AC_CACHE_VAL(ac_cv_prog_addr2line_works,
- AC_TRY_RUN([
- #include <stdlib.h>
-+#define OM_GET_RETURN_ADDR_WORKS 1
- #include "omReturn.h"
- #include "omStructs.h"
- /* #include "omGetBackTrace.h" */
---- a/omalloc/omReturn.h
-+++ b/omalloc/omReturn.h
-@@ -51,10 +51,14 @@
- #ifndef GET_RET_ADDR
-
- #if __GNUC__ > 1
-+#ifdef OM_GET_RETURN_ADDR_WORKS
- #define GET_RET_ADDR(file) (file = __builtin_return_address(0))
- #else
- #define GET_RET_ADDR(file) (file = 0)
- #endif
-+#else
-+#define GET_RET_ADDR(file) (file = 0)
-+#endif
- #endif /* __GNUC__ > 1 */
-
- #endif /* ! __OM_RETURN_H__ */
diff --git a/debian/rules b/debian/rules
index 37317fa..3137269 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,8 +28,5 @@ override_dh_link-arch:
dh_link -p libsingular4-dev \
/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/Singular.pc /usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/singular.pc
-override_dh_strip-arch:
- dh_strip -a --dbg-package=libsingular4-dbg
-
get-orig-source:
uscan --no-conf --download-current-version --verbose
--
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