[Python-modules-commits] r21752 - in packages/ipython/trunk/debian (8 files)
jtaylor-guest at users.alioth.debian.org
jtaylor-guest at users.alioth.debian.org
Mon May 14 20:34:34 UTC 2012
Date: Monday, May 14, 2012 @ 20:34:32
Author: jtaylor-guest
Revision: 21752
move static data to ipython-notebook-common package
Added:
packages/ipython/trunk/debian/ipython-notebook-common.install
packages/ipython/trunk/debian/ipython-notebook-common.links
packages/ipython/trunk/debian/patches/shared-static-path.patch
Modified:
packages/ipython/trunk/debian/changelog
packages/ipython/trunk/debian/control
packages/ipython/trunk/debian/patches/series
packages/ipython/trunk/debian/rules
Deleted:
packages/ipython/trunk/debian/ipython-notebook.links
Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog 2012-05-14 19:52:49 UTC (rev 21751)
+++ packages/ipython/trunk/debian/changelog 2012-05-14 20:34:32 UTC (rev 21752)
@@ -1,12 +1,13 @@
ipython (0.12.1+dfsg-2) UNRELEASED; urgency=low
+ * move static notebook data to ipython-notebook-common
* add ipython3 depend on python3-simplegeneric and remove the embedded copy
* update use-system-mathjax-if-available.patch:
prefer local mathjax installation over the system one
* add parallel-2to3.patch:
allow running 2to3 in parallel. Thanks to Jakub Wilk for the patch
- -- Julian Taylor <jtaylor.debian at googlemail.com> Mon, 14 May 2012 21:46:25 +0200
+ -- Julian Taylor <jtaylor.debian at googlemail.com> Mon, 14 May 2012 22:12:09 +0200
ipython (0.12.1+dfsg-1) unstable; urgency=low
Modified: packages/ipython/trunk/debian/control
===================================================================
--- packages/ipython/trunk/debian/control 2012-05-14 19:52:49 UTC (rev 21751)
+++ packages/ipython/trunk/debian/control 2012-05-14 20:34:32 UTC (rev 21752)
@@ -65,9 +65,9 @@
Package: ipython3
Architecture: all
-Depends: python3-simplegeneric,
- python3-decorator,
+Depends: python3-decorator,
python3-pkg-resources,
+ python3-simplegeneric,
${misc:Depends},
${python3:Depends}
Suggests: ipython3-qtconsole, python3-zmq (>= 2.0.10.1)
@@ -129,12 +129,32 @@
.
This package contains the Python3 variant of the qt console.
-Package: ipython-notebook
+Package: ipython-notebook-common
Architecture: all
Depends: ipython (= ${binary:Version}),
libjs-jquery,
libjs-jquery-ui,
libjs-mathjax,
+ ${misc:Depends},
+Replaces: ipython-notebook (<< 0.12.1-2)
+Breaks: ipython-notebook (<< 0.12.1-2)
+Description: interactive Python html notebook
+ IPython can be used as a replacement for the standard Python shell,
+ or it can be used as a complete working environment for scientific
+ computing (like Matlab or Mathematica) when paired with the standard
+ Python scientific and numerical tools. It supports dynamic object
+ introspections, numbered input/output prompts, a macro system,
+ session logging, session restoring, complete system shell access,
+ verbose and colored traceback reports, auto-parentheses, auto-quoting,
+ and is embeddable in other Python programs.
+ .
+ This package contains the html notebook providing a Mathematica-like
+ webinterface to Python.
+
+Package: ipython-notebook
+Architecture: all
+Depends: ipython (= ${binary:Version}),
+ ipython-notebook-common (= ${binary:Version}),
python-tornado (>= 2.1.0),
python-zmq (>= 2.1.4),
${misc:Depends},
Added: packages/ipython/trunk/debian/ipython-notebook-common.install
===================================================================
--- packages/ipython/trunk/debian/ipython-notebook-common.install (rev 0)
+++ packages/ipython/trunk/debian/ipython-notebook-common.install 2012-05-14 20:34:32 UTC (rev 21752)
@@ -0,0 +1 @@
+IPython/frontend/html/notebook/static usr/share/ipython/notebook
Added: packages/ipython/trunk/debian/ipython-notebook-common.links
===================================================================
--- packages/ipython/trunk/debian/ipython-notebook-common.links (rev 0)
+++ packages/ipython/trunk/debian/ipython-notebook-common.links 2012-05-14 20:34:32 UTC (rev 21752)
@@ -0,0 +1,17 @@
+/usr/share/javascript/jquery/jquery.js usr/share/ipython/notebook/static/jquery/js/jquery-1.6.2.min.js
+/usr/share/javascript/jquery-ui/jquery-ui.min.js usr/share/ipython/notebook/static/jquery/js/jquery-ui-1.8.14.custom.min.js
+
+/usr/share/javascript/jquery-ui/css/smoothness/jquery-ui.css usr/share/ipython/notebook/static/jquery/css/themes/smoothness/jquery-ui-1.8.14.custom.css
+/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png usr/share/ipython/notebook/static/jquery/css/themes/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-icons_888888_256x240.png usr/share/ipython/notebook/static/jquery/css/themes/smoothness/images/ui-icons_888888_256x240.png
+/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-icons_222222_256x240.png usr/share/ipython/notebook/static/jquery/css/themes/smoothness/images/ui-icons_222222_256x240.png
+/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-icons_cd0a0a_256x240.png usr/share/ipython/notebook/static/jquery/css/themes/smoothness/images/ui-icons_cd0a0a_256x240.png
+/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png usr/share/ipython/notebook/static/jquery/css/themes/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
+/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-icons_2e83ff_256x240.png usr/share/ipython/notebook/static/jquery/css/themes/smoothness/images/ui-icons_2e83ff_256x240.png
+/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png usr/share/ipython/notebook/static/jquery/css/themes/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
+/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png usr/share/ipython/notebook/static/jquery/css/themes/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
+/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png usr/share/ipython/notebook/static/jquery/css/themes/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
+/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-bg_glass_75_dadada_1x400.png usr/share/ipython/notebook/static/jquery/css/themes/smoothness/images/ui-bg_glass_75_dadada_1x400.png
+/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-bg_flat_75_ffffff_40x100.png usr/share/ipython/notebook/static/jquery/css/themes/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
+/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-bg_glass_65_ffffff_1x400.png usr/share/ipython/notebook/static/jquery/css/themes/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
+/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-icons_454545_256x240.png usr/share/ipython/notebook/static/jquery/css/themes/smoothness/images/ui-icons_454545_256x240.png
Deleted: packages/ipython/trunk/debian/ipython-notebook.links
===================================================================
--- packages/ipython/trunk/debian/ipython-notebook.links 2012-05-14 19:52:49 UTC (rev 21751)
+++ packages/ipython/trunk/debian/ipython-notebook.links 2012-05-14 20:34:32 UTC (rev 21752)
@@ -1,17 +0,0 @@
-/usr/share/javascript/jquery/jquery.js usr/share/pyshared/IPython/frontend/html/notebook/static/jquery/js/jquery-1.6.2.min.js
-/usr/share/javascript/jquery-ui/jquery-ui.min.js usr/share/pyshared/IPython/frontend/html/notebook/static/jquery/js/jquery-ui-1.8.14.custom.min.js
-
-/usr/share/javascript/jquery-ui/css/smoothness/jquery-ui.css usr/share/pyshared/IPython/frontend/html/notebook/static/jquery/css/themes/smoothness/jquery-ui-1.8.14.custom.css
-/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png usr/share/pyshared/IPython/frontend/html/notebook/static/jquery/css/themes/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-icons_888888_256x240.png usr/share/pyshared/IPython/frontend/html/notebook/static/jquery/css/themes/smoothness/images/ui-icons_888888_256x240.png
-/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-icons_222222_256x240.png usr/share/pyshared/IPython/frontend/html/notebook/static/jquery/css/themes/smoothness/images/ui-icons_222222_256x240.png
-/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-icons_cd0a0a_256x240.png usr/share/pyshared/IPython/frontend/html/notebook/static/jquery/css/themes/smoothness/images/ui-icons_cd0a0a_256x240.png
-/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png usr/share/pyshared/IPython/frontend/html/notebook/static/jquery/css/themes/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
-/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-icons_2e83ff_256x240.png usr/share/pyshared/IPython/frontend/html/notebook/static/jquery/css/themes/smoothness/images/ui-icons_2e83ff_256x240.png
-/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png usr/share/pyshared/IPython/frontend/html/notebook/static/jquery/css/themes/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
-/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png usr/share/pyshared/IPython/frontend/html/notebook/static/jquery/css/themes/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
-/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png usr/share/pyshared/IPython/frontend/html/notebook/static/jquery/css/themes/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
-/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-bg_glass_75_dadada_1x400.png usr/share/pyshared/IPython/frontend/html/notebook/static/jquery/css/themes/smoothness/images/ui-bg_glass_75_dadada_1x400.png
-/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-bg_flat_75_ffffff_40x100.png usr/share/pyshared/IPython/frontend/html/notebook/static/jquery/css/themes/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
-/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-bg_glass_65_ffffff_1x400.png usr/share/pyshared/IPython/frontend/html/notebook/static/jquery/css/themes/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
-/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-icons_454545_256x240.png usr/share/pyshared/IPython/frontend/html/notebook/static/jquery/css/themes/smoothness/images/ui-icons_454545_256x240.png
Modified: packages/ipython/trunk/debian/patches/series
===================================================================
--- packages/ipython/trunk/debian/patches/series 2012-05-14 19:52:49 UTC (rev 21751)
+++ packages/ipython/trunk/debian/patches/series 2012-05-14 20:34:32 UTC (rev 21752)
@@ -4,3 +4,4 @@
use-ipython-icon-in-desktop-files.patch
use-system-mathjax-if-available.patch
parallel-2to3.patch
+shared-static-path.patch
Added: packages/ipython/trunk/debian/patches/shared-static-path.patch
===================================================================
--- packages/ipython/trunk/debian/patches/shared-static-path.patch (rev 0)
+++ packages/ipython/trunk/debian/patches/shared-static-path.patch 2012-05-14 20:34:32 UTC (rev 21752)
@@ -0,0 +1,25 @@
+Description: use usr/share/ipython/notebook by default for the static data
+ provided by ipython-notebook-common
+Author: Julian Taylor <jtaylor.debian at googlemail.com>
+Forwarded: not-needed
+
+--- a/IPython/frontend/html/notebook/notebookapp.py
++++ b/IPython/frontend/html/notebook/notebookapp.py
+@@ -112,7 +112,7 @@
+
+ settings = dict(
+ template_path=os.path.join(os.path.dirname(__file__), "templates"),
+- static_path=os.path.join(os.path.dirname(__file__), "static"),
++ static_path=os.path.join("/usr/share/ipython/notebook/static"),
+ cookie_secret=os.urandom(1024),
+ login_url="/login",
+ )
+@@ -285,7 +285,7 @@
+ def _mathjax_url_default(self):
+ if not self.enable_mathjax:
+ return u''
+- static_path = self.webapp_settings.get("static_path", os.path.join(os.path.dirname(__file__), "static"))
++ static_path = self.webapp_settings.get("static_path", "/usr/share/ipython/notebook/static")
+ if os.path.exists(os.path.join(static_path, 'mathjax', "MathJax.js")):
+ self.log.info("Using local MathJax")
+ return u"static/mathjax/MathJax.js"
Modified: packages/ipython/trunk/debian/rules
===================================================================
--- packages/ipython/trunk/debian/rules 2012-05-14 19:52:49 UTC (rev 21751)
+++ packages/ipython/trunk/debian/rules 2012-05-14 20:34:32 UTC (rev 21752)
@@ -60,7 +60,8 @@
--exclude="IPython/deathrow/" \
--exclude="IPython/quarantine/" \
--exclude=tests
- dh_install -pipython-notebook -XCOPYING -XLICENSE -XLICENSE.txt
+ dh_install -pipython-notebook --exclude="html/notebook/static/"
+ dh_install -pipython-notebook-common -XCOPYING -XLICENSE -XLICENSE.txt
dh_install -pipython-qtconsole
dh_install -pipython3 \
--exclude="IPython/frontend/qt/" \
@@ -70,6 +71,7 @@
--exclude=tests
dh_install -pipython3-qtconsole
+
mkdir -p $(CURDIR)/debian/ipython/usr/share/icons/hicolor/scalable/apps/
cp IPython/frontend/qt/console/resources/icon/IPythonConsole.svg \
$(CURDIR)/debian/ipython/usr/share/icons/hicolor/scalable/apps/ipython.svg
@@ -119,6 +121,7 @@
dh_installdocs -pipython-qtconsole --link-doc=ipython
dh_installdocs -pipython3-qtconsole --link-doc=ipython3
dh_installdocs -pipython-notebook --link-doc=ipython
+ dh_installdocs -pipython-notebook-common --link-doc=ipython
dh_installdocs -pipython-doc --link-doc=ipython
find $(CURDIR)/debian/ipython -type d -empty -delete
More information about the Python-modules-commits
mailing list