[singular] 04/04: merge patched-master-3-1-5 into master-3-1-5
felix salfelder
felix-guest at alioth.debian.org
Sat Sep 14 19:43:56 UTC 2013
This is an automated email from the git hooks/post-receive script.
felix-guest pushed a commit to branch master-3-1-5
in repository singular.
commit 9ba3032cb6c840e62b3ceebca06753e3a621eb98
Merge: 6f269ae c41b191
Author: Felix Salfelder <felix at salfelder.org>
Date: Sat Sep 14 20:54:14 2013 +0200
merge patched-master-3-1-5 into master-3-1-5
Singular/Makefile.in | 12 ++-
Singular/misc_ip.cc | 7 --
Singular/mmInit.cc | 8 ++
debian/.git-dpm | 4 +-
debian/patches/0020-mmInit-stuff.patch | 78 ++++++++++++++++++++
.../patches/0021-gftables-install-patch-fix.patch | 22 ++++++
debian/patches/series | 2 +
7 files changed, 120 insertions(+), 13 deletions(-)
diff --cc debian/.git-dpm
index 53f5f04,0000000..0fb8fbf
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- accf46d3bbbd64bd02971579be43a8fa80bc3c4c
- accf46d3bbbd64bd02971579be43a8fa80bc3c4c
++c41b19106cd6ab4a916a812dd1f616bb54b1e1ea
++c41b19106cd6ab4a916a812dd1f616bb54b1e1ea
+c2d0b997183a0cc911fdef0861638995bafededc
+c2d0b997183a0cc911fdef0861638995bafededc
+singular_3-1-5.dfsg.orig.tar.gz
+eb6aabf3f389eec6a4605e43e807d946b432c0d9
+19748109
diff --cc debian/patches/0020-mmInit-stuff.patch
index 0000000,0000000..00db002
new file mode 100644
--- /dev/null
+++ b/debian/patches/0020-mmInit-stuff.patch
@@@ -1,0 -1,0 +1,78 @@@
++From 69776723bffce5c59ee308c48e5914cf9046dedb Mon Sep 17 00:00:00 2001
++From: Felix Salfelder <felix at salfelder.org>
++Date: Sat, 14 Sep 2013 18:11:32 +0200
++Subject: mmInit stuff.
++
++---
++ Singular/Makefile.in | 10 +++++++---
++ Singular/misc_ip.cc | 7 -------
++ Singular/mmInit.cc | 8 ++++++++
++ 3 files changed, 15 insertions(+), 10 deletions(-)
++ create mode 100644 Singular/mmInit.cc
++
++diff --git a/Singular/Makefile.in b/Singular/Makefile.in
++index 8db7465..223335e 100644
++--- a/Singular/Makefile.in
+++++ b/Singular/Makefile.in
++@@ -211,7 +211,7 @@ endif
++ CXXSOURCES=grammar.cc scanner.cc attrib.cc \
++ blackbox.cc eigenval_ip.cc\
++ extra.cc fehelp.cc feOpt.cc \
++- ipassign.cc ipconv.cc ipid.cc iplib.cc \
+++ ipassign.cc ipconv.cc ipid.cc \
++ ipprint.cc ipshell.cc \
++ newstruct.cc lists.cc \
++ sdb.cc \
++@@ -359,6 +359,10 @@ GFTABLES = $(wildcard LIB/gftables/[1-9]*)
++
++ .cc.o:
++ ${CXX} -fPIC ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} -c $<
+++
+++iplib_lib.o: iplib.cc
+++ ${CXX} ${CXXFLAGS} ${CXXTEMPLFLAGS} -DLIBSINGULAR ${CPPFLAGS} ${DEFS} -c $< -o $@
+++
++ .c.o:
++ ${CC} -fPIC ${CFLAGS} ${CPPFLAGS} ${DEFS} -c $<
++
++@@ -387,9 +391,9 @@ Singular${S_EXT}: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc ${OBJS} \
++ libsingular: libsingular.${SO_SUFFIX}
++
++ libsingular.${SO_SUFFIX}: version.h $(WIN_LIBS) scanner.cc ${OBJS} \
++- iparith.o libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS) tesths.o
+++ iparith.o libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS) mmInit.o iplib_lib.o
++ $(LIBSINGULAR_LD) ${SLDFLAGS} ${LIBSINGULAR_FLAGS} -o libsingular.${SO_SUFFIX} \
++- tesths.o iparith.o mpsr_Tok.o claptmpl.o \
+++ iparith.o mpsr_Tok.o claptmpl.o mmInit.o iplib_lib.o \
++ ${OBJS} -lkernel -L../kernel -L../factory -L../libfac -L../omalloc -L${libdir} ${LIBSINGULAR_LIBS}
++
++ libsingular.a: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc ${OBJS} \
++diff --git a/Singular/misc_ip.cc b/Singular/misc_ip.cc
++index ae207b4..f36ddcb 100644
++--- a/Singular/misc_ip.cc
+++++ b/Singular/misc_ip.cc
++@@ -1170,11 +1170,4 @@ void siInit(char *name)
++ }
++
++ #ifdef LIBSINGULAR
++-#ifdef HAVE_FACTORY
++-// the init routines of factory need mmInit
++-int mmInit( void )
++-{
++- return 1;
++-}
++-#endif
++ #endif
++diff --git a/Singular/mmInit.cc b/Singular/mmInit.cc
++new file mode 100644
++index 0000000..aa49bae
++--- /dev/null
+++++ b/Singular/mmInit.cc
++@@ -0,0 +1,8 @@
+++#include <kernel/mod2.h>
+++#ifdef HAVE_FACTORY
+++// the init routines of factory need mmInit
+++int mmInit( void )
+++{
+++ return 1;
+++}
+++#endif
diff --cc debian/patches/0021-gftables-install-patch-fix.patch
index 0000000,0000000..c657dc6
new file mode 100644
--- /dev/null
+++ b/debian/patches/0021-gftables-install-patch-fix.patch
@@@ -1,0 -1,0 +1,22 @@@
++From c41b19106cd6ab4a916a812dd1f616bb54b1e1ea Mon Sep 17 00:00:00 2001
++From: Felix Salfelder <felix at salfelder.org>
++Date: Sat, 14 Sep 2013 20:53:01 +0200
++Subject: gftables install patch fix
++
++---
++ Singular/Makefile.in | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/Singular/Makefile.in b/Singular/Makefile.in
++index 223335e..feb6107 100644
++--- a/Singular/Makefile.in
+++++ b/Singular/Makefile.in
++@@ -598,7 +598,7 @@ installslib: LIB
++ done
++ ${MKINSTALLDIRS} $(DESTDIR)${slibdir}/gftables
++ for file in `pwd`/LIB/gftables/*; do \
++- ${INSTALL_DATA} $$file $(DESTDIR)${slibdir}; \
+++ ${INSTALL_DATA} $$file $(DESTDIR)${slibdir}/gftables; \
++ done
++
++ install-libsingular: libsingular installslib
diff --cc debian/patches/series
index c4b248f,0000000..b5db350
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,19 -1,0 +1,21 @@@
+0001-tag-gfan-using-examples.patch
+0002-use-DESTDIR-as-a-pre-prefix-in-install-targets.patch
+0003-add-working-all-target-to-Makefile.in.patch
+0004-miscellaneous-Makefile.in-patches.patch
+0005-assert-needs-to-be-defined-after-include-assert.h.patch
+0006-keep-mod2.h-in-Singular.patch
+0007-move-libreadline-to-main-binary.patch
+0008-default-path-settings.patch
+0009-fix-NTL-negate-namespace-issue.patch
+0010-install-factory.h-where-libfac-expects-it.patch
+0011-sanitize-cf_gmp.h-generation.patch
+0012-singular_15435.patch.patch
+0013-440-Factoring-over-a-finite-field-returns-reducible-.patch
+0014-441-Factoring-over-a-finite-field-sometimes-returns-.patch
+0015-443-configure-should-check-for-nanosleep-in-lrt.patch
+0016-singular_part_of_changeset_baadc0f7.patch.patch
+0017-tag-some-documents-so-they-are-not-built.patch
+0018-439-factorize-returns-wrong-constant.patch
+0019-fix-two-tags-in-doc-cones.doc.patch
++0020-mmInit-stuff.patch
++0021-gftables-install-patch-fix.patch
--
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