[singular] 45/45: merge patched-master-3-1-5 into master-3-1-5

[felix salfelder]

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 5e3e031e7b85940e52ea973a171e26de6046051f
Merge: bc4e36e accf46d
Author: Felix Salfelder <felix at salfelder.org>
Date:   Sat Sep 14 15:53:46 2013 +0200

    merge patched-master-3-1-5 into master-3-1-5

 debian/.git-dpm                                    |    4 +--
 .../0019-fix-two-tags-in-doc-cones.doc.patch       |   31 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 doc/cones.doc                                      |    4 +--
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 13efe66,0000000..53f5f04
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
- 622961fcdb1c5f17be2260b8be5c36d85825660b
- 622961fcdb1c5f17be2260b8be5c36d85825660b
++accf46d3bbbd64bd02971579be43a8fa80bc3c4c
++accf46d3bbbd64bd02971579be43a8fa80bc3c4c
 +c2d0b997183a0cc911fdef0861638995bafededc
 +c2d0b997183a0cc911fdef0861638995bafededc
 +singular_3-1-5.dfsg.orig.tar.gz
 +eb6aabf3f389eec6a4605e43e807d946b432c0d9
 +19748109
diff --cc debian/patches/0019-fix-two-tags-in-doc-cones.doc.patch
index 0000000,0000000..d366431
new file mode 100644
--- /dev/null
+++ b/debian/patches/0019-fix-two-tags-in-doc-cones.doc.patch
@@@ -1,0 -1,0 +1,31 @@@
++From accf46d3bbbd64bd02971579be43a8fa80bc3c4c Mon Sep 17 00:00:00 2001
++From: Felix Salfelder <felix at salfelder.org>
++Date: Wed, 4 Sep 2013 20:54:56 +0200
++Subject: fix two tags in doc/cones.doc
++
++---
++ doc/cones.doc | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/doc/cones.doc b/doc/cones.doc
++index ed07190..f14f83d 100644
++--- a/doc/cones.doc
+++++ b/doc/cones.doc
++@@ -1829,7 +1829,7 @@ polytope
++ Newton polytope of f 
++ @item @strong{Example:}
++ @smallexample
++- at c example tag:cone
+++ at c example tag:gfan
++ intmat M[4][2]=
++ 0,0,
++ 1,0,
++@@ -1854,7 +1854,7 @@ polytope
++ Newton polytope of f 
++ @item @strong{Example:}
++ @smallexample
++- at c example tag:cone
+++ at c example tag:gfan
++ ring r;
++ poly f=x+y+z;
++ polytope p=newtonPolytope(f);
diff --cc debian/patches/series
index a9fd885,0000000..c4b248f
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,18 -1,0 +1,19 @@@
 +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

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