[singular] 03/03: Imported Debian patch 4.0.2-p2+ds-1
Jerome Benoit
calculus-guest at moszumanska.debian.org
Wed Nov 4 04:35:46 UTC 2015
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository singular.
commit bda265a92f98b2a98b9fcc336c3120829e5d0fa7
Author: Jerome Benoit <calculus at rezozer.net>
Date: Wed Nov 4 02:59:08 2015 +0100
Imported Debian patch 4.0.2-p2+ds-1
---
debian/changelog | 12 ++
debian/control | 2 +-
debian/patches/debianization-gather-headers.patch | 8 +-
.../patches/debianization-rename-libraries.patch | 2 +-
debian/patches/debianization.patch | 11 +-
debian/patches/series | 3 +-
debian/patches/upstream-autotools-help2man.patch | 2 +-
...eam-neutralize-tests-singular_dm_syzextra.patch | 40 +++++
.../upstream-spelling-error-in-singular-lib.patch | 29 ---
.../upstream-spelling-error-in-source.patch | 196 ---------------------
10 files changed, 66 insertions(+), 239 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index da79789..454a668 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+singular (4.0.2-p2+ds-1) unstable; urgency=medium
+
+ * New upstream version.
+ * Debianization:
+ - debian/control, Vcs-Browser field correction;
+ - debina/patches/*:
+ - git-version-gen, harden;
+ - refresh;
+ - minor fix (submitted).
+
+ -- Jerome Benoit <calculus at rezozer.net> Wed, 04 Nov 2015 04:07:40 +0000
+
singular (4.0.2-p1+ds-1) unstable; urgency=medium
* New upstream version.
diff --git a/debian/control b/debian/control
index af1f5dd..28591c4 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends-Indep:
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/gitweb/?p=debian-science/packages/singular.git
+Vcs-Browser: http://anonscm.debian.org/cgit/debian-science/packages/singular.git
Package: singular
Architecture: any
diff --git a/debian/patches/debianization-gather-headers.patch b/debian/patches/debianization-gather-headers.patch
index 69fd846..b8ec50e 100644
--- a/debian/patches/debianization-gather-headers.patch
+++ b/debian/patches/debianization-gather-headers.patch
@@ -118,15 +118,15 @@ Last-Update: 2014-12-28
shortfl.h mpr_complex.h mpr_global.h numstats.h \
--- a/libpolys/misc/Makefile.am
+++ b/libpolys/misc/Makefile.am
-@@ -9,7 +9,7 @@
+@@ -10,7 +10,7 @@
- libmisc_la_SOURCES = int64vec.cc options.c sirandom.c intvec.cc
+ libmisc_la_SOURCES = int64vec.cc options.c sirandom.c intvec.cc prime.cc
-libmisc_la_includedir = $(includedir)/singular/misc
+libmisc_la_includedir = $(includedir)/singular/singular/misc
- libmisc_la_include_HEADERS = mylimits.h options.h intvec.h int64vec.h sirandom.h
+ libmisc_la_include_HEADERS = mylimits.h options.h intvec.h int64vec.h \
+ sirandom.h prime.h
- nodist_libmisc_la_include_HEADERS = auxiliary.h
--- a/kernel/Makefile.am
+++ b/kernel/Makefile.am
@@ -23,7 +23,7 @@
diff --git a/debian/patches/debianization-rename-libraries.patch b/debian/patches/debianization-rename-libraries.patch
index d458dc9..0d73f9d 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: %
-@@ -252,7 +252,7 @@
+@@ -253,7 +253,7 @@
check_PROGRAMS=$(TESTS)
test_SOURCES = test.cc
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index 9b29097..e1e0191 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -15,7 +15,7 @@ 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 singular.spec.in singular.spec
+ 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
@@ -93,7 +93,7 @@ Last-Update: 2015-10-15
dnl Check if build env is sane
AM_SANITY_CHECK
-@@ -115,6 +115,8 @@
+@@ -114,6 +114,8 @@
*cygwin* ) AX_APPEND_LINK_FLAGS([-Wl,-Bdynamic]);;
esac
@@ -102,7 +102,7 @@ Last-Update: 2015-10-15
PKG_REQUIRE="$PKG_REQUIRE"
AC_SUBST(PKG_REQUIRE)
-@@ -261,8 +263,6 @@
+@@ -260,8 +262,6 @@
AC_CONFIG_FILES([emacs/Makefile])
@@ -259,7 +259,7 @@ Last-Update: 2015-10-15
" shell invocation and links are disallowed");
--- a/git-version-gen
+++ b/git-version-gen
-@@ -1,24 +1,5 @@
+@@ -1,24 +1,6 @@
-#!/bin/bash
-
-export GIT_WORK_TREE=`dirname "$0"`
@@ -285,7 +285,8 @@ Last-Update: 2015-10-15
- fi
-fi
+#!/bin/sh
-+DEB_PKG_VERSION=$(dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p')
++TOP_BUIDDIR=$(dirname $0)
++DEB_PKG_VERSION=$(dpkg-parsechangelog -l${TOP_BUIDDIR}/debian/changelog -S Version)
+echo -n "debian-${DEB_PKG_VERSION}"
+exit 0
+## eos
diff --git a/debian/patches/series b/debian/patches/series
index 864e833..4370ddd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
-upstream-spelling-error-in-singular-lib.patch
-upstream-spelling-error-in-source.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 0b98f52..1713c33 100644
--- a/debian/patches/upstream-autotools-help2man.patch
+++ b/debian/patches/upstream-autotools-help2man.patch
@@ -17,7 +17,7 @@ Last-Update: 2015-10-15
AC_CHECK_PROGS([DOXYGEN], [doxygen])
if test -z "$DOXYGEN";
then AC_MSG_WARN([Doxygen not found - continuing without Doxygen support])
-@@ -255,7 +256,8 @@
+@@ -254,7 +255,8 @@
AC_CONFIG_FILES([IntegerProgramming/Makefile])
diff --git a/debian/patches/upstream-neutralize-tests-singular_dm_syzextra.patch b/debian/patches/upstream-neutralize-tests-singular_dm_syzextra.patch
new file mode 100644
index 0000000..61eff2a
--- /dev/null
+++ b/debian/patches/upstream-neutralize-tests-singular_dm_syzextra.patch
@@ -0,0 +1,40 @@
+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-spelling-error-in-singular-lib.patch b/debian/patches/upstream-spelling-error-in-singular-lib.patch
deleted file mode 100644
index fb7338e..0000000
--- a/debian/patches/upstream-spelling-error-in-singular-lib.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Singular LIB typo
- Correct spelling error as reported by eyes in some Singular libraries;
- meant to be submitted to the upstream maintainer.
-Origin: debian
-Forwarded: https://github.com/Singular/Sources/pull/728
-Comment: spelling-error-in-singular-lib
-Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2015-10-15
-
---- a/Singular/LIB/resgraph.lib
-+++ b/Singular/LIB/resgraph.lib
-@@ -103,7 +103,7 @@
- if((size(#)==0)&&(find(@filename,"/tmp/")))
- {
- //--- do not leave any garbage in the public directories
-- j=system("sh","commnd rm " + outfile + " " + @filename);
-+ j=system("sh","command rm " + outfile + " " + @filename);
- }
- return();
- }
-@@ -289,7 +289,7 @@
- if(find(@filename,"/tmp/"))
- {
- //--- do not leave any garbage in the public directories
-- j=system("sh","commnd rm " + @filename + ".jpg "+ @filename);
-+ j=system("sh","command rm " + @filename + ".jpg "+ @filename);
- }
- return();
- }
diff --git a/debian/patches/upstream-spelling-error-in-source.patch b/debian/patches/upstream-spelling-error-in-source.patch
deleted file mode 100644
index cf168a1..0000000
--- a/debian/patches/upstream-spelling-error-in-source.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-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/728
-Comment: spelling-error-in-binary
-Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2015-10-15
-
---- a/IntegerProgramming/IP_algorithms.cc
-+++ b/IntegerProgramming/IP_algorithms.cc
-@@ -129,7 +129,7 @@
- if(variables<=0)
- {
- cerr<<"ERROR: int Conti_Traverso(INPUT_FILE, const BOOLEAN&):\n"
-- "number of variables / matrix columns must be positve"<<endl;
-+ "number of variables / matrix columns must be positive"<<endl;
- return 0;
- }
-
-@@ -210,7 +210,7 @@
- if(constraints<=0)
- {
- cerr<<"ERROR: int Conti_Traverso(INPUT_FILE, const BOOLEAN&):\n"
-- "number of constraints / matrix rows must be positve"<<endl;
-+ "number of constraints / matrix rows must be positive"<<endl;
- // Solving problems without constraints is possible, but not very
- // interesting (because trivial). To avoid the problems and the overhead
- // incurred by an "empty" matrix, such problems are refused.
-@@ -417,7 +417,7 @@
- if(variables<=0)
- {
- cerr<<"ERROR: int Positive_Conti_Traverso(INPUT_FILE, const BOOLEAN&):\n"
-- "number of variables / matrix columns must be positve"<<endl;
-+ "number of variables / matrix columns must be positive"<<endl;
- return 0;
- }
-
-@@ -498,7 +498,7 @@
- if(constraints<=0)
- {
- cerr<<"ERROR: int Positive_Conti_Traverso(INPUT_FILE, const BOOLEAN&):\n"
-- "number of constraints / matrix rows must be positve"<<endl;
-+ "number of constraints / matrix rows must be positive"<<endl;
- // Solving problems without constraints is possible, but not very
- // interesting (because trivial). To avoid the problems and the overhead
- // incurred by an "empty" matrix, such problems are refused.
-@@ -714,7 +714,7 @@
- if(variables<=0)
- {
- cerr<<"ERROR: int Elim_Conti_Traverso(INPUT_FILE, const BOOLEAN&):\n"
-- "number of variables / matrix columns must be positve"<<endl;
-+ "number of variables / matrix columns must be positive"<<endl;
- return 0;
- }
-
-@@ -795,7 +795,7 @@
- if(constraints<=0)
- {
- cerr<<"ERROR: int Elim_Conti_Traverso(INPUT_FILE, const BOOLEAN&):\n"
-- "number of constraints / matrix rows must be positve"<<endl;
-+ "number of constraints / matrix rows must be positive"<<endl;
- // Solving problems without constraints is possible, but not very
- // interesting (because trivial). To avoid the problems and the overhead
- // incurred by an "empty" matrix, such problems are refused.
-@@ -1003,7 +1003,7 @@
- if(variables<=0)
- {
- cerr<<"ERROR: int Pottier(INPUT_FILE, const BOOLEAN&):\n"
-- "number of variables / matrix columns must be positve"<<endl;
-+ "number of variables / matrix columns must be positive"<<endl;
- return 0;
- }
-
-@@ -1084,7 +1084,7 @@
- if(constraints<=0)
- {
- cerr<<"ERROR: int Pottier(INPUT_FILE, const BOOLEAN&):\n"
-- "number of constraints / matrix rows must be positve"<<endl;
-+ "number of constraints / matrix rows must be positive"<<endl;
- // Solving problems without constraints is possible, but not very
- // interesting (because trivial). To avoid the problems and the overhead
- // incurred by an "empty" matrix, such problems are refused.
-@@ -1291,7 +1291,7 @@
- if(variables<=0)
- {
- cerr<<"ERROR: int Hosten_Sturmfels(INPUT_FILE, const BOOLEAN&):\n"
-- "number of variables / matrix columns must be positve"<<endl;
-+ "number of variables / matrix columns must be positive"<<endl;
- return 0;
- }
-
-@@ -1372,7 +1372,7 @@
- if(constraints<=0)
- {
- cerr<<"ERROR: int Hosten_Sturmfels(INPUT_FILE, const BOOLEAN&):\n"
-- "number of constraints / matrix rows must be positve"<<endl;
-+ "number of constraints / matrix rows must be positive"<<endl;
- // Solving problems without constraints is possible, but not very
- // interesting (because trivial). To avoid the problems and the overhead
- // incurred by an "empty" matrix, such problems are refused.
-@@ -1702,7 +1702,7 @@
- if(variables<=0)
- {
- cerr<<"ERROR: int DiBiase_Urbanke(INPUT_FILE, const BOOLEAN&):\n"
-- "number of variables / matrix columns must be positve"<<endl;
-+ "number of variables / matrix columns must be positive"<<endl;
- return 0;
- }
-
-@@ -1783,7 +1783,7 @@
- if(constraints<=0)
- {
- cerr<<"ERROR: int DiBiase_Urbanke(INPUT_FILE, const BOOLEAN&):\n"
-- "number of constraints / matrix rows must be positve"<<endl;
-+ "number of constraints / matrix rows must be positive"<<endl;
- // Solving problems without constraints is possible, but not very
- // interesting (because trivial). To avoid the problems and the overhead
- // incurred by an "empty" matrix, such problems are refused.
-@@ -2070,7 +2070,7 @@
- if(variables<=0)
- {
- cerr<<"ERROR: int Bigatti_LaScala_Robbiano(INPUT_FILE, const BOOLEAN&):\n"
-- "number of variables / matrix columns must be positve"<<endl;
-+ "number of variables / matrix columns must be positive"<<endl;
- return 0;
- }
-
-@@ -2154,7 +2154,7 @@
- if(constraints<=0)
- {
- cerr<<"ERROR: int Bigatti_LaScala_Robbiano(INPUT_FILE, const BOOLEAN&):\n"
-- "number of constraints / matrix rows must be positve"<<endl;
-+ "number of constraints / matrix rows must be positive"<<endl;
- // Solving problems without constraints is possible, but not very
- // interesting (because trivial). To avoid the problems and the overhead
- // incurred by an "empty" matrix, such problems are refused.
-@@ -3711,7 +3711,7 @@
- if(new_variables<=0)
- {
- cerr<<"ERROR: int change_cost(INPUT_FILE, INPUT_FILE):\n"
-- "number of variables in second input file must be positve"<<endl;
-+ "number of variables in second input file must be positive"<<endl;
- return 0;
- }
-
---- a/kernel/linear_algebra/linearAlgebra.h
-+++ b/kernel/linear_algebra/linearAlgebra.h
-@@ -456,7 +456,7 @@
- * The algorithm relies on computing square roots of floating point numbers.
- * These will be combuted by Heron's iteration formula, with iteration
- * stopping when two successive approximations of the square root differ by
-- * no more than the given tolerance, which is assumed to be a positve real
-+ * no more than the given tolerance, which is assumed to be a positive real
- * number.
- **/
- void hessenberg(
---- a/IntegerProgramming/ideal.cc
-+++ b/IntegerProgramming/ideal.cc
-@@ -351,7 +351,7 @@
- "lexicographical \nwith positive weights"<<endl;
-
- w=_w;
-- // The argument term_ordering should be given by a homogenous grading.
-+ // The argument term_ordering should be given by a homogeneous grading.
-
- if(A._kernel_dimension==-2)
- // kernel of A not yet computed, do this now
-@@ -432,7 +432,7 @@
- if(w.weight(generator)!=0)
- cerr<<"\nWARNING: ideal& ideal::Hosten_Sturmfels_ideal(matrix&, "
- "const term_ordering&):\nInvalid row space vector does not induce "
-- "homogenous grading."<<endl;
-+ "homogeneous grading."<<endl;
-
- binomial* bin=new binomial(A.columns,generator,w);
- add_generator(*bin);
-@@ -575,7 +575,7 @@
- "reverse lexicographical \nwith positive weights"<<endl;
-
- w=_w;
-- // The argument term_ordering should be given by a homogenous grading.
-+ // The argument term_ordering should be given by a homogeneous grading.
-
- if(A._kernel_dimension==-2)
- // kernel of A not yet computed, do this now
-@@ -684,7 +684,7 @@
- if(w.weight(generator)!=0)
- cerr<<"\nWARNING: ideal& ideal::Bigatti_LaScala_Robbiano_ideal(matrix&, "
- "const term_ordering&):\nInvalid row space vector does not induce "
-- "homogenous grading."<<endl;
-+ "homogeneous grading."<<endl;
-
- binomial* bin=new binomial(A.columns+1,generator,w);
- add_generator(*bin);
--
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