[singular] 04/04: Imported Debian patch 1:4.1.0-p2+ds-1
Jerome Benoit
calculus-guest at moszumanska.debian.org
Sat Feb 25 08:15:47 UTC 2017
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository singular.
commit 315696e50001cc684d02c1cf5cd824fff26db054
Author: Jerome Benoit <calculus at rezozer.net>
Date: Sat Feb 25 11:42:53 2017 +0400
Imported Debian patch 1:4.1.0-p2+ds-1
---
debian/changelog | 7 +-
debian/patches/debianization-gather-headers.patch | 22 +--
.../patches/debianization-rename-libraries.patch | 154 +++++++++++++--------
.../debianization-rename-pkgconfig_files.patch | 12 +-
debian/patches/debianization.patch | 36 ++---
debian/patches/upstream-autotools-help2man.patch | 14 +-
6 files changed, 139 insertions(+), 106 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index cd9bd77..e3c4f98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-singular (1:4.1.0-p2+ds-0) UNRELEASED; urgency=medium
+singular (1:4.1.0-p2+ds-1) experimental; urgency=medium
* New upstream minor version.
* Debianization:
- - d/control, update.
+ - d/control, update;
+ - d/patches/*, refresh.
- -- Jerome Benoit <calculus at rezozer.net> Fri, 24 Feb 2017 20:55:57 +0000
+ -- Jerome Benoit <calculus at rezozer.net> Sat, 25 Feb 2017 07:41:13 +0000
singular (1:4.1.0-p1+ds-1) experimental; urgency=medium
diff --git a/debian/patches/debianization-gather-headers.patch b/debian/patches/debianization-gather-headers.patch
index 0970a98..2143f56 100644
--- a/debian/patches/debianization-gather-headers.patch
+++ b/debian/patches/debianization-gather-headers.patch
@@ -36,7 +36,7 @@ Last-Update: 2016-10-20
+++ b/resources/Makefile.am
@@ -13,13 +13,13 @@
- libsingular_resources_la_LDFLAGS = -release ${PACKAGE_VERSION}
+ libsingular_resources_la_LDFLAGS = $(SINGULAR_LDFLAGS) -release ${PACKAGE_VERSION}
-configheaderdir = $(includedir)/$(DEB_HOST_MULTIARCH)/resources
-libsingular_resources_includedir =$(includedir)/resources
@@ -54,9 +54,9 @@ Last-Update: 2016-10-20
pkgconfig_DATA = singular_resources.pc
--- a/gfanlib/Makefile.am
+++ b/gfanlib/Makefile.am
-@@ -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
+@@ -18,7 +18,7 @@
libsingular_gfan_la_SOURCES = $(SOURCES)
+ libsingular_gfan_la_LDFLAGS = $(SINGULAR_LDFLAGS) $(CDDGMPLDFLAGS)
-libsingular_gfan_includedir =$(includedir)/gfanlib
+libsingular_gfan_includedir =$(includedir)/singular/gfanlib
@@ -87,8 +87,8 @@ Last-Update: 2016-10-20
--- a/Singular/Makefile.am
+++ b/Singular/Makefile.am
-@@ -128,7 +128,7 @@
- libsingular_Singular_la_LDFLAGS =${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} -release ${PACKAGE_VERSION} ${PTHREAD_LDFLAGS}
+@@ -131,7 +131,7 @@
+ libsingular_Singular_la_LDFLAGS =$(SINGULAR_LDFLAGS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} -release ${PACKAGE_VERSION} ${PTHREAD_LDFLAGS}
libsingular_Singular_la_LIBADD =${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${BUILTIN_FLAGS} ${top_builddir}/kernel/libkernel.la ${PTHREAD_LIBS}
-libsingular_Singular_includedir = ${includedir}/singular/Singular
@@ -98,7 +98,7 @@ Last-Update: 2016-10-20
#########################################################
--- a/libpolys/reporter/Makefile.am
+++ b/libpolys/reporter/Makefile.am
-@@ -9,7 +9,7 @@
+@@ -10,7 +10,7 @@
## libreporter_la_LDFLAGS = -release ${PACKAGE_VERSION}
## libreporter_la_LIBADD = ${top_builddir}/misc/libmisc.la
@@ -120,9 +120,9 @@ Last-Update: 2016-10-20
shortfl.h mpr_complex.h mpr_global.h numstats.h \
--- a/libpolys/misc/Makefile.am
+++ b/libpolys/misc/Makefile.am
-@@ -10,7 +10,7 @@
-
+@@ -11,7 +11,7 @@
libmisc_la_SOURCES = int64vec.cc options.c sirandom.c intvec.cc prime.cc
+ libmisc_la_LDFLAGS = $(SINGULAR_LDFLAGS)
-libmisc_la_includedir = $(includedir)/singular/misc
+libmisc_la_includedir = $(includedir)/singular/singular/misc
@@ -131,9 +131,9 @@ Last-Update: 2016-10-20
--- a/kernel/Makefile.am
+++ b/kernel/Makefile.am
-@@ -23,7 +23,7 @@
-
+@@ -25,7 +25,7 @@
libkernel_la_SOURCES=$(KERNELHEADERS)
+ libkernel_la_LDFLAGS = $(SINGULAR_LDFLAGS)
-libkernel_la_includedir=${includedir}/singular/kernel
+libkernel_la_includedir=${includedir}/singular/singular/kernel
@@ -360,7 +360,7 @@ Last-Update: 2016-10-20
+++ b/xalloc/Makefile.am
@@ -2,9 +2,9 @@
- lib_LTLIBRARIES=libsingular-omalloc.la
+ lib_LTLIBRARIES=libsingular_omalloc.la
-libsingular_omalloc_includedir=$(includedir)/omalloc
+libsingular_omalloc_includedir=$(includedir)/singular/omalloc
diff --git a/debian/patches/debianization-rename-libraries.patch b/debian/patches/debianization-rename-libraries.patch
index 2d94e8c..e0eb39f 100644
--- a/debian/patches/debianization-rename-libraries.patch
+++ b/debian/patches/debianization-rename-libraries.patch
@@ -31,8 +31,8 @@ Last-Update: 2016-10-20
-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 = $(SINGULAR_LDFLAGS) -release ${PACKAGE_VERSION}
++libsingular_omalloc_la_LDFLAGS = $(SINGULAR_LDFLAGS) -release ${PACKAGE_VERSION}
-nodist_libomalloc_la_SOURCES = omTables.inc omTables.h mylimits.h
+nodist_libsingular_omalloc_la_SOURCES = omTables.inc omTables.h mylimits.h
@@ -59,7 +59,7 @@ Last-Update: 2016-10-20
pkgconfig_DATA = omalloc.pc
--- a/Singular/Makefile.am
+++ b/Singular/Makefile.am
-@@ -15,10 +15,10 @@
+@@ -19,10 +19,10 @@
########################### libSingular* #########################
@@ -73,7 +73,7 @@ Last-Update: 2016-10-20
SOURCES = \
links/asciiLink.cc\
-@@ -71,7 +71,7 @@
+@@ -75,7 +75,7 @@
# links/slInit_Dynamic.cc
@@ -82,16 +82,16 @@ Last-Update: 2016-10-20
SingularHEADERS = \
attrib.h \
-@@ -123,13 +123,13 @@
+@@ -126,13 +126,13 @@
# -DMAKE_DISTRIBUTION
# plural_cmd.inc
-nodist_libSingular_la_SOURCES = feOpt.inc iparith.inc
+nodist_libsingular_Singular_la_SOURCES = feOpt.inc iparith.inc
--libSingular_la_LDFLAGS =${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} -release ${PACKAGE_VERSION} ${PTHREAD_LDFLAGS}
+-libSingular_la_LDFLAGS =$(SINGULAR_LDFLAGS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} -release ${PACKAGE_VERSION} ${PTHREAD_LDFLAGS}
-libSingular_la_LIBADD =${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${BUILTIN_FLAGS} ${top_builddir}/kernel/libkernel.la ${PTHREAD_LIBS}
-+libsingular_Singular_la_LDFLAGS =${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} -release ${PACKAGE_VERSION} ${PTHREAD_LDFLAGS}
++libsingular_Singular_la_LDFLAGS =$(SINGULAR_LDFLAGS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} -release ${PACKAGE_VERSION} ${PTHREAD_LDFLAGS}
+libsingular_Singular_la_LIBADD =${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${BUILTIN_FLAGS} ${top_builddir}/kernel/libkernel.la ${PTHREAD_LIBS}
-libSingular_includedir = ${includedir}/singular/Singular
@@ -101,7 +101,7 @@ Last-Update: 2016-10-20
#########################################################
# handle all the generated *.inc
-@@ -174,13 +174,13 @@
+@@ -177,13 +177,13 @@
Singular_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc utils.h
@@ -117,7 +117,7 @@ Last-Update: 2016-10-20
Singulard_LDFLAGS = -shared ${AM_LDFLAGS} ${BUILTIN_FLAGS}
-@@ -191,8 +191,9 @@
+@@ -194,8 +194,9 @@
ESingular_CPPFLAGS = ${AM_CPPFLAGS} -DESINGULAR -DPROTO
# ESingular_LDFLAGS = ${AM_LDFLAGS}
ESingular_LDADD = ${top_builddir}/libpolys/reporter/libreporter.la \
@@ -129,7 +129,7 @@ Last-Update: 2016-10-20
ESingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptES.inc feOpt.cc
-@@ -201,8 +202,9 @@
+@@ -204,8 +205,9 @@
TSingular_CPPFLAGS = ${AM_CPPFLAGS} -DTSINGULAR -DPROTO
# TSingular_LDFLAGS = ${AM_LDFLAGS}
TSingular_LDADD = ${top_builddir}/libpolys/reporter/libreporter.la \
@@ -141,7 +141,7 @@ Last-Update: 2016-10-20
TSingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptTS.inc feOpt.cc
# utils.cc utils.h
-@@ -213,7 +215,7 @@
+@@ -216,7 +218,7 @@
libparse_SOURCES = libparse.cc fegetopt.c fegetopt.h utils.cc utils.h
@@ -150,7 +150,7 @@ Last-Update: 2016-10-20
libparse_LDFLAGS = ${AM_LDFLAGS}
%.1: %
-@@ -254,7 +256,7 @@
+@@ -257,7 +259,7 @@
check_PROGRAMS=$(TESTS)
test_SOURCES = test.cc
@@ -159,35 +159,6 @@ Last-Update: 2016-10-20
#########################################################
# These files are built first
---- a/xalloc/Makefile.am
-+++ b/xalloc/Makefile.am
-@@ -1,20 +1,20 @@
- ACLOCAL_AMFLAGS = -I ../m4
-
--lib_LTLIBRARIES=libomalloc.la
-+lib_LTLIBRARIES=libsingular-omalloc.la
-
--libomalloc_includedir=$(includedir)/omalloc
-+libsingular_omalloc_includedir=$(includedir)/omalloc
-
--libomalloc_include_HEADERS = omalloc.h omallocClass.h
-+libsingular_omalloc_include_HEADERS = omalloc.h omallocClass.h
-
- SOURCES=dummy.c omallocClass.cc
-
- AM_CPPFLAGS =-I${top_srcdir}/.. -I${top_builddir}/..
-
--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_CPPFLAGS = ${AM_CPPFLAGS}
-+libsingular_omalloc_la_CPPFLAGS = ${AM_CPPFLAGS}
-
- omTables_CPPFLAGS = ${AM_CPPFLAGS}
-
--- a/m4/options.m4
+++ b/m4/options.m4
@@ -130,7 +130,7 @@
@@ -230,8 +201,8 @@ Last-Update: 2016-10-20
+libsingular_factory_la_LIBADD =$(RESOURCES_LIBS) $(OMALLOC_LIBS) \
$(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS)
--libfactory_la_LDFLAGS = -release ${PACKAGE_VERSION}
-+libsingular_factory_la_LDFLAGS = -release ${PACKAGE_VERSION}
+-libfactory_la_LDFLAGS = $(SINGULAR_LDFLAGS) -release ${PACKAGE_VERSION}
++libsingular_factory_la_LDFLAGS = $(SINGULAR_LDFLAGS) -release ${PACKAGE_VERSION}
# factory source files
SOURCES = \
@@ -285,17 +256,6 @@ Last-Update: 2016-10-20
####################################################
## PKG config
---- a/kernel/Makefile.am
-+++ b/kernel/Makefile.am
-@@ -14,7 +14,7 @@
-
- libkernelCommon_la_SOURCES = $(SOURCES)
- libkernelCommon_la_LIBADD = ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} \
--${abs_top_builddir}/libpolys/polys/libpolys.la
-+${abs_top_builddir}/libpolys/polys/libsingular-polys.la
-
- ###### libkerneldir = $(libdir)/singular
-
--- a/libpolys/polys/Makefile.am
+++ b/libpolys/polys/Makefile.am
@@ -22,8 +22,8 @@
@@ -325,9 +285,9 @@ Last-Update: 2016-10-20
-EXTRA_libpolys_la_SOURCES = templates/p_Procs_Static.cc templates/p_Procs_Dynamic.cc
+EXTRA_libsingular_polys_la_SOURCES = templates/p_Procs_Static.cc templates/p_Procs_Dynamic.cc
--libpolys_la_LDFLAGS= ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} -release ${PACKAGE_VERSION}
+-libpolys_la_LDFLAGS= $(SINGULAR_LDFLAGS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} -release ${PACKAGE_VERSION}
-libpolys_la_LIBADD = ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${top_builddir}/coeffs/libcoeffs.la
-+libsingular_polys_la_LDFLAGS= ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} -release ${PACKAGE_VERSION}
++libsingular_polys_la_LDFLAGS= $(SINGULAR_LDFLAGS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} -release ${PACKAGE_VERSION}
+libsingular_polys_la_LIBADD = ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${top_builddir}/coeffs/libcoeffs.la
@@ -343,12 +303,12 @@ Last-Update: 2016-10-20
$(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS)
--- a/Singular/dyn_modules/gfanlib/Makefile.am
+++ b/Singular/dyn_modules/gfanlib/Makefile.am
-@@ -33,7 +33,7 @@
- CXXFLAGS+= $(FEXCEPTIONSFRTTI_CXXFLAGS)
+@@ -40,7 +40,7 @@
+ endif
if HAVE_GFANLIB
-- gfanlib_la_LIBADD = ${abs_top_builddir}/gfanlib/libgfan.la ${CDDGMPLDFLAGS}
-+ gfanlib_la_LIBADD = ${abs_top_builddir}/gfanlib/libsingular-gfan.la ${CDDGMPLDFLAGS}
+- gfanlib_la_LIBADD += ${abs_top_builddir}/gfanlib/libgfan.la ${CDDGMPLDFLAGS}
++ gfanlib_la_LIBADD += ${abs_top_builddir}/gfanlib/libsingular-gfan.la ${CDDGMPLDFLAGS}
endif
#AM_COLOR_TESTS=always
@@ -408,12 +368,14 @@ Last-Update: 2016-10-20
AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -DGMPRATIONAL
-@@ -15,10 +15,10 @@
+@@ -15,11 +15,11 @@
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)
+-libgfan_la_LDFLAGS = $(SINGULAR_LDFLAGS) $(CDDGMPLDFLAGS)
+libsingular_gfan_la_SOURCES = $(SOURCES)
++libsingular_gfan_la_LDFLAGS = $(SINGULAR_LDFLAGS) $(CDDGMPLDFLAGS)
-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
@@ -455,3 +417,73 @@ Last-Update: 2016-10-20
+Libs: -L${libdir} -lsingular-resources
# Libs.private:
+--- a/kernel/Makefile.am
++++ b/kernel/Makefile.am
+@@ -14,7 +14,7 @@
+
+ libkernelCommon_la_SOURCES = $(SOURCES)
+ libkernelCommon_la_LIBADD = ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} \
+-${abs_top_builddir}/libpolys/polys/libpolys.la
++${abs_top_builddir}/libpolys/polys/libsingular-polys.la
+ libkernelCommon_la_LDFLAGS = $(SINGULAR_LDFLAGS)
+
+ ###### libkerneldir = $(libdir)/singular
+@@ -51,7 +51,7 @@
+ check_PROGRAMS = $(TESTS)
+
+ test_SOURCES = test.cc
+-test_LDADD = libkernel.la ${builddir}/../Singular/libSingular.la
++test_LDADD = libkernel.la ${builddir}/../Singular/libsingular-Singular.la
+
+ # These files are built first
+ # BUILT_SOURCES = MOD
+--- a/xalloc/Makefile.am
++++ b/xalloc/Makefile.am
+@@ -1,20 +1,20 @@
+ ACLOCAL_AMFLAGS = -I ../m4
+
+-lib_LTLIBRARIES=libomalloc.la
++lib_LTLIBRARIES=libsingular_omalloc.la
+
+-libomalloc_includedir=$(includedir)/omalloc
++libsingular_omalloc_includedir=$(includedir)/omalloc
+
+-libomalloc_include_HEADERS = omalloc.h omallocClass.h
++libsingular_omalloc_include_HEADERS = omalloc.h omallocClass.h
+
+ SOURCES=dummy.c omallocClass.cc
+
+ AM_CPPFLAGS =-I${top_srcdir}/.. -I${top_builddir}/..
+
+-libomalloc_la_SOURCES=$(SOURCES) $(noinst_HEADERS)
++libsingular_omalloc_la_SOURCES=$(SOURCES) $(noinst_HEADERS)
+
+-libomalloc_la_LDFLAGS = $(SINGULAR_LDFLAGS) -release ${PACKAGE_VERSION}
++libsingular_omalloc_la_LDFLAGS = $(SINGULAR_LDFLAGS) -release ${PACKAGE_VERSION}
+
+-libomalloc_la_CPPFLAGS = ${AM_CPPFLAGS}
++libsingular_omalloc_la_CPPFLAGS = ${AM_CPPFLAGS}
+
+ omTables_CPPFLAGS = ${AM_CPPFLAGS}
+
+--- a/kernel/combinatorics/Makefile.am
++++ b/kernel/combinatorics/Makefile.am
+@@ -17,6 +17,6 @@
+ TESTS = test
+ check_PROGRAMS = $(TESTS)
+ test_SOURCES = test.cc
+-test_LDADD = libcombinatorics.la ${builddir}/../libkernelCommon.la ${builddir}/../../Singular/libSingular.la
++test_LDADD = libcombinatorics.la ${builddir}/../libkernelCommon.la ${builddir}/../../Singular/libsingular-Singular.la
+
+ CLEANFILES = $(TESTS)
+--- a/kernel/GBEngine/Makefile.am
++++ b/kernel/GBEngine/Makefile.am
+@@ -17,7 +17,7 @@
+ TESTS = test
+ check_PROGRAMS = $(TESTS)
+ test_SOURCES = test.cc
+-test_LDADD = libGBEngine.la ${builddir}/../combinatorics/libcombinatorics.la ${builddir}/../linear_algebra/liblinear_algebra.la ${builddir}/../libkernelCommon.la ${builddir}/../../Singular/libSingular.la
++test_LDADD = libGBEngine.la ${builddir}/../combinatorics/libcombinatorics.la ${builddir}/../linear_algebra/liblinear_algebra.la ${builddir}/../libkernelCommon.la ${builddir}/../../Singular/libsingular-Singular.la
+
+ CLEANFILES = $(TESTS)
+
diff --git a/debian/patches/debianization-rename-pkgconfig_files.patch b/debian/patches/debianization-rename-pkgconfig_files.patch
index 6447f70..80a0249 100644
--- a/debian/patches/debianization-rename-pkgconfig_files.patch
+++ b/debian/patches/debianization-rename-pkgconfig_files.patch
@@ -64,7 +64,7 @@ Last-Update: 2016-10-20
URL: https://github.com/Singular/Sources/tree/spielwiese/@PACKAGE@
--- a/libpolys/configure.ac
+++ b/libpolys/configure.ac
-@@ -110,7 +110,7 @@
+@@ -112,7 +112,7 @@
AC_MSG_CHECKING([ RESOURCES_LIBS?..])
AC_MSG_RESULT(${RESOURCES_LIBS:-unset})
@@ -73,7 +73,7 @@ Last-Update: 2016-10-20
AC_SUBST(PKG_REQUIRE)
else
AC_MSG_RESULT(no)
-@@ -151,6 +151,6 @@
+@@ -153,6 +153,6 @@
AC_CONFIG_FILES([coeffs/Makefile])
AC_CONFIG_FILES([polys/Makefile])
AC_CONFIG_FILES([tests/Makefile])
@@ -83,7 +83,7 @@ Last-Update: 2016-10-20
AC_OUTPUT
--- a/factory/configure.ac
+++ b/factory/configure.ac
-@@ -136,7 +136,7 @@
+@@ -139,7 +139,7 @@
AC_MSG_CHECKING([ RESOURCES_LIBS?..])
AC_MSG_RESULT(${RESOURCES_LIBS:-unset})
@@ -92,7 +92,7 @@ Last-Update: 2016-10-20
AC_SUBST(PKG_REQUIRE)
else
AC_MSG_RESULT(no)
-@@ -405,6 +405,6 @@
+@@ -408,6 +408,6 @@
@@ -102,7 +102,7 @@ Last-Update: 2016-10-20
--- a/omalloc/configure.ac
+++ b/omalloc/configure.ac
-@@ -635,6 +635,6 @@
+@@ -637,6 +637,6 @@
dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
dnl wrap it up
dnl
@@ -207,7 +207,7 @@ Last-Update: 2016-10-20
AC_MSG_RESULT(no)
--- a/resources/configure.ac
+++ b/resources/configure.ac
-@@ -72,5 +72,5 @@
+@@ -74,5 +74,5 @@
AX_NORMALIZE_PATH([config_datadir],['/'])
AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index 5989e65..c19f1f4 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -63,7 +63,7 @@ Last-Update: 2015-10-15
libomalloc_include_HEADERS = \
@@ -33,7 +34,8 @@
- libomalloc_la_LDFLAGS = -release ${PACKAGE_VERSION}
+ libomalloc_la_LDFLAGS = $(SINGULAR_LDFLAGS) -release ${PACKAGE_VERSION}
nodist_libomalloc_la_SOURCES = omTables.inc omTables.h mylimits.h
-nodist_libomalloc_include_HEADERS = omConfig.h mylimits.h omTables.h
@@ -76,7 +76,7 @@ Last-Update: 2015-10-15
+++ b/resources/Makefile.am
@@ -13,6 +13,7 @@
- libsingular_resources_la_LDFLAGS = -release ${PACKAGE_VERSION}
+ libsingular_resources_la_LDFLAGS = $(SINGULAR_LDFLAGS) -release ${PACKAGE_VERSION}
+configheaderdir = $(includedir)/$(DEB_HOST_MULTIARCH)/resources
libsingular_resources_includedir =$(includedir)/resources
@@ -93,16 +93,16 @@ Last-Update: 2015-10-15
dnl Check if build env is sane
AM_SANITY_CHECK
-@@ -114,6 +114,8 @@
- *cygwin* ) AX_APPEND_LINK_FLAGS([-Wl,-Bdynamic]);;
- esac
+@@ -109,6 +109,8 @@
+
+ SING_WIN_FLAGS
+AC_SUBST(DEB_HOST_MULTIARCH)
+
PKG_REQUIRE="$PKG_REQUIRE"
AC_SUBST(PKG_REQUIRE)
-@@ -256,8 +258,6 @@
+@@ -251,8 +253,6 @@
AC_CONFIG_FILES([emacs/Makefile])
@@ -122,7 +122,7 @@ Last-Update: 2015-10-15
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
dnl Check if build env is sane
-@@ -89,6 +89,8 @@
+@@ -91,6 +91,8 @@
dnl esac
dnl AC_SUBST(INCLUDES)
@@ -144,13 +144,13 @@ Last-Update: 2015-10-15
dnl Check if build env is sane
@@ -42,6 +42,8 @@
# ([shared])
- # LT_INIT(dlopen disable-static) # doesn't work on PowerPC!
+ # LT_INIT([win32-dll])(dlopen disable-static) # doesn't work on PowerPC!
+AC_SUBST(DEB_HOST_MULTIARCH)
+
# SING_CHECK_PIPE
- ##### SEE http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
+ SING_WIN_FLAGS
--- a/factory/configure.ac
+++ b/factory/configure.ac
@@ -19,7 +19,7 @@
@@ -162,7 +162,7 @@ Last-Update: 2015-10-15
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
AM_MAINTAINER_MODE([enable])
-@@ -95,6 +95,8 @@
+@@ -98,6 +98,8 @@
,
[with_Singular=yes])
@@ -173,7 +173,7 @@ Last-Update: 2015-10-15
--- a/omalloc/configure.ac
+++ b/omalloc/configure.ac
-@@ -19,11 +19,13 @@
+@@ -21,11 +21,13 @@
AM_MAINTAINER_MODE([enable])
AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) # -Wno-extra-portability -Werror silent-rules
@@ -207,10 +207,10 @@ Last-Update: 2015-10-15
+AM_CPPFLAGS += -DDEB_PKG_VERSION=\"$(DEB_PKG_VERSION)\"
+
- SUBDIRS = dyn_modules
-
- ########################### Possible builtin modules... #########################
-@@ -174,7 +176,7 @@
+ if SING_WIN
+ SUBDIRS = ${BUILTIN_MODULES} . dyn_modules
+ else
+@@ -177,7 +179,7 @@
Singular_LDADD = libSingular.la ${BUILTIN_FLAGS}
@@ -219,7 +219,7 @@ Last-Update: 2015-10-15
Singulard_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc utils.h
-@@ -187,7 +189,7 @@
+@@ -190,7 +192,7 @@
#### ESingular
ESingular_CPPFLAGS = ${AM_CPPFLAGS} -DESINGULAR -DPROTO
@@ -228,7 +228,7 @@ Last-Update: 2015-10-15
ESingular_LDADD = ${top_builddir}/libpolys/reporter/libreporter.la \
${top_builddir}/libpolys/misc/libmisc.la ${top_builddir}/omalloc/libomalloc.la \
${top_builddir}/resources/libsingular_resources.la
-@@ -197,7 +199,7 @@
+@@ -200,7 +202,7 @@
#### same for TSingular
TSingular_CPPFLAGS = ${AM_CPPFLAGS} -DTSINGULAR -DPROTO
@@ -237,7 +237,7 @@ Last-Update: 2015-10-15
TSingular_LDADD = ${top_builddir}/libpolys/reporter/libreporter.la \
${top_builddir}/libpolys/misc/libmisc.la ${top_builddir}/omalloc/libomalloc.la \
${top_builddir}/resources/libsingular_resources.la
-@@ -212,7 +214,7 @@
+@@ -215,7 +217,7 @@
libparse_SOURCES = libparse.cc fegetopt.c fegetopt.h utils.cc utils.h
libparse_LDADD = ${top_builddir}/omalloc/libomalloc.la
diff --git a/debian/patches/upstream-autotools-help2man.patch b/debian/patches/upstream-autotools-help2man.patch
index a5d4663..b394e5f 100644
--- a/debian/patches/upstream-autotools-help2man.patch
+++ b/debian/patches/upstream-autotools-help2man.patch
@@ -17,7 +17,7 @@ Last-Update: 2016-08-21
AC_CHECK_PROGS([DOXYGEN], [doxygen])
if test -z "$DOXYGEN";
then AC_MSG_WARN([Doxygen not found - continuing without Doxygen support])
-@@ -250,7 +251,8 @@
+@@ -245,7 +246,8 @@
AC_CONFIG_FILES([IntegerProgramming/Makefile])
@@ -29,7 +29,7 @@ Last-Update: 2016-08-21
--- a/Singular/Makefile.am
+++ b/Singular/Makefile.am
-@@ -156,6 +156,20 @@
+@@ -159,6 +159,20 @@
bin_PROGRAMS = Singular ESingular TSingular $(optional_Singular_programs)
@@ -50,7 +50,7 @@ Last-Update: 2016-08-21
Singular_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc utils.h
Singular_LDADD = libSingular.la ${BUILTIN_FLAGS}
-@@ -200,6 +214,15 @@
+@@ -203,6 +217,15 @@
libparse_LDADD = ${top_builddir}/omalloc/libomalloc.la
libparse_LDFLAGS = -static ${AM_LDFLAGS}
@@ -105,9 +105,9 @@ Last-Update: 2016-08-21
+ $(abs_top_builddir)/$<
--- a/libpolys/configure.ac
+++ b/libpolys/configure.ac
-@@ -33,6 +33,9 @@
- # ([shared])
- # LT_INIT(dlopen disable-static) # doesn't work on PowerPC!
+@@ -35,6 +35,9 @@
+
+ SING_WIN_FLAGS
+# Checks for programs.
+AC_PATH_PROG([HELP2MAN],[help2man])
@@ -115,7 +115,7 @@ Last-Update: 2016-08-21
# 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,6 @@
+@@ -148,5 +151,6 @@
AC_CONFIG_FILES([coeffs/Makefile])
AC_CONFIG_FILES([polys/Makefile])
AC_CONFIG_FILES([tests/Makefile])
--
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