[singular] 04/04: Imported Debian patch 4.0.3-p1+ds-1
Jerome Benoit
calculus-guest at moszumanska.debian.org
Thu Apr 28 19:13:52 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 e24576fbafe89b82ff48b975f4b54f290165678b
Author: Jerome Benoit <calculus at rezozer.net>
Date: Thu Apr 28 12:30:28 2016 +0000
Imported Debian patch 4.0.3-p1+ds-1
---
debian/changelog | 19 +-
debian/control | 12 +-
debian/copyright | 2 +-
debian/patches/debianization-documentation.patch | 18 +-
debian/patches/debianization-gather-headers.patch | 24 +-
.../patches/debianization-rename-libraries.patch | 33 +-
debian/patches/debianization.patch | 6 +-
debian/patches/series | 3 +
debian/patches/upstream-autotools-DESTDIR.patch | 23 +
.../patches/upstream-autotools-singular_idx.patch | 18 +
.../upstream-lintian-spelling-error-silence.patch | 545 +--------------------
debian/patches/upstream-reproducible.patch | 39 ++
debian/rules | 9 +
debian/singular-doc.docs | 7 +
debian/singular-doc.info | 1 +
debian/singular-doc.lintian-overrides | 7 -
debian/singular-ui-emacs.install | 2 +
17 files changed, 192 insertions(+), 576 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f18f4be..51a82e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,26 @@
-singular (4.0.3-p1+ds-0) UNRELEASED; urgency=medium
+singular (4.0.3-p1+ds-1) unstable; urgency=medium
+ * New upstream version (Closes: #811855).
* Debianization:
+ - debian/control:
+ - Standards Version, bump to 3.9.8 (no change);
- debian/copyright:
- repack by using the Files-Excluded machinery instead of the ad-hoc
script debian/repack;
- refresh;
- debian/repack, discard (see above);
- debian/watch:
- - revisit (see above).
-
- -- Jerome Benoit <calculus at rezozer.net> Wed, 27 Apr 2016 02:21:00 +0000
+ - revisit (see above);
+ - debian/rules:
+ - dpkg-buildflags, add hardening=+all;
+ - debian/patches/:
+ - d/p/upstream-lintian-spelling-error-silence.patch, refresh;
+ - d/p/upstream-autotools-DESTDIR.patch, introduce;
+ - d/p/upstream-autotools-singular_idx.patch, introduce;
+ - d/p/upstream-reproducible.patch, introduce;
+ - provide doc `as is'.
+
+ -- Jerome Benoit <calculus at rezozer.net> Thu, 28 Apr 2016 18:04:58 +0000
singular (4.0.3+ds-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 1286ea6..4d93d68 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
Build-Depends-Indep:
doxygen,
rdfind, symlinks
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
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
@@ -94,7 +94,7 @@ Recommends:
singular-ui (= ${binary:Version}),
graphviz, 4ti2, normaliz, surf-alggeo,
python-polybori (>= 0.8.3)
-Suggests: graphicsmagick-imagemagick-compat | imagemagick
+Suggests: singular-doc (= ${source:Version}), 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
@@ -109,6 +109,7 @@ Package: singular-ui
Architecture: any
Depends: libsingular4 (= ${binary:Version}), singular-data (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: singular-modules (= ${binary:Version})
+Suggests: singular-doc (= ${source:Version})
Multi-Arch: foreign
Replaces: singular (<< 4)
Breaks: singular (<< 4)
@@ -122,6 +123,7 @@ Description: Computer Algebra System for Polynomial Computations -- console user
Package: singular-ui-emacs
Architecture: any
Depends: singular-ui (= ${binary:Version}), emacs, ${shlibs:Depends}, ${misc:Depends}
+Recommends: singular-doc (= ${source:Version})
Multi-Arch: foreign
Replaces: singular (<< 4)
Breaks: singular (<< 4)
@@ -150,10 +152,8 @@ Package: singular-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
-Suggests:
- singular (= ${binary:Version}),
- pdf-viewer,
- www-browser
+Enhances: singular-data (= ${source:Version}), singular-ui-emacs (= ${binary:Version})
+Suggests: singular (= ${binary:Version}), pdf-viewer, www-browser
Multi-Arch: foreign
Description: Computer Algebra System for Polynomial Computations -- user documentation
SINGULAR is a Computer Algebra System (CAS) for polynomial computations with
diff --git a/debian/copyright b/debian/copyright
index 63ba538..be1380b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ Comment:
The upstream source tarball is repacked to drop off the regenerated material
(mainly autotools related) and material provided by other packages (mainly
autoconf-archive m4 files) to gain weight.
- (At the time of writting, the latest ax_prefix_config_h.m4 as distributed
+ (At the time of writing, the latest ax_prefix_config_h.m4 as distributed
within the autoconf-archive is not compatible with the version distributed
within Singular (serial 11); more precisely, not providing a prefix is an
error in the lastest version (serial 15). Second, ax_python_with_version.m4
diff --git a/debian/patches/debianization-documentation.patch b/debian/patches/debianization-documentation.patch
index 86dd8ae..8699238 100644
--- a/debian/patches/debianization-documentation.patch
+++ b/debian/patches/debianization-documentation.patch
@@ -3,7 +3,7 @@ Description: debianization -- documentation
Origin: debian
Forwarded: not-needed
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2014-12-20
+Last-Update: 2016-04-28
--- a/dox/Makefile.am
+++ b/dox/Makefile.am
@@ -50,3 +50,19 @@ Last-Update: 2014-12-20
rm -rf html
endif
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -30,7 +30,12 @@
+ install-data-local:
+ -cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(datadir)/singular; tar jxf -)
+ -mkdir $(DESTDIR)$(datadir)/info
+- -mv $(DESTDIR)$(datadir)/singular/singular.hlp $(DESTDIR)$(datadir)/info/.
++ -mv $(DESTDIR)$(datadir)/singular/singular.hlp $(DESTDIR)$(datadir)/info/singular.hlp
++ -cd $(DESTDIR)$(datadir)/singular/html && { \
++ chmod a-x a_*.gif ; \
++ rdfind -outputname /dev/null -makesymlinks true . ; \
++ symlinks -r -c -s -v . ; \
++ }
+
+ configheaderdir = ${includedir}/$(DEB_HOST_MULTIARCH)/singular/singular
+ nodist_configheader_HEADERS = singularconfig.h
diff --git a/debian/patches/debianization-gather-headers.patch b/debian/patches/debianization-gather-headers.patch
index bda12c1..0eb694a 100644
--- a/debian/patches/debianization-gather-headers.patch
+++ b/debian/patches/debianization-gather-headers.patch
@@ -4,7 +4,7 @@ Description: debianization - gather headers
Origin: debian
Forwarded: not-needed
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2014-12-28
+Last-Update: 2016-04-28
--- a/factory/Makefile.am
+++ b/factory/Makefile.am
@@ -197,11 +197,11 @@ Last-Update: 2014-12-28
+++ b/kernel/maps/Makefile.am
@@ -6,7 +6,7 @@
noinst_LTLIBRARIES=libmaps.la
- libmaps_la_SOURCES=fast_maps.cc
+ libmaps_la_SOURCES=fast_maps.cc gen_maps.cc find_perm.cc subst_maps.cc
-libmaps_la_includedir=$(includedir)/singular/kernel/maps
+libmaps_la_includedir=$(includedir)/singular/singular/kernel/maps
- libmaps_la_include_HEADERS=fast_maps.h
+ libmaps_la_include_HEADERS=fast_maps.h gen_maps.h find_perm.h
--- a/kernel/numeric/Makefile.am
@@ -240,8 +240,8 @@ Last-Update: 2014-12-28
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,7 @@
- -mkdir $(datadir)/info
- -mv $(datadir)/singular/singular.hlp $(datadir)/info/.
+ -mkdir $(DESTDIR)$(datadir)/info
+ -mv $(DESTDIR)$(datadir)/singular/singular.hlp $(DESTDIR)$(datadir)/info/.
-configheaderdir = ${includedir}/$(DEB_HOST_MULTIARCH)/singular
+configheaderdir = ${includedir}/$(DEB_HOST_MULTIARCH)/singular/singular
@@ -354,3 +354,17 @@ Last-Update: 2014-12-28
Libs: -L${libdir} -lsingular-omalloc
# Libs.private:
+--- a/xalloc/Makefile.am
++++ b/xalloc/Makefile.am
+@@ -2,9 +2,9 @@
+
+ lib_LTLIBRARIES=libsingular-omalloc.la
+
+-libsingular_omalloc_includedir=$(includedir)/omalloc
++libsingular_omalloc_includedir=$(includedir)/singular/omalloc
+
+-libsingular_omalloc_include_HEADERS = omalloc.h omallocClass.h
++noinst_libsingular_omalloc_include_HEADERS = omalloc.h omallocClass.h
+
+ SOURCES=dummy.c omallocClass.cc
+
diff --git a/debian/patches/debianization-rename-libraries.patch b/debian/patches/debianization-rename-libraries.patch
index c24c7a2..ada715e 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: %
-@@ -255,7 +255,7 @@
+@@ -254,7 +254,7 @@
check_PROGRAMS=$(TESTS)
test_SOURCES = test.cc
@@ -167,27 +167,32 @@ Last-Update: 2015-10-15
# These files are built first
--- a/xalloc/Makefile.am
+++ b/xalloc/Makefile.am
-@@ -1,8 +1,8 @@
+@@ -1,20 +1,20 @@
ACLOCAL_AMFLAGS = -I ../m4
--noinst_LTLIBRARIES=libomalloc.la
-+noinst_LTLIBRARIES=libsingular-omalloc.la
+-lib_LTLIBRARIES=libomalloc.la
++lib_LTLIBRARIES=libsingular-omalloc.la
+
+-libomalloc_includedir=$(includedir)/omalloc
++libsingular_omalloc_includedir=$(includedir)/omalloc
--# lib_LTLIBRARIES=libomalloc.la
-+# lib_LTLIBRARIES=libsingular-omalloc.la
- # lib_LIBRARIES=libomalloc.a
+-libomalloc_include_HEADERS = omalloc.h omallocClass.h
++libsingular_omalloc_include_HEADERS = omalloc.h omallocClass.h
- # libomallocdir = $(libdir)/
-@@ -12,8 +12,8 @@
+ SOURCES=dummy.c omallocClass.cc
- SOURCES = dummy.c omalloc.h
+ AM_CPPFLAGS =-I${top_srcdir}/.. -I${top_builddir}/..
--libomalloc_la_SOURCES =$(SOURCES)
-+libsingular_omalloc_la_SOURCES =$(SOURCES)
+-libomalloc_la_SOURCES=$(SOURCES) $(noinst_HEADERS)
++libsingular_omalloc_la_SOURCES=$(SOURCES) $(noinst_HEADERS)
+
+-libomalloc_la_LDFLAGS = -release ${PACKAGE_VERSION}
++libsingular_omalloc_la_LDFLAGS = -release ${PACKAGE_VERSION}
--libomalloc_la_LDFLAGS = -release ${PACKAGE_VERSION}
-+libsingular_omalloc_la_LDFLAGS = -release ${PACKAGE_VERSION}
+-libomalloc_la_CPPFLAGS = ${AM_CPPFLAGS}
++libsingular_omalloc_la_CPPFLAGS = ${AM_CPPFLAGS}
+ omTables_CPPFLAGS = ${AM_CPPFLAGS}
--- a/m4/options.m4
+++ b/m4/options.m4
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index c435dc5..54a8ada 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -9,7 +9,7 @@ Last-Update: 2015-10-15
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@
- SUBDIRS = resources omalloc xalloc $(USE_FACTORY) \
+ SUBDIRS = resources omalloc $(USE_FACTORY) \
libpolys gfanlib IntegerProgramming \
kernel Singular \
-dox emacs redhat desktop
@@ -18,8 +18,8 @@ Last-Update: 2015-10-15
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/.
+ -mkdir $(DESTDIR)$(datadir)/info
+ -mv $(DESTDIR)$(datadir)/singular/singular.hlp $(DESTDIR)$(datadir)/info/.
-configheaderdir = ${includedir}/singular
+configheaderdir = ${includedir}/$(DEB_HOST_MULTIARCH)/singular
diff --git a/debian/patches/series b/debian/patches/series
index b74bb84..eb6b788 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,8 @@
upstream-lintian-spelling-error-silence.patch
+upstream-reproducible.patch
upstream-tests-omalloc-getlucky.patch
+upstream-autotools-DESTDIR.patch
+upstream-autotools-singular_idx.patch
upstream-autotools-help2man.patch
upstream-autotools-help2man-extra.patch
debianization.patch
diff --git a/debian/patches/upstream-autotools-DESTDIR.patch b/debian/patches/upstream-autotools-DESTDIR.patch
new file mode 100644
index 0000000..a69962b
--- /dev/null
+++ b/debian/patches/upstream-autotools-DESTDIR.patch
@@ -0,0 +1,23 @@
+Description: autotools: DESTDIR
+ Add DESTDIR to install-*-local targets whenever applicable;
+ meant to be submitted to the upstream maintainer.
+Origin: debian
+Forwarded: https://github.com/Singular/Sources/pull/762
+Author: Jerome Benoit <calculus at rezozer.net>
+Last-Update: 2016-04-28
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -17,9 +17,9 @@
+ $(srcdir)/git-version-gen $(srcdir)/.tarball-git-version > $(distdir)/.tarball-git-version
+
+ install-data-local:
+- -cat ${top_srcdir}/doc/doc.tbz2| (cd $(datadir)/singular;tar jxf -)
+- -mkdir $(datadir)/info
+- -mv $(datadir)/singular/singular.hlp $(datadir)/info/.
++ -cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(datadir)/singular; tar jxf -)
++ -mkdir $(DESTDIR)$(datadir)/info
++ -mv $(DESTDIR)$(datadir)/singular/singular.hlp $(DESTDIR)$(datadir)/info/.
+
+ configheaderdir = ${includedir}/singular
+ nodist_configheader_HEADERS = singularconfig.h
diff --git a/debian/patches/upstream-autotools-singular_idx.patch b/debian/patches/upstream-autotools-singular_idx.patch
new file mode 100644
index 0000000..f50e5b3
--- /dev/null
+++ b/debian/patches/upstream-autotools-singular_idx.patch
@@ -0,0 +1,18 @@
+Description: autotools: singular.idx
+ Add automake stuff to install the data file singular.idx properly;
+ meant to be submitted to the upstream maintainer.
+Origin: debian
+Forwarded: https://github.com/Singular/Sources/pull/765
+Author: Jerome Benoit <calculus at rezozer.net>
+Last-Update: 2016-04-28
+
+--- a/Singular/Makefile.am
++++ b/Singular/Makefile.am
+@@ -207,6 +207,7 @@
+
+ singularlibrarydir = ${datadir}/singular
+ singularlibrary = $(SLIB0:%=LIB/%) $(SLIB1:%=LIB/%) $(PLIBS:%=LIB/%) $(SLIB2:%=LIB/%)
++singularlibrary_DATA = $(top_srcdir)/doc/singular.idx
+ nobase_dist_singularlibrary_DATA = LIB/tst.lib LIB/help.cnf ${singularlibrary}
+ EXTRA_DIST = grammar.y libparse.ll make_alllib.sh LIB/all.lib.tmpl \
+ singular-libs LIB/help.cnf LIB/.singularrc LIB/COPYING \
diff --git a/debian/patches/upstream-lintian-spelling-error-silence.patch b/debian/patches/upstream-lintian-spelling-error-silence.patch
index b525d1e..c72f176 100644
--- a/debian/patches/upstream-lintian-spelling-error-silence.patch
+++ b/debian/patches/upstream-lintian-spelling-error-silence.patch
@@ -3,544 +3,19 @@ Description: source typo
meant to silence lintian and eventually to be submitted to the
upstream maintainer.
Origin: debian
-Forwarded: https://github.com/Singular/Sources/pull/749
+Forwarded: https://github.com/Singular/Sources/pull/761
Comment: spelling-error-in-binary
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-02-23
+Last-Update: 2016-04-27
---- a/IntegerProgramming/Buchberger.cc
-+++ b/IntegerProgramming/Buchberger.cc
-@@ -1490,7 +1490,7 @@
+--- a/Singular/feOptTab.h
++++ b/Singular/feOptTab.h
+@@ -142,7 +142,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
+ {"MPport", required_argument, LONG_OPTION_RETURN,
+- "PORT", "Use PORT number for conections", feOptString, 0, 0},
++ "PORT", "Use PORT number for connections", feOptString, 0, 0},
- 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))
+ {"MPhost", required_argument, LONG_OPTION_RETURN,
+ "HOST", "Use HOST for connections", feOptString, 0, 0},
diff --git a/debian/patches/upstream-reproducible.patch b/debian/patches/upstream-reproducible.patch
new file mode 100644
index 0000000..9cd149a
--- /dev/null
+++ b/debian/patches/upstream-reproducible.patch
@@ -0,0 +1,39 @@
+Description: source typo
+ Attempt to render the upstream source reproducible,
+ meant to be submitted to the upstream maintainer.
+Origin: debian
+Forwarded: https://github.com/Singular/Sources/pull/763
+Author: Jerome Benoit <calculus at rezozer.net>
+Last-Update: 2016-04-28
+
+--- a/Singular/emacs.cc
++++ b/Singular/emacs.cc
+@@ -89,7 +89,7 @@
+ "Please, email the following output to singular at mathematik.uni-kl.de\n"
+ "Bug occurred at %s:%d\n"
+ "Message: %s\n"
+-"Version: " S_UNAME VERSION __DATE__ __TIME__,
++"Version: " S_UNAME VERSION VERSION_DATE,
+ file, line, msg);
+
+ }
+--- a/Singular/misc_ip.cc
++++ b/Singular/misc_ip.cc
+@@ -780,7 +780,7 @@
+ StringSetS("");
+ StringAppend("Singular for %s version %s (%d, %d bit) %s #%s",
+ S_UNAME, VERSION, // SINGULAR_VERSION,
+- SINGULAR_VERSION, SIZEOF_VOIDP*8, singular_date, GIT_VERSION);
++ SINGULAR_VERSION, SIZEOF_VOIDP*8, VERSION_DATE, GIT_VERSION);
+ StringAppendS("\nwith\n\t");
+
+ #if defined(mpir_version)
+@@ -1155,8 +1155,6 @@
+ }
+ }
+
+-const char *singular_date=__DATE__ " " __TIME__;
+-
+ extern "C"
+ {
+ void omSingOutOfMemoryFunc()
diff --git a/debian/rules b/debian/rules
index 8c32456..7be61d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
DEB_PKG_DIR = $(abspath $(dir $(filter %rules, $(MAKEFILE_LIST))))
export DEB_PKG_VERSION = $(shell dpkg-parsechangelog -l$(DEB_PKG_DIR)/changelog -S Version)
@@ -24,9 +26,16 @@ DEB_AUTO_INSTALL_MAKEFLAGS = TOPSRCDIR=$(CURDIR) DESTDIR=$(CURDIR)/debian/tmp
override_dh_auto_install-indep:
make -C dox install-html $(DEB_AUTO_INSTALL_MAKEFLAGS)
+##override_dh_compress-indep:
+## dh_compress -X.pdf
+
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_link-indep:
+ dh_link -p singular-doc \
+ /usr/share/info/singular.hlp.gz /usr/share/info/singular.info.gz
+
get-orig-source:
uscan --no-conf --download-current-version --compression xz --verbose
diff --git a/debian/singular-doc.docs b/debian/singular-doc.docs
new file mode 100644
index 0000000..93287e4
--- /dev/null
+++ b/debian/singular-doc.docs
@@ -0,0 +1,7 @@
+debian/tmp/usr/share/singular/html
+debian/tmp/usr/share/singular/singular.idx
+## comment:
+## the below set up is an ad-hoc set up, given that the
+## distributed singular.hlp is obsolete; see commented
+## line in d/singular-doc.info .
+debian/tmp/usr/share/info/singular.hlp
diff --git a/debian/singular-doc.info b/debian/singular-doc.info
new file mode 100644
index 0000000..23f84d0
--- /dev/null
+++ b/debian/singular-doc.info
@@ -0,0 +1 @@
+##debian/tmp/usr/share/info/singular.info
diff --git a/debian/singular-doc.lintian-overrides b/debian/singular-doc.lintian-overrides
index 2ae3c54..510f7d2 100644
--- a/debian/singular-doc.lintian-overrides
+++ b/debian/singular-doc.lintian-overrides
@@ -1,9 +1,2 @@
# the upstream source ball contains only EMPTY ChangeLog files
singular-doc: no-upstream-changelog
-
-# at the time of packaging, the upstream source ball comes without
-# user documentation material: a pull request will be asked to get a
-# more suitable upstream source ball; previous pull requests in this
-# sens were kindly accepted before to ease packaging -- Jerome Benoit
-# <calculus at rezozer.net>
-singular-doc: empty-binary-package
diff --git a/debian/singular-ui-emacs.install b/debian/singular-ui-emacs.install
index b593b88..83e1c2c 100644
--- a/debian/singular-ui-emacs.install
+++ b/debian/singular-ui-emacs.install
@@ -1,3 +1,5 @@
usr/bin/ESingular
usr/share/singular/emacs/*.el
usr/share/singular/emacs/*.xpm
+usr/share/singular/emacs/ChangeLog usr/share/doc/singular-ui-emacs/emacs
+usr/share/singular/emacs/NEWS usr/share/doc/singular-ui-emacs/emacs
--
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