[singular] 03/03: merge patched into master, update patches

[felix salfelder]

This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch master
in repository singular.

commit 5d45993eb8461599387380ad5f9da87adc3c12b2
Merge: a3958cd 22b369a
Author: Felix Salfelder <felix at salfelder.org>
Date:   Sun May 4 08:40:14 2014 +0200

    merge patched into master, update patches

 Singular/Makefile.in                           | 12 ++--
 Singular/misc_ip.cc                            |  7 ---
 Singular/mmInit.cc                             |  8 +++
 debian/.git-dpm                                |  4 +-
 debian/patches/0014-fix-mmInit-weirdness.patch | 80 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 6 files changed, 99 insertions(+), 13 deletions(-)

diff --cc debian/.git-dpm
index 39e8944,0000000..339fb56
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
- 3e6e5a1a93aaff63b2eb41173ad5e8788737454b
- 3e6e5a1a93aaff63b2eb41173ad5e8788737454b
++22b369a791949339d441af8157a1ef8697785f81
++22b369a791949339d441af8157a1ef8697785f81
 +b7a79f71f3462339b70b598a5756e06ee0d6639e
 +b7a79f71f3462339b70b598a5756e06ee0d6639e
 +singular_3-1-6.dfsg.orig.tar.gz
 +a970d278087f954d6e3ff439027b1a4dd6e7eb22
 +20108290
diff --cc debian/patches/0014-fix-mmInit-weirdness.patch
index 0000000,0000000..12e4b60
new file mode 100644
--- /dev/null
+++ b/debian/patches/0014-fix-mmInit-weirdness.patch
@@@ -1,0 -1,0 +1,80 @@@
++From 22b369a791949339d441af8157a1ef8697785f81 Mon Sep 17 00:00:00 2001
++From: Felix Salfelder <felix at salfelder.org>
++Date: Sat, 14 Sep 2013 18:11:32 +0200
++Subject: fix mmInit weirdness.
++
++---
++ Singular/Makefile.in | 12 ++++++++----
++ Singular/misc_ip.cc  |  7 -------
++ Singular/mmInit.cc   |  8 ++++++++
++ 3 files changed, 16 insertions(+), 11 deletions(-)
++ create mode 100644 Singular/mmInit.cc
++
++diff --git a/Singular/Makefile.in b/Singular/Makefile.in
++index c1e69bd..23beba4 100644
++--- a/Singular/Makefile.in
+++++ b/Singular/Makefile.in
++@@ -216,7 +216,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 \
++@@ -364,6 +364,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 $<
++ 
++@@ -392,10 +396,10 @@ 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 \
++- 	${OBJS} -lkernel -L../kernel -L../factory -L../libfac -L../omalloc -L${libdir} ${LIBSINGULAR_LIBS}
+++	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} \
++          iparith.o libparse.cc claptmpl.o mpsr_Tok.o
++diff --git a/Singular/misc_ip.cc b/Singular/misc_ip.cc
++index bd2c2b5..a00659d 100644
++--- a/Singular/misc_ip.cc
+++++ b/Singular/misc_ip.cc
++@@ -1220,11 +1220,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/series
index c4fb7d3,0000000..4a20565
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,13 -1,0 +1,14 @@@
 +0001-tag-gfan-using-examples.patch
 +0002-use-DESTDIR-as-a-pre-prefix-in-install-targets.patch
 +0003-destdir-fixes-sq.patch
 +0004-add-working-all-target-to-Makefile.in.patch
 +0005-miscellaneous-Makefile.in-patches.patch
 +0006-assert-needs-to-be-defined-after-include-assert.h.patch
 +0007-keep-mod2.h-in-Singular.patch
 +0008-move-libreadline-to-main-binary.patch
 +0009-default-path-settings.patch
 +0010-disable-examples-for-divisors-and-gitfan.patch
 +0011-fix-warning-treated-as-error-in-pyobject.cc.patch
 +0012-also-install-sing_dbm.h.patch
 +0013-don-t-forget-LDFLAGS-in-module-compilation.patch
++0014-fix-mmInit-weirdness.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/singular.git