[singular] 03/03: merge patched into master

[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 97d1c4f04cbd8c4e2b534d2d35d33e57fa46c920
Merge: 87022d9 03aaa9d
Author: Felix Salfelder <felix at salfelder.org>
Date:   Mon May 19 23:32:55 2014 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 .../0015-sanitize-cf_gmp.h-generation.patch        | 44 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 factory/GNUmakefile.in                             | 14 ++++---
 factory/gen_cf_gmp.template                        |  3 --
 5 files changed, 55 insertions(+), 11 deletions(-)

diff --cc debian/.git-dpm
index 339fb56,0000000..fc838d5
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
- 22b369a791949339d441af8157a1ef8697785f81
- 22b369a791949339d441af8157a1ef8697785f81
++03aaa9d48eb8319fb22028a29fbc326128e2ba25
++03aaa9d48eb8319fb22028a29fbc326128e2ba25
 +b7a79f71f3462339b70b598a5756e06ee0d6639e
 +b7a79f71f3462339b70b598a5756e06ee0d6639e
 +singular_3-1-6.dfsg.orig.tar.gz
 +a970d278087f954d6e3ff439027b1a4dd6e7eb22
 +20108290
diff --cc debian/patches/0015-sanitize-cf_gmp.h-generation.patch
index 0000000,0000000..f28c278
new file mode 100644
--- /dev/null
+++ b/debian/patches/0015-sanitize-cf_gmp.h-generation.patch
@@@ -1,0 -1,0 +1,44 @@@
++From 03aaa9d48eb8319fb22028a29fbc326128e2ba25 Mon Sep 17 00:00:00 2001
++From: Felix Salfelder <felix at salfelder.org>
++Date: Tue, 20 Aug 2013 13:52:48 +0200
++Subject: sanitize cf_gmp.h generation
++
++this is similar to
++http://trac.sagemath.org/attachment/ticket/14737/sanitize_gmp_header_hack.patch
++---
++ factory/GNUmakefile.in      | 14 ++++++++------
++ factory/gen_cf_gmp.template |  3 ---
++ 2 files changed, 8 insertions(+), 9 deletions(-)
++ delete mode 100644 factory/gen_cf_gmp.template
++
++diff --git a/factory/GNUmakefile.in b/factory/GNUmakefile.in
++index cb28207..45836f9 100644
++--- a/factory/GNUmakefile.in
+++++ b/factory/GNUmakefile.in
++@@ -684,9 +684,11 @@ GNUmakefile:	GNUmakefile.in config.status
++ config.status:	configure
++ 		./config.status --recheck
++ 
++-# create cf_gmp.h
++-cf_gmp.h: gen_cf_gmp.template
++-	echo "#!/bin/sh" >gen_cf_gmp.sh 
++-	echo "GMP_H_T=\"`$(CXX) $(LIBCXXFLAGS) -M gen_cf_gmp.cc|grep gmp.h` \"" >>gen_cf_gmp.sh 
++-	cat gen_cf_gmp.template >>gen_cf_gmp.sh
++-	$(SHELL) gen_cf_gmp.sh
+++GMP_H_ = $(shell echo '\#include <gmp.h>' | $(CXX) $(LIBCXXFLAGS) -E - -M -MP | grep 'gmp\.h:$$' )
+++GMP_H__ = $(GMP_H_:.h:=.h)
+++
+++cf_gmp.h: GNUmakefile $(GMP_H__)
+++	@echo "Generating $@ from $(GMP_H__)...";
+++	test -f "$(GMP_H__)"
+++	grep -v '__GMP_DECLSPEC_XX|std::FILE' $(GMP_H__) > $@T
+++	diff $@T $@ >/dev/null 2>/dev/null && rm $@T || mv $@T $@
++diff --git a/factory/gen_cf_gmp.template b/factory/gen_cf_gmp.template
++deleted file mode 100644
++index 90389ac..0000000
++--- a/factory/gen_cf_gmp.template
+++++ /dev/null
++@@ -1,3 +0,0 @@
++-GMP_H=`echo $GMP_H_T| sed -e 's/^.*gmp.cc//' -e 's/ .$//'`
++-echo generating cf_gmp.h from $GMP_H
++-cat $GMP_H | grep -v __GMP_DECLSPEC_XX |grep -v std::FILE > cf_gmp.h
diff --cc debian/patches/series
index 4a20565,0000000..e568205
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,14 -1,0 +1,15 @@@
 +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
++0015-sanitize-cf_gmp.h-generation.patch

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