[sagemath] 26/44: Merge deps that are required by the test suite into the other builddeps.

[Tobias Hansen]

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

thansen pushed a commit to branch master
in repository sagemath.

commit 622c7e8b4b5c49f098e4d41a5eb352c85c830fb3
Author: Tobias Hansen <tobias.han at gmx.de>
Date:   Sun Sep 15 12:38:28 2013 +0200

    Merge deps that are required by the test suite into the other builddeps.
---
 debian/control | 38 ++++++++++++++++----------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/debian/control b/debian/control
index 6ee4b5c..4d33524 100644
--- a/debian/control
+++ b/debian/control
@@ -7,25 +7,6 @@ Build-Depends: debhelper (>= 9)
 Standards-Version: 3.9.4
 X-Python-Version: 2.7
 
-Package: sagelib-runtime-deps
-Architecture: all
-Description: Sagelib runtime dependencies. These are required to run tests, but
- not real builddeps.
-Depends:
- palp,
- python-twisted,
- python-sympy,
- python-mpmath,
- python-networkx,
- python-rpy2,
- python-scipy,
- sqlite3,
- eclib-tools,
- r-cran-lattice,
- rubiks,
- gap (>= 4r6p4),
- gfan
-
 # some tests will fail with python-matplotlib <=1.2.1
 
 Package: sagelib-builddeps-testing
@@ -39,6 +20,7 @@ Depends:
  debhelper (>= 7),
  dpkg-dev (>= 1.15.7~),
  ecl (>= 11),
+ eclib-tools,
  f2c,
  ipython,
  lcalc (>= 0.0.20080205-2),
@@ -82,19 +64,27 @@ Depends:
  python-gnutls,
  python-matplotlib,
  python-moinmoin,
+ python-mpmath,
+ python-networkx,
  python-numpy,
  python-ply,
  python-pygments,
+ python-rpy2,
+ python-scipy,
  python-setuptools,
  python-sphinx,
  python-sqlalchemy,
+ python-sympy,
+ python-twisted,
  python-zodb,
+ r-cran-lattice,
  r-base-dev,
  sagemath-database-conway-polynomials,
  sagemath-database-elliptic-curves,
  sagemath-database-graphs,
  sagemath-database-polytopes,
  scons,
+ sqlite3,
  sympow,
  tachyon,
  zlib1g-dev
@@ -106,10 +96,13 @@ Description: build dependencies of sagelib that are in Debian unstable
  that are currently in Debian unstable, but not in testing.
 Depends:
  ${misc:Depends},
+ libcdd-dev (>= 094g-4),
  liblinboxsage-dev (>= 1.3.2),
  libm4ri-dev (>= 20130416),
  libm4rie-dev (>= 20130416),
- gap-dev (>= 4r6p5)
+ gap (>= 4r6p4),
+ gap-dev (>= 4r6p5),
+ gfan
 
 Package: sagelib-builddeps-experimental
 Architecture: all
@@ -131,9 +124,10 @@ Description: build dependencies of sagelib that are not in Debian
  http://anonscm.debian.org/gitweb/?a=project_list&s=debian-science%2Fpackages
 Depends:
  ${misc:Depends},
- libcdd-dev (>= 094g-4),
  libsingular-dev (>= 3-1-5),
  libflint-dev (>= 2.3),
  libpari-dev (>= 2.4),
  palp (>= 2.1-2),
- python-pexpect-2.0
+ python-pexpect-2.0,
+ python-sagenb (>= 0.10.4),
+ rubiks

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