[Python-modules-commits] r6778 - in packages/ipython/trunk/debian (18 files)

speijnik-guest at users.alioth.debian.org speijnik-guest at users.alioth.debian.org
Tue Oct 28 22:23:44 UTC 2008 

    Date: Tuesday, October 28, 2008 @ 22:23:43
  Author: speijnik-guest
Revision: 6778

First few preparations for ipython 0.9.1.

Added:
  packages/ipython/trunk/debian/ipcluster.1
  packages/ipython/trunk/debian/patches/03_ipy_gnuglobal.patch
    (from rev 6544, packages/ipython/trunk/debian/patches/03_ipy_gnuglobal.dpatch)
  packages/ipython/trunk/debian/patches/04_remove_shebang.patch
    (from rev 6544, packages/ipython/trunk/debian/patches/04_remove_shebang.dpatch)
  packages/ipython/trunk/debian/patches/05_fix_seteditor_example.patch
  packages/ipython/trunk/debian/patches/series
    (from rev 6544, packages/ipython/trunk/debian/patches/00list)
Modified:
  packages/ipython/trunk/debian/changelog
  packages/ipython/trunk/debian/control
  packages/ipython/trunk/debian/install
  packages/ipython/trunk/debian/manpages
  packages/ipython/trunk/debian/rules
  packages/ipython/trunk/debian/watch
Deleted:
  packages/ipython/trunk/debian/README.Debian-source
  packages/ipython/trunk/debian/patches/00dpatch.conf
  packages/ipython/trunk/debian/patches/00list
  packages/ipython/trunk/debian/patches/03_ipy_gnuglobal.dpatch
  packages/ipython/trunk/debian/patches/04_remove_shebang.dpatch
  packages/ipython/trunk/debian/patches/05_fix_path_import.dpatch
  packages/ipython/trunk/debian/uscan-dfsg-clean.sh

Deleted: packages/ipython/trunk/debian/README.Debian-source
===================================================================
--- packages/ipython/trunk/debian/README.Debian-source	2008-10-28 22:03:29 UTC (rev 6777)
+++ packages/ipython/trunk/debian/README.Debian-source	2008-10-28 22:23:43 UTC (rev 6778)
@@ -1,8 +0,0 @@
-ipython source for Debian
--------------------------
-
-Ipython's source contains a manual directory which was created by latex2html,
-which needs to be removed as latex2html is not dfsg-free.
-This is automatically done if the source is downloaded using uscan.
-
- -- Bernd Zeimetz <bzed at debian.org>  Wed, 09 Jan 2008 13:46:24 +0100

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2008-10-28 22:03:29 UTC (rev 6777)
+++ packages/ipython/trunk/debian/changelog	2008-10-28 22:23:43 UTC (rev 6778)
@@ -1,10 +1,23 @@
-ipython (0.8.4-2) UNRELEASED; urgency=low
+ipython (0.9.1-1) UNRELEASED; urgency=low
 
