[singular] 03/03: Debian patch 4.0.3-p3+ds-1
Jerome Benoit
calculus-guest at moszumanska.debian.org
Sun Oct 9 12:57:41 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 2ff8266289d5458a5e72e338e65ae2345b97b5d5
Author: Jerome Benoit <calculus at rezozer.net>
Date: Sun Oct 9 12:49:57 2016 +0100
Debian patch 4.0.3-p3+ds-1
---
debian/changelog | 18 +++++-
debian/control | 2 +-
debian/patches/debianization-documentation.patch | 4 +-
debian/patches/debianization-gather-headers.patch | 22 +++----
.../patches/debianization-rename-libraries.patch | 72 ++++++++++------------
.../debianization-rename-pkgconfig_files.patch | 22 ++++---
debian/patches/debianization.patch | 12 ++--
debian/patches/series | 5 --
debian/patches/upstream-autotools-DESTDIR.patch | 23 -------
debian/patches/upstream-autotools-help2man.patch | 9 ++-
.../patches/upstream-autotools-singular_idx.patch | 18 ------
.../upstream-bug-831072-gcc_6_1_1-segfault.patch | 17 -----
.../upstream-bug-831072-hidden-segfault.patch | 24 --------
.../upstream-lintian-spelling-error-silence.patch | 56 +----------------
debian/patches/upstream-reproducible.patch | 39 ------------
.../patches/upstream-tests-omalloc-getlucky.patch | 4 +-
16 files changed, 94 insertions(+), 253 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 461f287..e836f33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+singular (4.0.3-p3+ds-1) unstable; urgency=medium
+
+ * New upstream version.
+ * Debianization:
+ - debian/control:
+ - Build-Depends, migrate to libreadline-dev;
+ - debian/patches/:
+ - discard integrated and/or obsoleted patches:
+ - upstream-bug-831072-gcc_6_1_1-segfault.patch
+ - upstream-bug-831072-hidden-segfault.patch
+ - upstream-reproducible.patch
+ - upstream-autotools-DESTDIR.patch
+ - upstream-autotools-singular_idx.patch .
+
+ -- Jerome Benoit <calculus at rezozer.net> Sun, 09 Oct 2016 11:47:58 +0000
+
singular (4.0.3-p1+ds-4) unstable; urgency=medium
* RC fix (Closes: #837016), fix ax_prog_doxygen.m4 update issue.
@@ -147,7 +163,7 @@ singular (4.0.1p2+ds-1) experimental; urgency=medium
-- output in DEHS format;
- gpg-signature check support, neutralize.
* Minor fixes, enhancements, request for a better source tarball were
- submitted and have been integrated; thanks to the Singular Team.
+ submitted and have been ; thanks to the Singular Team.
* Upstream fixes and enhancemens have been pulled for request to the
Singular Team.
diff --git a/debian/control b/debian/control
index 15fecf3..83edefc 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Jerome Benoit <calculus at rezozer.net>
Build-Depends:
debhelper (>= 9),
autotools-dev, autoconf-archive (>= 20160320), dh-autoreconf, libtool, help2man,
- libreadline6-dev,
+ libreadline-dev,
libgmp-dev, libmpfr-dev, libglpk-dev, libcdd-dev, libflint-dev, libntl-dev,
graphviz, 4ti2, normaliz, surf-alggeo,
python-polybori (>= 0.8.3)
diff --git a/debian/patches/debianization-documentation.patch b/debian/patches/debianization-documentation.patch
index 8699238..2581dd0 100644
--- a/debian/patches/debianization-documentation.patch
+++ b/debian/patches/debianization-documentation.patch
@@ -64,5 +64,5 @@ Last-Update: 2016-04-28
+ symlinks -r -c -s -v . ; \
+ }
- configheaderdir = ${includedir}/$(DEB_HOST_MULTIARCH)/singular/singular
- nodist_configheader_HEADERS = singularconfig.h
+ uninstall-local:
+ -(cd $(DESTDIR)$(datadir); rm -rf singular info/singular.hlp)
diff --git a/debian/patches/debianization-gather-headers.patch b/debian/patches/debianization-gather-headers.patch
index 0eb694a..2f057af 100644
--- a/debian/patches/debianization-gather-headers.patch
+++ b/debian/patches/debianization-gather-headers.patch
@@ -52,15 +52,15 @@ Last-Update: 2016-04-28
pkgconfigdir = $(libdir)/pkgconfig
--- a/gfanlib/Makefile.am
+++ b/gfanlib/Makefile.am
-@@ -11,7 +11,7 @@
- SOURCES = gfanlib_zcone.cpp gfanlib_symmetry.cpp gfanlib_symmetriccomplex.cpp gfanlib_polyhedralfan.cpp gfanlib_zfan.cpp gfanlib_polymakefile.cpp
- libsingular_gfan_la_SOURCES = $(SOURCES)
+@@ -17,7 +17,7 @@
+ SOURCES = gfanlib_circuittableint.cpp gfanlib_mixedvolume.cpp gfanlib_paralleltraverser.cpp gfanlib_polyhedralfan.cpp gfanlib_polymakefile.cpp gfanlib_symmetriccomplex.cpp gfanlib_symmetry.cpp gfanlib_traversal.cpp gfanlib_zcone.cpp gfanlib_zfan.cpp
+ libsingular_gfan_la_SOURCES = $(SOURCES)
--libsingular_gfan_includedir =$(includedir)/gfanlib
-+libsingular_gfan_includedir =$(includedir)/singular/gfanlib
-
- libsingular_gfan_include_HEADERS = gfanlib_z.h gfanlib_q.h gfanlib_vector.h gfanlib_matrix.h gfanlib_zcone.h gfanlib.h gfanlib_polyhedralfan.h gfanlib_polymakefile.h gfanlib_symmetriccomplex.h gfanlib_symmetry.h gfanlib_zfan.h
+-libsingular_gfan_includedir =$(includedir)/gfanlib
++libsingular_gfan_includedir =$(includedir)/singular/gfanlib
+ libsingular_gfan_include_HEADERS = config.h gfanlib_mixedvolume.h gfanlib_polymakefile.h gfanlib_symmetry.h gfanlib_vector.h gfanlib_z.h _config.h gfanlib.h gfanlib_paralleltraverser.h gfanlib_q.h gfanlib_traversal.h gfanlib_zcone.h gfanlib_circuittableint.h gfanlib_matrix.h gfanlib_polyhedralfan.h gfanlib_symmetriccomplex.h gfanlib_tropicalhomotopy.h gfanlib_zfan.h
+ DISTCLEANFILES = config.h
--- a/factory/include/factory/Makefile.am
+++ b/factory/include/factory/Makefile.am
@@ -6,7 +6,7 @@
@@ -125,7 +125,7 @@ Last-Update: 2016-04-28
-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 prime.h
+ sirandom.h prime.h auxiliary.h
--- a/kernel/Makefile.am
+++ b/kernel/Makefile.am
@@ -239,9 +239,9 @@ Last-Update: 2016-04-28
--- a/Makefile.am
+++ b/Makefile.am
-@@ -32,7 +32,7 @@
- -mkdir $(DESTDIR)$(datadir)/info
- -mv $(DESTDIR)$(datadir)/singular/singular.hlp $(DESTDIR)$(datadir)/info/.
+@@ -35,7 +35,7 @@
+ uninstall-local:
+ -(cd $(DESTDIR)$(datadir); rm -rf singular info/singular.hlp)
-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 ada715e..07ca92f 100644
--- a/debian/patches/debianization-rename-libraries.patch
+++ b/debian/patches/debianization-rename-libraries.patch
@@ -24,7 +24,7 @@ Last-Update: 2015-10-15
omalloc.h omallocClass.h omDerivedConfig.h \
omError.h omStructs.h omAllocDecl.h \
omInlineDecl.h omBin.h omMemOps.h \
-@@ -29,20 +29,20 @@
+@@ -29,15 +29,15 @@
AM_CPPFLAGS =-I${top_srcdir}/.. -I${top_builddir}/..
@@ -33,26 +33,18 @@ Last-Update: 2015-10-15
-libomalloc_la_LDFLAGS = -release ${PACKAGE_VERSION}
+libsingular_omalloc_la_LDFLAGS = -release ${PACKAGE_VERSION}
- if WANT_DEBUG
--libomalloc_la_CFLAGS = -g
-+libsingular_omalloc_la_CFLAGS = -g
- else !WANT_DEBUG
--libomalloc_la_CFLAGS = -O2
-+libsingular_omalloc_la_CFLAGS = -O2
- endif
-nodist_libomalloc_la_SOURCES = omTables.inc omTables.h mylimits.h
+nodist_libsingular_omalloc_la_SOURCES = omTables.inc omTables.h mylimits.h
nodist_configheader_HEADERS = omConfig.h
--nodist_libomalloc_include_HEADERS = mylimits.h omTables.h
-+nodist_libsingular_omalloc_include_HEADERS = mylimits.h omTables.h
+ nodist_libomalloc_include_HEADERS = mylimits.h omTables.h
-libomalloc_la_CPPFLAGS = ${AM_CPPFLAGS} -DOM_ALLOC_INTERNAL
+libsingular_omalloc_la_CPPFLAGS = ${AM_CPPFLAGS} -DOM_ALLOC_INTERNAL
BUILT_SOURCES = omTables.inc omTables.h
-@@ -74,10 +74,10 @@
+@@ -69,10 +69,10 @@
omtTest_m_CPPFLAGS = ${AM_CPPFLAGS} -DOM_TEST_MALLOC
omtTest_m_SOURCES = $(OMTTESTSSOURCES)
@@ -227,7 +219,7 @@ Last-Update: 2015-10-15
+++ b/factory/Makefile.am
@@ -6,12 +6,12 @@
$(OMALLOC_INCLUDES) $(RESOURCES_INCLUDES) \
- $(FLINT_CFLAGS) $(NTL_CFLAGS) $(GMP_CFLAGS)
+ $(FLINT_CFLAGS) $(NTL_CFLAGS) $(GMP_CFLAGS) $(SINGULAR_CFLAGS)
-lib_LTLIBRARIES = libfactory.la
+lib_LTLIBRARIES = libsingular-factory.la
@@ -383,33 +375,6 @@ Last-Update: 2015-10-15
${top_builddir}/reporter/libreporter.la ${top_builddir}/misc/libmisc.la \
$(FACTORY_LIBS) $(RESOURCES_LIBS) $(OMALLOC_LIBS) \
$(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS)
---- a/gfanlib/Makefile.am
-+++ b/gfanlib/Makefile.am
-@@ -1,19 +1,19 @@
- ACLOCAL_AMFLAGS = -I ../m4
-
- if HAVE_GFANLIB
-- libgfan_LTLIBRARIES=libgfan.la
-+ libsingular_gfan_LTLIBRARIES=libsingular-gfan.la
- endif
-
--libgfandir = $(libdir)
-+libsingular_gfandir = $(libdir)
-
- AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -DGMPRATIONAL
-
- SOURCES = gfanlib_zcone.cpp gfanlib_symmetry.cpp gfanlib_symmetriccomplex.cpp gfanlib_polyhedralfan.cpp gfanlib_zfan.cpp gfanlib_polymakefile.cpp
--libgfan_la_SOURCES = $(SOURCES)
-+libsingular_gfan_la_SOURCES = $(SOURCES)
-
--libgfan_includedir =$(includedir)/gfanlib
-+libsingular_gfan_includedir =$(includedir)/gfanlib
-
--libgfan_include_HEADERS = gfanlib_z.h gfanlib_q.h gfanlib_vector.h gfanlib_matrix.h gfanlib_zcone.h gfanlib.h gfanlib_polyhedralfan.h gfanlib_polymakefile.h gfanlib_symmetriccomplex.h gfanlib_symmetry.h gfanlib_zfan.h
-+libsingular_gfan_include_HEADERS = gfanlib_z.h gfanlib_q.h gfanlib_vector.h gfanlib_matrix.h gfanlib_zcone.h gfanlib.h gfanlib_polyhedralfan.h gfanlib_polymakefile.h gfanlib_symmetriccomplex.h gfanlib_symmetry.h gfanlib_zfan.h
-
- DISTCLEANFILES = config.h
-
--- a/Singular/dyn_modules/gfanlib/Makefile.am
+++ b/Singular/dyn_modules/gfanlib/Makefile.am
@@ -33,7 +33,7 @@
@@ -483,3 +448,32 @@ Last-Update: 2015-10-15
+Libs: -L${libdir} -lsingular-polys @FLINT_LIBS@ @NTL_LIBS@ @GMP_LIBS@ @USEPPROCSDYNAMICLD@
Libs.private:
+--- a/gfanlib/Makefile.am
++++ b/gfanlib/Makefile.am
+@@ -1,10 +1,10 @@
+ ACLOCAL_AMFLAGS = -I ../m4
+
+ if HAVE_GFANLIB
+- libgfan_LTLIBRARIES=libgfan.la
++ libsingular_gfan_LTLIBRARIES=libsingular-gfan.la
+ endif
+
+-libgfandir = $(libdir)
++libsingular_gfandir = $(libdir)
+
+ AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -DGMPRATIONAL
+
+@@ -15,10 +15,10 @@
+
+
+ SOURCES = gfanlib_circuittableint.cpp gfanlib_mixedvolume.cpp gfanlib_paralleltraverser.cpp gfanlib_polyhedralfan.cpp gfanlib_polymakefile.cpp gfanlib_symmetriccomplex.cpp gfanlib_symmetry.cpp gfanlib_traversal.cpp gfanlib_zcone.cpp gfanlib_zfan.cpp
+-libgfan_la_SOURCES = $(SOURCES)
++libsingular_gfan_la_SOURCES = $(SOURCES)
+
+-libgfan_includedir =$(includedir)/gfanlib
+-libgfan_include_HEADERS = config.h gfanlib_mixedvolume.h gfanlib_polymakefile.h gfanlib_symmetry.h gfanlib_vector.h gfanlib_z.h _config.h gfanlib.h gfanlib_paralleltraverser.h gfanlib_q.h gfanlib_traversal.h gfanlib_zcone.h gfanlib_circuittableint.h gfanlib_matrix.h gfanlib_polyhedralfan.h gfanlib_symmetriccomplex.h gfanlib_tropicalhomotopy.h gfanlib_zfan.h
++libsingular_gfan_includedir =$(includedir)/gfanlib
++libsingular_gfan_include_HEADERS = config.h gfanlib_mixedvolume.h gfanlib_polymakefile.h gfanlib_symmetry.h gfanlib_vector.h gfanlib_z.h _config.h gfanlib.h gfanlib_paralleltraverser.h gfanlib_q.h gfanlib_traversal.h gfanlib_zcone.h gfanlib_circuittableint.h gfanlib_matrix.h gfanlib_polyhedralfan.h gfanlib_symmetriccomplex.h gfanlib_tropicalhomotopy.h gfanlib_zfan.h
+
+ DISTCLEANFILES = config.h
+
diff --git a/debian/patches/debianization-rename-pkgconfig_files.patch b/debian/patches/debianization-rename-pkgconfig_files.patch
index 7b6f423..5b25b1e 100644
--- a/debian/patches/debianization-rename-pkgconfig_files.patch
+++ b/debian/patches/debianization-rename-pkgconfig_files.patch
@@ -73,13 +73,12 @@ Last-Update: 2015-08-02
AC_SUBST(PKG_REQUIRE)
else
AC_MSG_RESULT(no)
-@@ -151,7 +151,7 @@
+@@ -151,6 +151,6 @@
AC_CONFIG_FILES([coeffs/Makefile])
AC_CONFIG_FILES([polys/Makefile])
AC_CONFIG_FILES([tests/Makefile])
-AC_CONFIG_FILES([libpolys.pc])
+AC_CONFIG_FILES([singular-libpolys.pc:libpolys.pc.in])
- AC_CONFIG_FILES([misc/auxiliary.h])
AC_CONFIG_FILES([libpolys-config], [chmod a+x libpolys-config])
AC_OUTPUT
--- a/resources/configure.ac
@@ -150,7 +149,16 @@ Last-Update: 2015-08-02
--- a/omalloc/Makefile.am
+++ b/omalloc/Makefile.am
-@@ -80,7 +80,7 @@
+@@ -35,7 +35,7 @@
+
+ nodist_libsingular_omalloc_la_SOURCES = omTables.inc omTables.h mylimits.h
+ nodist_configheader_HEADERS = omConfig.h
+-nodist_libomalloc_include_HEADERS = mylimits.h omTables.h
++nodist_libsingular_omalloc_include_HEADERS = mylimits.h omTables.h
+
+ libsingular_omalloc_la_CPPFLAGS = ${AM_CPPFLAGS} -DOM_ALLOC_INTERNAL
+
+@@ -75,7 +75,7 @@
omtTest_r_LDADD = libsingular-omalloc.la
pkgconfigdir = $(libdir)/pkgconfig
@@ -188,7 +196,7 @@ Last-Update: 2015-08-02
AC_SUBST(PKG_REQUIRE)
else
AC_MSG_RESULT(no)
-@@ -216,7 +216,7 @@
+@@ -214,7 +214,7 @@
ac_configure_args="$ac_configure_args $ENABLE_ARG"
@@ -197,9 +205,9 @@ Last-Update: 2015-08-02
AC_SUBST(PKG_REQUIRE)
fi
-@@ -273,7 +273,7 @@
-
- AC_DEFINE(HAVE_FACTORY,[1],[Enable factory])
+@@ -269,7 +269,7 @@
+ #
+ AC_LANG_POP([C++])
- PKG_REQUIRE="$PKG_REQUIRE factory"
+ PKG_REQUIRE="$PKG_REQUIRE singular-factory"
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index 54a8ada..dc78d4d 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -17,9 +17,9 @@ 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 $(DESTDIR)$(datadir)/info
- -mv $(DESTDIR)$(datadir)/singular/singular.hlp $(DESTDIR)$(datadir)/info/.
+@@ -35,7 +35,7 @@
+ uninstall-local:
+ -(cd $(DESTDIR)$(datadir); rm -rf singular info/singular.hlp)
-configheaderdir = ${includedir}/singular
+configheaderdir = ${includedir}/$(DEB_HOST_MULTIARCH)/singular
@@ -62,8 +62,8 @@ Last-Update: 2015-10-15
libomalloc_includedir=$(includedir)/omalloc
libomalloc_include_HEADERS = \
-@@ -38,7 +39,8 @@
- endif
+@@ -33,7 +34,8 @@
+ libomalloc_la_LDFLAGS = -release ${PACKAGE_VERSION}
nodist_libomalloc_la_SOURCES = omTables.inc omTables.h mylimits.h
-nodist_libomalloc_include_HEADERS = omConfig.h mylimits.h omTables.h
@@ -248,7 +248,7 @@ Last-Update: 2015-10-15
$(HELP2MAN) \
--- a/Singular/tesths.cc
+++ b/Singular/tesths.cc
-@@ -137,7 +137,7 @@
+@@ -136,7 +136,7 @@
" A Computer Algebra System for Polynomial Computations / version %s\n"
" 0<\n"
" by: W. Decker, G.-M. Greuel, G. Pfister, H. Schoenemann \\ %s\n"
diff --git a/debian/patches/series b/debian/patches/series
index 6586ea3..231c1a5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,6 @@
upstream-bug-837016-doxygen-ax-update.patch
-upstream-bug-831072-gcc_6_1_1-segfault.patch
-upstream-bug-831072-hidden-segfault.patch
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
deleted file mode 100644
index a69962b..0000000
--- a/debian/patches/upstream-autotools-DESTDIR.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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-help2man.patch b/debian/patches/upstream-autotools-help2man.patch
index 63a54aa..5b44cdc 100644
--- a/debian/patches/upstream-autotools-help2man.patch
+++ b/debian/patches/upstream-autotools-help2man.patch
@@ -5,7 +5,7 @@ Description: autotools: help2man
Origin: debian
Forwarded: https://github.com/Singular/Sources/pull/695
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2015-10-15
+Last-Update: 2016-08-21
--- a/configure.ac
+++ b/configure.ac
@@ -86,7 +86,7 @@ Last-Update: 2015-10-15
dist-hook:
$(srcdir)/git-version-gen $(srcdir)/.tarball-git-version > $(distdir)/.tarball-git-version
-@@ -25,7 +36,14 @@
+@@ -28,7 +39,14 @@
nodist_configheader_HEADERS = singularconfig.h
DISTCLEANFILES = $(nodist_configheader_HEADERS)
@@ -115,13 +115,12 @@ Last-Update: 2015-10-15
# Checks for libraries.
LB_CHECK_GMP(3.1.1,,AC_MSG_ERROR([Unable to find GMP on your machine: please use --with-gmp=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
LB_CHECK_NTL(5.0,,AC_MSG_WARN([Unable to find NTL (which is strongly recommended) on your machine: please use --with-ntl=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
-@@ -146,5 +149,7 @@
+@@ -146,5 +149,6 @@
AC_CONFIG_FILES([coeffs/Makefile])
AC_CONFIG_FILES([polys/Makefile])
AC_CONFIG_FILES([tests/Makefile])
--AC_CONFIG_FILES([libpolys-config libpolys.pc misc/auxiliary.h])
+-AC_CONFIG_FILES([libpolys-config libpolys.pc])
+AC_CONFIG_FILES([libpolys.pc])
-+AC_CONFIG_FILES([misc/auxiliary.h])
+AC_CONFIG_FILES([libpolys-config], [chmod a+x libpolys-config])
AC_OUTPUT
--- a/libpolys/Makefile.am
diff --git a/debian/patches/upstream-autotools-singular_idx.patch b/debian/patches/upstream-autotools-singular_idx.patch
deleted file mode 100644
index f50e5b3..0000000
--- a/debian/patches/upstream-autotools-singular_idx.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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-bug-831072-gcc_6_1_1-segfault.patch b/debian/patches/upstream-bug-831072-gcc_6_1_1-segfault.patch
deleted file mode 100644
index b79ccc4..0000000
--- a/debian/patches/upstream-bug-831072-gcc_6_1_1-segfault.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: upstream -- RC bug fix 831072 -- segfault
-Origin: Singular Team
-Comment: http://www.singular.uni-kl.de:8002/trac/ticket/769
-Author: Hans Schoenemann <notifications at github.com>
-Last-Update: 2016-07-25
-
---- a/m4/flags.m4
-+++ b/m4/flags.m4
-@@ -122,7 +122,7 @@
- ## for clang: -Wunneeded-internal-declaration
-
- if test "x${ENABLE_OPTIMIZATION}" != xno; then
-- OPTFLAGS="-O3 -Wno-unused-function -Wno-trigraphs -Wno-unused-parameter -Wunknown-pragmas -Wno-unused-variable -fomit-frame-pointer -fwrapv -fvisibility=default -finline-functions -fno-exceptions -fno-rtti -fno-threadsafe-statics -fno-enforce-eh-specs -fconserve-space -funroll-loops"
-+ OPTFLAGS="-O3 -Wno-unused-function -Wno-trigraphs -Wno-unused-parameter -Wunknown-pragmas -Wno-unused-variable -fomit-frame-pointer -fwrapv -fvisibility=default -finline-functions -fno-exceptions -fno-rtti -fno-threadsafe-statics -fno-enforce-eh-specs -fconserve-space -funroll-loops -fno-delete-null-pointer-checks"
- # -O3 - crashes gcc???!!!
- # -fpermissive
- AC_LANG_PUSH([C])
diff --git a/debian/patches/upstream-bug-831072-hidden-segfault.patch b/debian/patches/upstream-bug-831072-hidden-segfault.patch
deleted file mode 100644
index 0f59784..0000000
--- a/debian/patches/upstream-bug-831072-hidden-segfault.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: upstream -- RC bug fix 831072 -- hidden bug
- Correct an segfault revealed while attempting to fix RC bug 831072
- on a Debian porter machine: the segfault was caused by a faulty
- fprintf format. Meant to be submitted to the upstream maintainer
- team.
-Origin: debian
-Forwarded: https://github.com/Singular/Sources/pull/773
-Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-07-25
-
---- a/Singular/emacs.cc
-+++ b/Singular/emacs.cc
-@@ -202,9 +202,9 @@
- if (emacs == NULL)
- {
- #ifdef __CYGWIN__
-- error( "Error: Can't find rxvt program. \n Expected it at %s or %s\n Specify alternative with --rxvt=PROGRAM option,\n or set RXVT environment variable to the name of the program to use as xterm.\n",
-+ error( "Error: Can't find rxvt program. \n Expected it at %s\n Specify alternative with --rxvt=PROGRAM option,\n or set RXVT environment variable to the name of the program to use as rxvt.\n",
- #else
-- error( "Error: Can't find xterm program. \n Expected it at %s or %s\n Specify alternative with --xterm=PROGRAM option,\n or set XTERM environment variable to the name of the program to use as xterm.\n",
-+ error( "Error: Can't find xterm program. \n Expected it at %s\n Specify alternative with --xterm=PROGRAM option,\n or set XTERM environment variable to the name of the program to use as xterm.\n",
- #endif
- feResourceDefault('X'));
- mainUsage();
diff --git a/debian/patches/upstream-lintian-spelling-error-silence.patch b/debian/patches/upstream-lintian-spelling-error-silence.patch
index 9380c85..3b702d4 100644
--- a/debian/patches/upstream-lintian-spelling-error-silence.patch
+++ b/debian/patches/upstream-lintian-spelling-error-silence.patch
@@ -3,27 +3,14 @@ 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/761
- https://github.com/Singular/Sources/pull/793
+Forwarded: WIP
Comment: spelling-error-in-binary
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-09-29
+Last-Update: 2016-08-21
---- a/Singular/feOptTab.h
-+++ b/Singular/feOptTab.h
-@@ -142,7 +142,7 @@
-
-
- {"MPport", required_argument, LONG_OPTION_RETURN,
-- "PORT", "Use PORT number for conections", feOptString, 0, 0},
-+ "PORT", "Use PORT number for connections", feOptString, 0, 0},
-
- {"MPhost", required_argument, LONG_OPTION_RETURN,
- "HOST", "Use HOST for connections", feOptString, 0, 0},
--- a/kernel/numeric/mpr_base.cc
+++ b/kernel/numeric/mpr_base.cc
-@@ -1355,7 +1355,7 @@
+@@ -1354,7 +1354,7 @@
if ( !remapXiToPoint( LP->iposv[i+1], pQ, &(optSum[c].set), &(optSum[c].pnt) ) )
{
Werror(" resMatrixSparse::RC: Found bad solution in LP: %d!",LP->iposv[i+1]);
@@ -32,40 +19,3 @@ Last-Update: 2016-09-29
return -1;
}
bucket[optSum[c].set]++;
---- a/libpolys/coeffs/longrat.cc
-+++ b/libpolys/coeffs/longrat.cc
-@@ -578,7 +578,7 @@
- if (a==INT_TO_SR(0))
- return 0; /* rational 0*/
- if (SR_HDL(a) & SR_INT)
-- return 1; /* immidiate int */
-+ return 1; /* immediate int */
- int s=a->z[0]._mp_alloc;
- // while ((s>0) &&(a->z._mp_d[s]==0L)) s--;
- //#if SIZEOF_LONG == 8
---- a/libpolys/coeffs/longrat.h
-+++ b/libpolys/coeffs/longrat.h
-@@ -102,7 +102,7 @@
- n_Test(q, r);
-
- if (SR_HDL(q) & SR_INT)
-- return TRUE; // immidiate int
-+ return TRUE; // immediate int
-
- return ( q->s == 3 );
- }
---- a/factory/NTLconvert.cc
-+++ b/factory/NTLconvert.cc
-@@ -205,10 +205,10 @@
- if (!i.coeff().isImm())
- {
- #ifndef NOSTREAMIO
-- cout<<"convertFacCF2NTLGF2X: coefficient not immidiate! : " << f << "\n";
-+ cout<<"convertFacCF2NTLGF2X: coefficient not immediate! : " << f << "\n";
- #else
- //NTL_SNS
-- printf("convertFacCF2NTLGF2X: coefficient not immidiate!");
-+ printf("convertFacCF2NTLGF2X: coefficient not immediate!");
- #endif
- NTL_SNS exit(1);
- }
diff --git a/debian/patches/upstream-reproducible.patch b/debian/patches/upstream-reproducible.patch
deleted file mode 100644
index 9cd149a..0000000
--- a/debian/patches/upstream-reproducible.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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/patches/upstream-tests-omalloc-getlucky.patch b/debian/patches/upstream-tests-omalloc-getlucky.patch
index 97a25b6..715b859 100644
--- a/debian/patches/upstream-tests-omalloc-getlucky.patch
+++ b/debian/patches/upstream-tests-omalloc-getlucky.patch
@@ -11,7 +11,7 @@ Last-Update: 2015-11-14
--- a/omalloc/Makefile.am
+++ b/omalloc/Makefile.am
-@@ -60,9 +60,11 @@
+@@ -55,9 +55,11 @@
####################################################
## Test program
@@ -25,7 +25,7 @@ Last-Update: 2015-11-14
# EXTRA_PROGRAMS = omtTest-r
-@@ -78,3 +80,12 @@
+@@ -73,3 +75,12 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = omalloc.pc
--
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