[Python-modules-commits] r19679 - in packages/ipython/trunk/debian (10 files)
jtaylor-guest at users.alioth.debian.org
jtaylor-guest at users.alioth.debian.org
Mon Dec 19 20:14:17 UTC 2011
Date: Monday, December 19, 2011 @ 20:14:16
Author: jtaylor-guest
Revision: 19679
merge -parallel package back into ipython
reduces the complexity of the package for only very low size increase
Added:
packages/ipython/trunk/debian/ipython-qtconsole.dirs
(from rev 19678, packages/ipython/trunk/debian/ipython-parallel.dirs)
Modified:
packages/ipython/trunk/debian/control
packages/ipython/trunk/debian/ipython-doc.examples
packages/ipython/trunk/debian/ipython.install
packages/ipython/trunk/debian/ipython.manpages
packages/ipython/trunk/debian/rules
Deleted:
packages/ipython/trunk/debian/ipython-parallel.dirs
packages/ipython/trunk/debian/ipython-parallel.examples
packages/ipython/trunk/debian/ipython-parallel.install
packages/ipython/trunk/debian/ipython-parallel.manpages
Modified: packages/ipython/trunk/debian/control
===================================================================
--- packages/ipython/trunk/debian/control 2011-12-19 20:14:11 UTC (rev 19678)
+++ packages/ipython/trunk/debian/control 2011-12-19 20:14:16 UTC (rev 19679)
@@ -44,7 +44,6 @@
${python:Depends}
Suggests: ipython-doc,
ipython-notebook,
- ipython-parallel,
ipython-qtconsole,
python-matplotlib,
python-numpy,
@@ -97,24 +96,6 @@
.
This package contains the qt console.
-Package: ipython-parallel
-Architecture: all
-Depends: ipython (= ${binary:Version}),
- python-zmq (>= 2.1.4),
- ${misc:Depends},
- ${python:Depends}
-Description: enhanced interactive Python shell
- 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 parallel processing facilities.
-
Package: ipython-notebook
Architecture: all
Depends: ipython (= ${binary:Version}),
Modified: packages/ipython/trunk/debian/ipython-doc.examples
===================================================================
--- packages/ipython/trunk/debian/ipython-doc.examples 2011-12-19 20:14:11 UTC (rev 19678)
+++ packages/ipython/trunk/debian/ipython-doc.examples 2011-12-19 20:14:16 UTC (rev 19679)
@@ -1,2 +1,3 @@
debian/tmp/usr/share/doc/ipython/examples/core
debian/tmp/usr/share/doc/ipython/examples/lib
+debian/tmp/usr/share/doc/ipython/examples/parallel
Deleted: packages/ipython/trunk/debian/ipython-parallel.dirs
===================================================================
--- packages/ipython/trunk/debian/ipython-parallel.dirs 2011-12-19 20:14:11 UTC (rev 19678)
+++ packages/ipython/trunk/debian/ipython-parallel.dirs 2011-12-19 20:14:16 UTC (rev 19679)
@@ -1 +0,0 @@
-/usr/share/doc/ipython
Deleted: packages/ipython/trunk/debian/ipython-parallel.examples
===================================================================
--- packages/ipython/trunk/debian/ipython-parallel.examples 2011-12-19 20:14:11 UTC (rev 19678)
+++ packages/ipython/trunk/debian/ipython-parallel.examples 2011-12-19 20:14:16 UTC (rev 19679)
@@ -1 +0,0 @@
-debian/tmp/usr/share/doc/ipython/examples/parallel
Deleted: packages/ipython/trunk/debian/ipython-parallel.install
===================================================================
--- packages/ipython/trunk/debian/ipython-parallel.install 2011-12-19 20:14:11 UTC (rev 19678)
+++ packages/ipython/trunk/debian/ipython-parallel.install 2011-12-19 20:14:16 UTC (rev 19679)
@@ -1,5 +0,0 @@
-/usr/bin/ipcluster
-/usr/bin/ipcontroller
-/usr/bin/ipengine
-/usr/bin/iplogger
-/usr/lib/python2*/dist-packages/IPython/parallel/
Deleted: packages/ipython/trunk/debian/ipython-parallel.manpages
===================================================================
--- packages/ipython/trunk/debian/ipython-parallel.manpages 2011-12-19 20:14:11 UTC (rev 19678)
+++ packages/ipython/trunk/debian/ipython-parallel.manpages 2011-12-19 20:14:16 UTC (rev 19679)
@@ -1,4 +0,0 @@
-docs/man/ipcluster.1
-docs/man/ipcontroller.1
-docs/man/ipengine.1
-docs/man/iplogger.1
Copied: packages/ipython/trunk/debian/ipython-qtconsole.dirs (from rev 19678, packages/ipython/trunk/debian/ipython-parallel.dirs)
===================================================================
--- packages/ipython/trunk/debian/ipython-qtconsole.dirs (rev 0)
+++ packages/ipython/trunk/debian/ipython-qtconsole.dirs 2011-12-19 20:14:16 UTC (rev 19679)
@@ -0,0 +1 @@
+/usr/share/doc/ipython
Modified: packages/ipython/trunk/debian/ipython.install
===================================================================
--- packages/ipython/trunk/debian/ipython.install 2011-12-19 20:14:11 UTC (rev 19678)
+++ packages/ipython/trunk/debian/ipython.install 2011-12-19 20:14:16 UTC (rev 19679)
@@ -1,6 +1,10 @@
/usr/bin/ipython
/usr/bin/irunner
/usr/bin/pycolor
+/usr/bin/ipcluster
+/usr/bin/ipcontroller
+/usr/bin/ipengine
+/usr/bin/iplogger
/usr/lib/python2.*
/usr/share/doc/ipython/examples/vim
/usr/share/doc/ipython/extensions
Modified: packages/ipython/trunk/debian/ipython.manpages
===================================================================
--- packages/ipython/trunk/debian/ipython.manpages 2011-12-19 20:14:11 UTC (rev 19678)
+++ packages/ipython/trunk/debian/ipython.manpages 2011-12-19 20:14:16 UTC (rev 19679)
@@ -1,3 +1,7 @@
docs/man/ipython.1
docs/man/irunner.1
docs/man/pycolor.1
+docs/man/ipcluster.1
+docs/man/ipcontroller.1
+docs/man/ipengine.1
+docs/man/iplogger.1
Modified: packages/ipython/trunk/debian/rules
===================================================================
--- packages/ipython/trunk/debian/rules 2011-12-19 20:14:11 UTC (rev 19678)
+++ packages/ipython/trunk/debian/rules 2011-12-19 20:14:16 UTC (rev 19679)
@@ -44,16 +44,15 @@
sed -i '1c#!/usr/bin/env python3' $(CURDIR)/debian/tmp/usr/bin/irunner3
override_dh_install:
- dh_install -pipython --exclude="IPython/parallel/" \
+ dh_install -pipython \
--exclude="IPython/frontend/qt/" \
--exclude="IPython/frontend/html/" \
--exclude="IPython/deathrow/" \
--exclude="IPython/quarantine/" \
--exclude=tests
- dh_install -pipython-parallel
dh_install -pipython-notebook -XCOPYING -XLICENSE -XLICENSE.txt
dh_install -pipython-qtconsole
- dh_install -pipython3 --exclude="IPython/parallel/" \
+ dh_install -pipython3 \
--exclude="IPython/frontend/qt/" \
--exclude="IPython/frontend/html/" \
--exclude="IPython/deathrow/" \
@@ -105,7 +104,6 @@
ifeq (,$(filter nodocs,$(DEB_BUILD_OPTIONS)))
dh_installdocs -pipython
dh_installdocs -pipython3
- dh_installdocs -pipython-parallel --link-doc=ipython
dh_installdocs -pipython-qtconsole --link-doc=ipython
dh_installdocs -pipython-notebook --link-doc=ipython
dh_installdocs -pipython-doc --link-doc=ipython
More information about the Python-modules-commits
mailing list