[singular] 13/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 dcebb184fbf374a8905edd0b02d7795bc29620e9
Merge: 8178b12 80af528
Author: Felix Salfelder <felix at salfelder.org>
Date:   Mon Jul 15 20:40:05 2013 +0200

    merge patched-master-3-1-5 into master-3-1-5
    
    - fix Singluar/Makefile.in patch
    - install factory.h where it's looked for

 Singular/Makefile.in   |    2 +-
 debian/.git-dpm        |    2 +-
 factory/GNUmakefile.in |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index c379fb3,0000000..697d364
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
 +27e029636862d5ac4d8c20c466d37e79f762e7f8
- c03be66094206080b1b0e998b23e4d38617741de
++80af528c075a9215ceb425f9221350be1a184fc3
 +01299c5795a0c0b3842c1f6d3bc30d3714fc1248
 +01299c5795a0c0b3842c1f6d3bc30d3714fc1248
 +singular_3-1-5.dfsg.orig.tar.gz
 +eb6aabf3f389eec6a4605e43e807d946b432c0d9
 +19748109

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