[singular] 02/02: 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 6ba72c7edef91c2102be536c10b83c412c8394f3
Merge: 7262335 1f1318a
Author: Felix Salfelder <felix at salfelder.org>
Date:   Sun May 25 13:03:26 2014 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../0016-use-bin-sed-in-doc-Makefile.in.patch      | 34 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 doc/Makefile.in                                    |  5 ++--
 4 files changed, 40 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index fc838d5,0000000..93e5bb2
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
- 03aaa9d48eb8319fb22028a29fbc326128e2ba25
- 03aaa9d48eb8319fb22028a29fbc326128e2ba25
++1f1318afbf5bdc6f2befb4c63841a8c690267e6d
++1f1318afbf5bdc6f2befb4c63841a8c690267e6d
 +b7a79f71f3462339b70b598a5756e06ee0d6639e
 +b7a79f71f3462339b70b598a5756e06ee0d6639e
 +singular_3-1-6.dfsg.orig.tar.gz
 +a970d278087f954d6e3ff439027b1a4dd6e7eb22
 +20108290
diff --cc debian/patches/0016-use-bin-sed-in-doc-Makefile.in.patch
index 0000000,0000000..360adc5
new file mode 100644
--- /dev/null
+++ b/debian/patches/0016-use-bin-sed-in-doc-Makefile.in.patch
@@@ -1,0 -1,0 +1,34 @@@
++From 1f1318afbf5bdc6f2befb4c63841a8c690267e6d Mon Sep 17 00:00:00 2001
++From: Felix Salfelder <felix at salfelder.org>
++Date: Sun, 25 May 2014 13:02:55 +0200
++Subject: use /bin/sed in doc/Makefile.in
++
++---
++ doc/Makefile.in | 5 +++--
++ 1 file changed, 3 insertions(+), 2 deletions(-)
++
++diff --git a/doc/Makefile.in b/doc/Makefile.in
++index f3ea4cf..2da78d0 100644
++--- a/doc/Makefile.in
+++++ b/doc/Makefile.in
++@@ -45,6 +45,7 @@ GZIP            = @MYGZIP@
++ UUDECODE        = @UUDECODE@
++ 
++ PERL            = @PERL@
+++SED             = /bin/sed
++ TEX             = tex
++ MAKEINFO        = @MAKEINFO@ --force
++ TEXI2PDF        = @TEXI2PDF@
++@@ -168,10 +169,10 @@ usercard.dvi: usercard.tex singcard.tex
++ 	${TEX} $<
++ 
++ s-plural.tex: plural.tex
++-	sed -e "s/BR_PLURAL_BR/(plural)/g" <plural.tex >s-plural.tex
+++	$(SED) -e "s/BR_PLURAL_BR/(plural)/g" <plural.tex >s-plural.tex
++ 
++ s-plulibs.tex: plulibs.tex
++-	sed -e "s/BR_PLURAL_BR/(plural)/g" <plulibs.tex >s-plulibs.tex
+++	$(SED) -e "s/BR_PLURAL_BR/(plural)/g" <plulibs.tex >s-plulibs.tex
++ 
++ # postscript stuff
++ ps: dvi manual.ps usercard.ps
diff --cc debian/patches/series
index e568205,0000000..3937f51
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,15 -1,0 +1,16 @@@
 +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
++0016-use-bin-sed-in-doc-Makefile.in.patch

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