[SCM] A Python IDE for scientists branch, master, updated. debian/2.1.10-2-11-gbee1110

Picca Frédéric-Emma?==?UTF-8?Q?nuel picca at debian.org
Sat Jan 19 19:40:41 UTC 2013


The following commit has been merged in the master branch:
commit bee11106a41d3664b6e2b73651ae85b0c26c4751
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sat Jan 19 18:31:29 2013 +0100

    use the system jquery and mathjax

diff --git a/debian/changelog b/debian/changelog
index c1c57d3..44494d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,11 +5,12 @@ spyder (2.2.0~beta1+dfsg-1) UNRELEASED; urgency=low
   * debian/watch
     - fix version numbers generation thanks to Bart Martens
   * debian/control
-    - add Depends: python-psutil.
-    - add Recommends: ipython-qtconsole (>= 0.12)
+    - add Depends: libjs-jquery, libjs-mathjax
+    - add Recommends: python-psutil, ipython-qtconsole (>= 0.12)
   * debian/patches
     - 0001-fix-documentation-installation.patch (updated)
     - 0003-from-upstream-fix-1098.patch (deleted)
+    - 0003-allow-to-configure-jquery-and-mathjax-location.patch (new)
 
  -- Picca Frédéric-Emmanuel <picca at debian.org>  Sat, 19 Jan 2013 14:39:03 +0100
 
diff --git a/debian/control b/debian/control
index 0a05b1b..0269b71 100644
--- a/debian/control
+++ b/debian/control
@@ -33,6 +33,8 @@ Section: python
 Depends: ${misc:Depends},
          ${python:Depends},
          ${sphinxdoc:Depends},
+         libjs-jquery,
+         libjs-mathjax,
          python-qt4
 Recommends: ipython-qtconsol,
             pep8,

-- 
A Python IDE for scientists



More information about the debian-science-commits mailing list