[Python-modules-commits] r19288 - in packages/ipython/trunk/debian (4 files)

jtaylor-guest at users.alioth.debian.org jtaylor-guest at users.alioth.debian.org
Sat Nov 12 18:07:24 UTC 2011


    Date: Saturday, November 12, 2011 @ 18:07:22
  Author: jtaylor-guest
Revision: 19288

delete disabled obsolete patches 03, 04, 06

Modified:
  packages/ipython/trunk/debian/changelog
Deleted:
  packages/ipython/trunk/debian/patches/03_ipy_gnuglobal.patch
  packages/ipython/trunk/debian/patches/04_remove_shebang.patch
  packages/ipython/trunk/debian/patches/06_ipythonwx_importerror.patch

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2011-11-12 18:07:12 UTC (rev 19287)
+++ packages/ipython/trunk/debian/changelog	2011-11-12 18:07:22 UTC (rev 19288)
@@ -3,8 +3,9 @@
   * New upstream release candidate
   * fix some DEP5 syntax errors
   * remove upstreamed testsuite-fix patch
+  * delete disabled obsolete patches 03, 04, 06
 
- -- Julian Taylor <jtaylor.debian at googlemail.com>  Thu, 14 Jul 2011 09:44:31 +0200
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Thu, 14 Jul 2011 09:54:15 +0200
 
 ipython (0.11~rc1-1) experimental; urgency=low
 

Deleted: packages/ipython/trunk/debian/patches/03_ipy_gnuglobal.patch
===================================================================
--- packages/ipython/trunk/debian/patches/03_ipy_gnuglobal.patch	2011-11-12 18:07:12 UTC (rev 19287)
+++ packages/ipython/trunk/debian/patches/03_ipy_gnuglobal.patch	2011-11-12 18:07:22 UTC (rev 19288)
@@ -1,15 +0,0 @@
-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

Deleted: packages/ipython/trunk/debian/patches/04_remove_shebang.patch
===================================================================
--- packages/ipython/trunk/debian/patches/04_remove_shebang.patch	2011-11-12 18:07:12 UTC (rev 19287)
+++ packages/ipython/trunk/debian/patches/04_remove_shebang.patch	2011-11-12 18:07:22 UTC (rev 19288)
@@ -1,35 +0,0 @@
-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()

Deleted: packages/ipython/trunk/debian/patches/06_ipythonwx_importerror.patch
===================================================================
--- packages/ipython/trunk/debian/patches/06_ipythonwx_importerror.patch	2011-11-12 18:07:12 UTC (rev 19287)
+++ packages/ipython/trunk/debian/patches/06_ipythonwx_importerror.patch	2011-11-12 18:07:22 UTC (rev 19288)
@@ -1,17 +0,0 @@
-Author: Stephan Peijnik
-Comment:
-  Added more usable error message when exiting due to python-wxgtk2.8 not being
-  installed.
-
---- ipython-0.9.1.orig/IPython/frontend/wx/ipythonx.py	2008-10-29 11:50:42.777153341 +0100
-+++ ipython-0.9.1/IPython/frontend/wx/ipythonx.py	2008-10-29 11:52:10.136154913 +0100
-@@ -9,6 +9,9 @@
-     e.message = """%s
- ________________________________________________________________________________
- You need wxPython to run this application.
-+
-+wxPython can be installed from the python-wxgtk2.8 package. This can be
-+done by running 'apt-get install python-wxgtk2.8'.
- """ % e.message
-     e.args = (e.message, ) + e.args[1:]
-     raise e




More information about the Python-modules-commits mailing list