[Python-modules-commits] r19678 - in packages/ipython/trunk/debian (6 files)

[jtaylor-guest at users.alioth.debian.org]

    Date: Monday, December 19, 2011 @ 20:14:11
  Author: jtaylor-guest
Revision: 19678

install notebook examples and move ipython examples to -doc

requires -doc dependency on ipython
add share/doc/ipython to -notebook.dirs so doc linking works
removes need for dh_installexamples override

Added:
  packages/ipython/trunk/debian/ipython-doc.examples
  packages/ipython/trunk/debian/ipython-notebook.dirs
  packages/ipython/trunk/debian/ipython-notebook.examples
Modified:
  packages/ipython/trunk/debian/control
  packages/ipython/trunk/debian/ipython.install
  packages/ipython/trunk/debian/rules

Modified: packages/ipython/trunk/debian/control
===================================================================
--- packages/ipython/trunk/debian/control	2011-12-19 20:14:05 UTC (rev 19677)
+++ packages/ipython/trunk/debian/control	2011-12-19 20:14:11 UTC (rev 19678)
@@ -137,7 +137,7 @@
 Package: ipython-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Depends: ipython (= ${binary:Version}), ${misc:Depends}, ${sphinxdoc: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

Added: packages/ipython/trunk/debian/ipython-doc.examples
===================================================================
--- packages/ipython/trunk/debian/ipython-doc.examples	                        (rev 0)
+++ packages/ipython/trunk/debian/ipython-doc.examples	2011-12-19 20:14:11 UTC (rev 19678)
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/doc/ipython/examples/core
+debian/tmp/usr/share/doc/ipython/examples/lib

Added: packages/ipython/trunk/debian/ipython-notebook.dirs
===================================================================
--- packages/ipython/trunk/debian/ipython-notebook.dirs	                        (rev 0)
+++ packages/ipython/trunk/debian/ipython-notebook.dirs	2011-12-19 20:14:11 UTC (rev 19678)
@@ -0,0 +1 @@
+/usr/share/doc/ipython

Added: packages/ipython/trunk/debian/ipython-notebook.examples
===================================================================
--- packages/ipython/trunk/debian/ipython-notebook.examples	                        (rev 0)
+++ packages/ipython/trunk/debian/ipython-notebook.examples	2011-12-19 20:14:11 UTC (rev 19678)
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/ipython/examples/notebooks

Modified: packages/ipython/trunk/debian/ipython.install
===================================================================
--- packages/ipython/trunk/debian/ipython.install	2011-12-19 20:14:05 UTC (rev 19677)
+++ packages/ipython/trunk/debian/ipython.install	2011-12-19 20:14:11 UTC (rev 19678)
@@ -2,8 +2,7 @@
 /usr/bin/irunner
 /usr/bin/pycolor
 /usr/lib/python2.*
-/usr/share/doc/ipython/examples/core
-/usr/share/doc/ipython/examples/lib
+/usr/share/doc/ipython/examples/vim
 /usr/share/doc/ipython/extensions
 docs/emacs/ipython.el		usr/share/emacs/site-lisp
 docs/examples/core/ipython.desktop usr/share/applications/

Modified: packages/ipython/trunk/debian/rules
===================================================================
--- packages/ipython/trunk/debian/rules	2011-12-19 20:14:05 UTC (rev 19677)
+++ packages/ipython/trunk/debian/rules	2011-12-19 20:14:11 UTC (rev 19678)
@@ -119,10 +119,6 @@
 	  usr/share/doc/ipython/html/_images/qtconsole.png
 endif
 
-override_dh_installexamples:
-	dh_installexamples -pipython --exclude="examples/parallel/"
-	dh_installexamples -pipython-parallel
-
 override_dh_installman:
 	dh_installman
 	mv debian/ipython3/usr/share/man/man1/ipython.1 \