[sagemath] 01/05: Relax the runtime dependencies

[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 31d1c452b36a53dee6d2db4519cb6beff1f89479
Author: Ximin Luo <infinity0 at debian.org>
Date:   Thu Aug 17 12:12:10 2017 +0200

    Relax the runtime dependencies
---
 debian/changelog                 |  6 ++++++
 debian/control.in                |  2 ++
 debian/control.runtime-depends   |  4 ++--
 debian/patches/d0-singular.patch | 13 +++++++++++++
 debian/patches/d1-sage-env.patch |  9 ---------
 5 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 34b847d..0f195e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sagemath (8.0-4) UNRELEASED; urgency=medium
+
+  * Relax the runtime dependencies.
+
+ -- Ximin Luo <infinity0 at debian.org>  Thu, 17 Aug 2017 12:08:03 +0200
+
 sagemath (8.0-3) experimental; urgency=medium
 
   * Fix FTBFS everywhere caused by bad Makefile syntax for running tests.
diff --git a/debian/control.in b/debian/control.in
index 0ec9fb8..40426fd 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -67,12 +67,14 @@ Build-Depends:
  libratpoints-dev,
  libreadline-dev,
  librw-dev,
+ libsingular4-dev (>= 1:4.1.0-p3),
  libsqlite3-dev,
  libsymmetrica-dev,
  libzn-poly-dev,
  pkg-config,
  python-dev,
  python3-dev,
+ r-base-dev,
  scons,
  texlive-latex-base,
  zlib1g-dev,
diff --git a/debian/control.runtime-depends b/debian/control.runtime-depends
index 431309a..cf47732 100644
--- a/debian/control.runtime-depends
+++ b/debian/control.runtime-depends
@@ -17,7 +17,7 @@
  libcdd-tools (>= 094h),
  libjs-mathjax,
  libjs-three (>= 80),
- libsingular4-dev (>= 1:4.1.0-p3),
+ libsingular4 (>= 1:4.1.0-p3),
  maxima-sage (>= 5.39.0),
  maxima-sage-doc (>= 5.39.0),
  maxima-sage-share (>= 5.39.0),
@@ -104,7 +104,7 @@
  python-zmq,
  python-zope.interface,
  r-cran-lattice,
- r-base-dev,
+ r-base-core,
  rubiks,
  sagemath-database-conway-polynomials (>= 0.5-2),
  sagemath-database-elliptic-curves,
diff --git a/debian/patches/d0-singular.patch b/debian/patches/d0-singular.patch
index a240b49..c59bc00 100644
--- a/debian/patches/d0-singular.patch
+++ b/debian/patches/d0-singular.patch
@@ -1,4 +1,6 @@
 Description: Additional changes to work with the Debian package of singular
+ We search for a specific SOVERSION of libsingular-Singular, to allow us to
+ runtime-Depend on libsingular4 and not libsingular4-dev.
 Author: Tobias Hansen <thansen at debian.org>
 Author: Ximin Luo <infinity0 at debian.org>
 Forwarded: not-needed
@@ -39,3 +41,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      # Add cysignals directory to includes
      for path in sys.path:
          inc.append(path)
+--- a/sage/src/sage/env.py
++++ b/sage/src/sage/env.py
+@@ -152,7 +153,7 @@
+     else:
+         extension = "so"
+     # library name changed from libsingular to libSingular btw 3.x and 4.x
+-    SINGULAR_SO = SAGE_LOCAL+"/lib/libSingular."+extension
++    SINGULAR_SO = "/usr/lib/%s/libsingular-Singular-4.1.0.so" % sysconfig.get_config_var('MULTIARCH')
+ 
+ _add_variable_or_fallback('SINGULAR_SO', SINGULAR_SO)
+ 
diff --git a/debian/patches/d1-sage-env.patch b/debian/patches/d1-sage-env.patch
index 0b45e82..25b0164 100644
--- a/debian/patches/d1-sage-env.patch
+++ b/debian/patches/d1-sage-env.patch
@@ -220,12 +220,3 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
  
  # locate singular shared object
  if UNAME[:6] == "CYGWIN":
-@@ -152,7 +153,7 @@
-     else:
-         extension = "so"
-     # library name changed from libsingular to libSingular btw 3.x and 4.x
--    SINGULAR_SO = SAGE_LOCAL+"/lib/libSingular."+extension
-+    SINGULAR_SO = "/usr/lib/%s/libsingular-Singular.so" % sysconfig.get_config_var('MULTIARCH')
- 
- _add_variable_or_fallback('SINGULAR_SO', SINGULAR_SO)
- 

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