[sagemath] 02/02: Move more arch-indep files to sagemath-common, and:

[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 19093c22831a570e21204652a53c5b5d667614c6
Author: Ximin Luo <infinity0 at debian.org>
Date:   Tue Oct 18 04:42:11 2016 +0200

    Move more arch-indep files to sagemath-common, and:
    
    - add a Multi-Arch: same
    - add a call to dh_numpy
    - work around a stupid dh_python2 bug
---
 debian/control.in              |  1 +
 debian/rules                   | 10 +++++++++-
 debian/sagemath-common.install |  2 ++
 debian/sagemath.install        |  6 +++---
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/debian/control.in b/debian/control.in
index ada7cae..28e1e53 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -183,6 +183,7 @@ Build-Depends:
 
 Package: sagemath
 Architecture: any
+Multi-Arch: same
 Description: Sage: Open Source Mathematical Software
  SageMath is a free open-source mathematics software system licensed under the
  GPL. It builds on top of many existing open-source packages: NumPy, SciPy,
diff --git a/debian/rules b/debian/rules
index ee2ab05..19f606c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,7 +71,15 @@ else
 endif
 
 override_dh_install:
-	dh_install --list-missing
+	dh_install --package sagemath-common -X.so
+	dh_install --remaining-packages --list-missing
+
+override_dh_python2:
+	dh_python2
+# Work around a stupid bug in dh_python2; #841148
+	mv debian/sagemath/usr/lib/python2.7/dist-packages/sage/modules/.$$(dpkg-architecture -qDEB_HOST_MULTIARCH).so \
+	   debian/sagemath/usr/lib/python2.7/dist-packages/sage/modules/module.$$(dpkg-architecture -qDEB_HOST_MULTIARCH).so
+	dh_numpy --package sagemath # stop lintian complaining at us
 
 override_dh_shlibdeps:
 	dh_shlibdeps -l debian/tmp/usr/lib
diff --git a/debian/sagemath-common.install b/debian/sagemath-common.install
index 74c5f4f..f95d1e6 100644
--- a/debian/sagemath-common.install
+++ b/debian/sagemath-common.install
@@ -1,2 +1,4 @@
+usr/bin/sage*
 usr/share/sage/ext
 usr/share/jupyter/*
+usr/lib/python2.7/dist-packages/sage*
diff --git a/debian/sagemath.install b/debian/sagemath.install
index 4c0a206..c0f3913 100644
--- a/debian/sagemath.install
+++ b/debian/sagemath.install
@@ -1,3 +1,3 @@
-usr/bin/sage*
-usr/lib/python2.7/dist-packages/sage*
-# TODO: a lot of this could be moved to sagemath-common
+usr/lib/python2.7/dist-packages/sage*/*/*.so
+usr/lib/python2.7/dist-packages/sage*/*/*/*.so
+usr/lib/python2.7/dist-packages/sage*/*/*/*/*.so

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