+  [ Stephan Peijnik ]
+  * New upstream release.
+  * Cleaned up debian/ because the upstream tarball is clean since 0.8.4-1:
+    - Removed debian/uscan-dfsg-clean.sh.
+    - Removed debian/README.Debian-source.
+    - Updated debian/watch.
+  * Removed debian/patches/05_fix_path_import.dpatch - fixed upstream.
+  * Added myself to Uploaders.
+  * Moved from dpatch to quilt.
+  * Added dependency on python-foolscap.
+  * Wrote manpage for ipcluster.
+  * UNRELEASED - WORK IN PROGRESS.
+  
   [ Serafeim Zanikolas ]
   * Remove embedded copy of jquery.js and instead depend on libjs-jquery.
   * Fix import of path in ipipe.py (Closes: #486923).
 
- -- Serafeim Zanikolas <serzan at hellug.gr>  Tue, 19 Aug 2008 20:58:31 +0100
+ -- Stephan Peijnik <debian at sp.or.at>  Tue, 28 Oct 2008 23:22:04 +0100
 
 ipython (0.8.4-1) unstable; urgency=low
 

Modified: packages/ipython/trunk/debian/control
===================================================================
--- packages/ipython/trunk/debian/control	2008-10-28 22:03:29 UTC (rev 6777)
+++ packages/ipython/trunk/debian/control	2008-10-28 22:23:43 UTC (rev 6778)
@@ -2,8 +2,9 @@
 Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Bernd Zeimetz <bzed at debian.org>, Ondrej Certik <ondrej at certik.cz>
-Build-Depends: debhelper (>= 5.0.37.2), dpatch (>= 2.0.10), cdbs (>= 0.4.43), python, python-support (>= 0.4)
+Uploaders: Bernd Zeimetz <bzed at debian.org>, Ondrej Certik <ondrej at certik.cz>,
+	   Stephan Peijnik <debian at sp.or.at>
+Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python, python-support (>= 0.4), quilt
 Homepage: http://ipython.scipy.org/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/ipython/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/ipython/trunk/?op=log
@@ -12,10 +13,11 @@
 
 Package: ipython
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-pexpect, libjs-jquery
+Depends: ${python:Depends}, ${misc:Depends}, python-pexpect, libjs-jquery, python-foolscap (>= 0.3.2)
 Conflicts: python2.3-ipython, python2.4-ipython, ipython-common
 Replaces: python2.3-ipython, python2.4-ipython, ipython-common
 Suggests: python-profiler, python-numpy, python-matplotlib
+Recommends: python-wxwidgets2.8, 
 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

Modified: packages/ipython/trunk/debian/install
===================================================================
--- packages/ipython/trunk/debian/install	2008-10-28 22:03:29 UTC (rev 6777)
+++ packages/ipython/trunk/debian/install	2008-10-28 22:23:43 UTC (rev 6778)
@@ -1 +1 @@
-doc/ipython.el		usr/share/emacs/site-lisp
+docs/emacs/ipython.el		usr/share/emacs/site-lisp

Added: packages/ipython/trunk/debian/ipcluster.1
===================================================================
--- packages/ipython/trunk/debian/ipcluster.1	                        (rev 0)
+++ packages/ipython/trunk/debian/ipcluster.1	2008-10-28 22:23:43 UTC (rev 6778)
@@ -0,0 +1,57 @@
+.TH IPCLUSTER 1 "October 28, 2008" "" ""
+.SH NAME
+\fBipcluster \- IPython parallel computing cluster control tool
+.SH SYNOPSIS
+.nf
+.fam C
+\fBipcluster\fP [\fIoptions\fP]
+.fam T
+.fi
+.SH DESCRIPTION
+ipcluster is a control tool for IPython's parallel computing functions.
+.SH OPTIONS
+.TP
+.B
+\-h, \-\-help
+show this help message and exit
+.TP
+.B
+\-\-controller\-port=CONTROLLERPORT
+the TCP port the controller is listening on
+.TP
+.B
+\-\-controller\-ip=CONTROLLERIP
+the TCP IP address of the controller
+.TP
+.B
+\-n, \-\-num=N
+the number of engines to start
+.TP
+.B
+\-\-engine\-port=ENGINEPORT
+the TCP port the controller will listen on for engine connections
+.TP
+.B
+\-\-mpi=MPI
+use mpi with package: for instance --mpi=mpi4py
+.TP
+.B
+\-l LOGFILE, \-\-logfile=LOGFILE
+log file name
+.TP
+.B
+\-f CLUSTERFILE, \-\-cluster\-file=CLUSTERFILE
+file describing a remote cluster
+.SH EXAMPLE
+ipcluster -n 4
+
+This command will start 4 IPython engines.
+.SH SEE ALSO
+.BR ipython(1), ipcontroller(1), ipengine(1)
+.br
+.SH AUTHOR
+\fBipcluster\fP is a tool that ships with IPython, created by
+the IPython Development Team.
+.PP
+This manual page was written by Stephan Peijnik <debian at sp.or.at>,
+for the Debian project (but may be used by others).

Modified: packages/ipython/trunk/debian/manpages
===================================================================
--- packages/ipython/trunk/debian/manpages	2008-10-28 22:03:29 UTC (rev 6777)
+++ packages/ipython/trunk/debian/manpages	2008-10-28 22:23:43 UTC (rev 6778)
@@ -1 +1,2 @@
 debian/irunner.1
+debian/ipcluster.1
\ No newline at end of file

Deleted: packages/ipython/trunk/debian/patches/00dpatch.conf
===================================================================
--- packages/ipython/trunk/debian/patches/00dpatch.conf	2008-10-28 22:03:29 UTC (rev 6777)
+++ packages/ipython/trunk/debian/patches/00dpatch.conf	2008-10-28 22:23:43 UTC (rev 6778)
@@ -1,2 +0,0 @@
-conf_debianonly=1
-conf_origtargzpath=../tarballs

Deleted: packages/ipython/trunk/debian/patches/00list
===================================================================
--- packages/ipython/trunk/debian/patches/00list	2008-10-28 22:03:29 UTC (rev 6777)
+++ packages/ipython/trunk/debian/patches/00list	2008-10-28 22:23:43 UTC (rev 6778)
@@ -1,3 +0,0 @@
-03_ipy_gnuglobal
-04_remove_shebang
-05_fix_path_import

Deleted: packages/ipython/trunk/debian/patches/03_ipy_gnuglobal.dpatch
===================================================================
--- packages/ipython/trunk/debian/patches/03_ipy_gnuglobal.dpatch	2008-10-28 22:03:29 UTC (rev 6777)
+++ packages/ipython/trunk/debian/patches/03_ipy_gnuglobal.dpatch	2008-10-28 22:23:43 UTC (rev 6778)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ipy_gnuglobal.dpatch by Bernd Zeimetz <bernd at bzed.de>
-##
-## DP: we're not in windows - there's /usr/bin/global for us
-
- at DPATCH@
-diff -urNad ipython~/IPython/Extensions/ipy_gnuglobal.py ipython/IPython/Extensions/ipy_gnuglobal.py
---- ipython~/IPython/Extensions/ipy_gnuglobal.py	2007-05-25 20:35:34.000000000 +0200
-+++ ipython/IPython/Extensions/ipy_gnuglobal.py	2008-01-09 13:55:53.000000000 +0100
-@@ -13,7 +13,7 @@
- import os
- 
- # alter to your liking
--global_bin = 'd:/opt/global/bin/global'
-+global_bin = '/usr/bin/global'
- 
- def global_f(self,cmdline):
-     simple = 0

Copied: packages/ipython/trunk/debian/patches/03_ipy_gnuglobal.patch (from rev 6544, packages/ipython/trunk/debian/patches/03_ipy_gnuglobal.dpatch)
===================================================================
--- packages/ipython/trunk/debian/patches/03_ipy_gnuglobal.patch	                        (rev 0)
+++ packages/ipython/trunk/debian/patches/03_ipy_gnuglobal.patch	2008-10-28 22:23:43 UTC (rev 6778)
@@ -0,0 +1,15 @@
+Author: Bernd Zeimetz <bernd at bzed.de>
+Comment:
+  We are not in windows - there is /usr/bin/global for us.
+
+--- ipython~/IPython/Extensions/ipy_gnuglobal.py	2007-05-25 20:35:34.000000000 +0200
++++ ipython/IPython/Extensions/ipy_gnuglobal.py	2008-01-09 13:55:53.000000000 +0100
+@@ -13,7 +13,7 @@
+ import os
+ 
+ # alter to your liking
+-global_bin = 'd:/opt/global/bin/global'
++global_bin = '/usr/bin/global'
+ 
+ def global_f(self,cmdline):
+     simple = 0


Property changes on: packages/ipython/trunk/debian/patches/03_ipy_gnuglobal.patch
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: packages/ipython/trunk/debian/patches/04_remove_shebang.dpatch
===================================================================
--- packages/ipython/trunk/debian/patches/04_remove_shebang.dpatch	2008-10-28 22:03:29 UTC (rev 6777)
+++ packages/ipython/trunk/debian/patches/04_remove_shebang.dpatch	2008-10-28 22:23:43 UTC (rev 6778)
@@ -1,38 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_remove_shebang.dpatch by  <Piotr Ożarowski <piotr at debian.org>>
-##
-## DP: remove useless shebang
-
- at DPATCH@
-diff -urNad ipython~/IPython/Extensions/ipy_gnuglobal.py ipython/IPython/Extensions/ipy_gnuglobal.py
---- ipython~/IPython/Extensions/ipy_gnuglobal.py	2008-06-05 23:03:50.000000000 +0200
-+++ ipython/IPython/Extensions/ipy_gnuglobal.py	2008-06-05 23:03:50.000000000 +0200
-@@ -1,5 +1,3 @@
--#!/usr/bin/env python
--
- 
- """
- Add %global magic for GNU Global usage.
-diff -urNad ipython~/IPython/Extensions/ipy_render.py ipython/IPython/Extensions/ipy_render.py
---- ipython~/IPython/Extensions/ipy_render.py	2008-06-01 00:31:42.000000000 +0200
-+++ ipython/IPython/Extensions/ipy_render.py	2008-06-05 23:03:50.000000000 +0200
-@@ -1,4 +1,3 @@
--#!/usr/bin/env python
- 
- """ IPython extension: Render templates from variables and paste to clipbard """
- 
-@@ -65,4 +64,4 @@
-     return res
- 
- ip.to_user_ns('render')
--    
-\ No newline at end of file
-+    
-diff -urNad ipython~/IPython/Extensions/ipy_workdir.py ipython/IPython/Extensions/ipy_workdir.py
---- ipython~/IPython/Extensions/ipy_workdir.py	2008-06-01 00:31:42.000000000 +0200
-+++ ipython/IPython/Extensions/ipy_workdir.py	2008-06-05 23:03:50.000000000 +0200
-@@ -1,4 +1,3 @@
--#!/usr/bin/env python
- 
- import IPython.ipapi
- ip = IPython.ipapi.get()

Copied: packages/ipython/trunk/debian/patches/04_remove_shebang.patch (from rev 6544, packages/ipython/trunk/debian/patches/04_remove_shebang.dpatch)
===================================================================
--- packages/ipython/trunk/debian/patches/04_remove_shebang.patch	                        (rev 0)
+++ packages/ipython/trunk/debian/patches/04_remove_shebang.patch	2008-10-28 22:23:43 UTC (rev 6778)
@@ -0,0 +1,35 @@
+Author:  <Piotr Ożarowski <piotr at debian.org>>
+Comment:
+  Remove useless shebang.
+
+--- ipython~/IPython/Extensions/ipy_gnuglobal.py	2008-06-05 23:03:50.000000000 +0200
++++ ipython/IPython/Extensions/ipy_gnuglobal.py	2008-06-05 23:03:50.000000000 +0200
+@@ -1,5 +1,3 @@
+-#!/usr/bin/env python
+-
+ 
+ """
+ Add %global magic for GNU Global usage.
+diff -urNad ipython~/IPython/Extensions/ipy_render.py ipython/IPython/Extensions/ipy_render.py
+--- ipython~/IPython/Extensions/ipy_render.py	2008-06-01 00:31:42.000000000 +0200
++++ ipython/IPython/Extensions/ipy_render.py	2008-06-05 23:03:50.000000000 +0200
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ 
+ """ IPython extension: Render templates from variables and paste to clipbard """
+ 
+@@ -65,4 +64,4 @@
+     return res
+ 
+ ip.to_user_ns('render')
+-    
+\ No newline at end of file
++    
+diff -urNad ipython~/IPython/Extensions/ipy_workdir.py ipython/IPython/Extensions/ipy_workdir.py
+--- ipython~/IPython/Extensions/ipy_workdir.py	2008-06-01 00:31:42.000000000 +0200
++++ ipython/IPython/Extensions/ipy_workdir.py	2008-06-05 23:03:50.000000000 +0200
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ 
+ import IPython.ipapi
+ ip = IPython.ipapi.get()


Property changes on: packages/ipython/trunk/debian/patches/04_remove_shebang.patch
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mergeinfo
   + 

Deleted: packages/ipython/trunk/debian/patches/05_fix_path_import.dpatch
===================================================================
--- packages/ipython/trunk/debian/patches/05_fix_path_import.dpatch	2008-10-28 22:03:29 UTC (rev 6777)
+++ packages/ipython/trunk/debian/patches/05_fix_path_import.dpatch	2008-10-28 22:23:43 UTC (rev 6778)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_fix_path_import.dpatch by  <Serafeim Zanikolas <serzan at hellug.gr>>
-##
-## DP: fix path import
-
- at DPATCH@
-diff -ru ipython-0.8.4.orig/IPython/Extensions/ipipe.py ipython-0.8.4/IPython/Extensions/ipipe.py
---- ipython-0.8.4.orig/IPython/Extensions/ipipe.py	2008-05-31 23:31:42.000000000 +0100
-+++ ipython-0.8.4/IPython/Extensions/ipipe.py	2008-08-19 21:02:53.000000000 +0100
-@@ -124,7 +124,7 @@
- 
- from IPython.external import simplegeneric
- 
--import path
-+from IPython.external import path
- 
- try:
-     from IPython import genutils, generics

Added: packages/ipython/trunk/debian/patches/05_fix_seteditor_example.patch
===================================================================
--- packages/ipython/trunk/debian/patches/05_fix_seteditor_example.patch	                        (rev 0)
+++ packages/ipython/trunk/debian/patches/05_fix_seteditor_example.patch	2008-10-28 22:23:43 UTC (rev 6778)
@@ -0,0 +1,12 @@
+Author: Stephan Peijnik
+Comment:
+  Fixes missing shebang in seteditor.py example script.
+
+--- ipython-0.9.1.orig/docs/examples/core/seteditor.py	2008-09-19 17:32:19.531743653 +0200
++++ ipython-0.9.1/docs/examples/core/seteditor.py	2008-09-19 17:32:26.679744387 +0200
+@@ -1,3 +1,5 @@
++#!/usr/bin/python
++
+ import os
+ 
+ 

Copied: packages/ipython/trunk/debian/patches/series (from rev 6544, packages/ipython/trunk/debian/patches/00list)
===================================================================
--- packages/ipython/trunk/debian/patches/series	                        (rev 0)
+++ packages/ipython/trunk/debian/patches/series	2008-10-28 22:23:43 UTC (rev 6778)
@@ -0,0 +1,3 @@
+03_ipy_gnuglobal.patch
+04_remove_shebang.patch
+05_fix_seteditor_example.patch


Property changes on: packages/ipython/trunk/debian/patches/series
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: packages/ipython/trunk/debian/rules
===================================================================
--- packages/ipython/trunk/debian/rules	2008-10-28 22:03:29 UTC (rev 6777)
+++ packages/ipython/trunk/debian/rules	2008-10-28 22:23:43 UTC (rev 6778)
@@ -4,17 +4,15 @@
 PYVERS = $(shell pyversions -sv)
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 install/ipython::
+	# remove test suite script
+	rm $(CURDIR)/debian/ipython/usr/bin/iptest
 	# remove documentation
-	rm $(CURDIR)/debian/ipython/usr/share/doc/ipython/COPYING
-	rm $(CURDIR)/debian/ipython/usr/share/doc/ipython/ChangeLog
-	rm $(CURDIR)/debian/ipython/usr/share/doc/ipython/README_Windows.txt
-	rm $(CURDIR)/debian/ipython/usr/share/doc/ipython/pycon.ico
-	rm $(CURDIR)/debian/ipython/usr/share/doc/ipython/manual/_static/jquery.js
+	rm $(CURDIR)/debian/ipython/usr/share/doc/ipython/manual/html/_static/jquery.js
 	ln -s /usr/share/javascript/jquery/jquery.js \
-		$(CURDIR)/debian/ipython/usr/share/doc/ipython/manual/_static/
+		$(CURDIR)/debian/ipython/usr/share/doc/ipython/manual/html/_static/
 
 	# add wrapper scripts for all python versions
 	set -e ;\
@@ -43,3 +41,6 @@
 	chmod +x $(CURDIR)/debian/ipython/usr/share/python-support/ipython/IPython/external/mglob.py
 	rm -rf $(CURDIR)/debian/ipython/usr/share/doc/ipython/extensions
 
+
+# Needed for quilt to work properly.
+clean:: unpatch

Deleted: packages/ipython/trunk/debian/uscan-dfsg-clean.sh
===================================================================
--- packages/ipython/trunk/debian/uscan-dfsg-clean.sh	2008-10-28 22:03:29 UTC (rev 6777)
+++ packages/ipython/trunk/debian/uscan-dfsg-clean.sh	2008-10-28 22:23:43 UTC (rev 6778)
@@ -1,29 +0,0 @@
-#!/bin/sh 
-
-set -e
-
-#command --upstream-version version filename
-
-[ $# -eq 3 ] || exit 255
-
-echo
-
-version="$2"
-filename="$3"
-dfsgfilename=`echo $3 | sed 's,\.orig\.,.dfsg.orig.,'`
-
-tar xfz ${filename} 
-
-dir=`tar tfz ${filename} | head -1 | sed 's,/.*,,g'`
-rm -f ${filename}
-
-rm -rf ${dir}/doc/manual
-mv ${dir} ${dir}.dfsg.orig
-
-tar cf - ${dir}.dfsg.orig | gzip -9 > ${dfsgfilename}
-
-rm -rf ${dir}.dfsg.orig
-
-echo "${dfsgfilename} created."
-
-

Modified: packages/ipython/trunk/debian/watch
===================================================================
--- packages/ipython/trunk/debian/watch	2008-10-28 22:03:29 UTC (rev 6777)
+++ packages/ipython/trunk/debian/watch	2008-10-28 22:23:43 UTC (rev 6778)
@@ -1,4 +1,3 @@
 version=3
-opts=dversionmangle=s/\.dfsg\.\d+$// \
-    http://ipython.scipy.org/dist/ ipython-(.*)\.tar\.gz 
+http://ipython.scipy.org/dist/ ipython-(.*)\.tar\.gz

More information about the Python-modules-commits mailing list