[singular] 01/01: Patching is hard

Ximin Luo infinity0 at debian.org
Mon Jul 11 06:57:14 UTC 2016


This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master3-sage
in repository singular.

commit 14a2f4128af5b1cac0fd01fc26dc0a36338ce19f
Author: Ximin Luo <infinity0 at debian.org>
Date:   Mon Jul 11 08:56:52 2016 +0200

    Patching is hard
    
    turns out some of the headers do need the factory/ removed
---
 debian/patches/fix-headers.patch | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/patches/fix-headers.patch b/debian/patches/fix-headers.patch
index 2f1eb6f..1594d06 100644
--- a/debian/patches/fix-headers.patch
+++ b/debian/patches/fix-headers.patch
@@ -1,11 +1,11 @@
---- a/kernel/Makefile.in
-+++ b/kernel/Makefile.in
-@@ -274,7 +274,7 @@
- install-libsingular: install
- 	-${MKINSTALLDIRS} ${includedir}
- 	-${MKINSTALLDIRS} ${includedir}/singular
--	-for file in *.h kInline.cc; do sed -e "s:<kernel/:<singular/:"< $$file | sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" > ${includedir}/singular/$$file; done
-+	-for file in *.h kInline.cc; do sed -e "s:<kernel/:<singular/:"< $$file | sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:" > ${includedir}/singular/$$file; done
- 
- install: all installbin
- 
+--- a/kernel/si_gmp.h
++++ b/kernel/si_gmp.h
+@@ -2,7 +2,7 @@
+ #define INCL_CF_GMP_H
+ #include <stddef.h>
+ #ifdef HAVE_FACTORY
+-#  include <factory/cf_gmp.h>
++#  include <factory/factory/cf_gmp.h>
+ #else
+ #if defined(__cplusplus) && defined(__GNUC__)
+ extern "C" {

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



More information about the debian-science-commits mailing list