[singular] 06/06: merge Juliens patches 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 ddb85d2e4545258c5f9c15f08c6984b8a89df399
Merge: cea338b d999991
Author: Felix Salfelder <felix at salfelder.org>
Date:   Mon May 26 09:54:56 2014 +0200

    merge Juliens patches into master

 Makefile.in          | 15 +++++++--------
 Singular/Makefile.in |  3 ++-
 debian/.git-dpm      |  2 +-
 doc/Makefile.in      | 50 ++++++++++++++++++++++++++------------------------
 install-sh           | 12 ++++++------
 kernel/Makefile.in   |  3 ++-
 mkinstalldirs        |  4 ++--
 7 files changed, 46 insertions(+), 43 deletions(-)

diff --cc debian/.git-dpm
index 93e5bb2,0000000..0debe25
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
 +1f1318afbf5bdc6f2befb4c63841a8c690267e6d
- 1f1318afbf5bdc6f2befb4c63841a8c690267e6d
++d9999915cc17cedcada09e95422ced7b717fcc66
 +b7a79f71f3462339b70b598a5756e06ee0d6639e
 +b7a79f71f3462339b70b598a5756e06ee0d6639e
 +singular_3-1-6.dfsg.orig.tar.gz
 +a970d278087f954d6e3ff439027b1a4dd6e7eb22
 +20108290

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