[sagemath] 02/02: Use Debian system singular; build still failing with polybori-related errors

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository sagemath.

commit 3e48f594dda917b499e03cce018306b96b5641e8
Author: Ximin Luo <infinity0 at debian.org>
Date:   Sat Apr 2 23:44:09 2016 +0200

    Use Debian system singular; build still failing with polybori-related errors
---
 debian/control             | 5 ++---
 debian/patches/series      | 3 +--
 debian/pruner/configure.ac | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index e1d3b06..13f4b6c 100644
--- a/debian/control
+++ b/debian/control
@@ -118,6 +118,8 @@ Build-Depends:
  tachyon,
  zlib1g-dev,
 # Packages not in unstable, but in unstable-sage:
+ libsingular-dev (>= 3-1-6+dfsg-1+sage1),
+ libsingular-dev (<< 4),
  python-sagenb (>= 0.11.2),
 
 # some tests will fail with python-matplotlib <=1.2.1
@@ -129,6 +131,3 @@ Description: Empty package with the runtime dependencies of sage
  that are currently in Debian testing.
 Depends:
  ${misc:Depends}
-
-# Packages not in unstable:
-# libsingular-dev (>= 3-1-6),
diff --git a/debian/patches/series b/debian/patches/series
index 5e3cc33..9521fc2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,8 +2,7 @@ unbreak.patch
 trac_17872.patch
 maxima.patch
 remove_singular_warning.patch
-# TODO: not yet using Debian/system singular; uncomment when we do
-#singular_build.patch
+singular_build.patch
 singular_doc.patch
 python_security.patch
 silent_debian_bug_780186.patch
diff --git a/debian/pruner/configure.ac b/debian/pruner/configure.ac
index c8f8eef..e76889a 100644
--- a/debian/pruner/configure.ac
+++ b/debian/pruner/configure.ac
@@ -443,7 +443,7 @@ CPPFLAGS="$old_CPPFLAGS -I/usr/include/factory"
 AC_CHECK_HEADERS(libsingular.h, HAS_SINGULAR="True", HAS_SINGULAR="False")
 CPPFLAGS=$old_CPPFLAGS
 AC_LANG_POP([C++])
-HAS_SINGULAR="False"
+#HAS_SINGULAR="False"
 AC_SUBST(HAS_SINGULAR)
 
 AC_CHECK_PYTHON_MODULE(six)

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