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

Thu Jun 5 21:06:21 UTC 2008

Date: Thursday, June 5, 2008 @ 21:06:19
  Author: bzed
Revision: 5558

* debian/patches:
  - dropping the following patches - applied usptream / not needed anymore.
    01_docdir-base.dpatch
    02_profiler-message.dpatch
    05_no_manual_dir.dpatch
  - updating the following patches:
    04_remove_shebang.dpatch

Modified:
  packages/ipython/trunk/debian/changelog
  packages/ipython/trunk/debian/patches/00list
  packages/ipython/trunk/debian/patches/04_remove_shebang.dpatch
Deleted:
  packages/ipython/trunk/debian/patches/01_docdir-base.dpatch
  packages/ipython/trunk/debian/patches/02_profiler-message.dpatch
  packages/ipython/trunk/debian/patches/05_no_manual_dir.dpatch

Modified: packages/ipython/trunk/debian/changelog
===================================================================

--- packages/ipython/trunk/debian/changelog	2008-06-05 21:00:01 UTC (rev 5557)
+++ packages/ipython/trunk/debian/changelog	2008-06-05 21:06:19 UTC (rev 5558)
@@ -19,6 +19,14 @@
     now, and included in the source. Also dropping debian/uscan-dfsg-clean.sh
     and updating debian/watch accordingly.
 
+  * debian/patches:
+    - dropping the following patches - applied usptream / not needed anymore.
+      01_docdir-base.dpatch
+      02_profiler-message.dpatch
+      05_no_manual_dir.dpatch
+    - updating the following patches:
+      04_remove_shebang.dpatch
+
  -- Bernd Zeimetz <bzed at debian.org>  Thu, 05 Jun 2008 22:50:59 +0200
 
 ipython (0.8.2.dfsg-2) unstable; urgency=low

Modified: packages/ipython/trunk/debian/patches/00list
===================================================================
--- packages/ipython/trunk/debian/patches/00list	2008-06-05 21:00:01 UTC (rev 5557)
+++ packages/ipython/trunk/debian/patches/00list	2008-06-05 21:06:19 UTC (rev 5558)
@@ -1,5 +1,2 @@
-01_docdir-base
-02_profiler-message
 03_ipy_gnuglobal
 04_remove_shebang
-05_no_manual_dir

Deleted: packages/ipython/trunk/debian/patches/01_docdir-base.dpatch
===================================================================
--- packages/ipython/trunk/debian/patches/01_docdir-base.dpatch	2008-06-05 21:00:01 UTC (rev 5557)
+++ packages/ipython/trunk/debian/patches/01_docdir-base.dpatch	2008-06-05 21:06:19 UTC (rev 5558)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_docdir-base.dpatch by Jack Moffitt <jack at xiph.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Change docdirbase to be consistent with Debian policy
-
- at DPATCH@
-diff -Nur ipython-0.7.0.orig/setup.py ipython-0.7.0/setup.py
---- ipython-0.7.0.orig/setup.py	2005-12-25 00:46:14.000000000 +0000
-+++ ipython-0.7.0/setup.py	2006-01-21 19:29:34.000000000 +0000
-@@ -99,7 +99,7 @@
- # Note that http://www.redbrick.dcu.ie/~noel/distutils.html, ex. 2/3, contain
- # information on how to do this more cleanly once python 2.4 can be assumed.
- # Thanks to Noel for the tip.
--docdirbase  = 'share/doc/ipython-%s' % version
-+docdirbase  = 'share/doc/ipython'
- manpagebase = 'share/man/man1'
- 
- # We only need to exclude from this things NOT already excluded in the

Deleted: packages/ipython/trunk/debian/patches/02_profiler-message.dpatch
===================================================================
--- packages/ipython/trunk/debian/patches/02_profiler-message.dpatch	2008-06-05 21:00:01 UTC (rev 5557)
+++ packages/ipython/trunk/debian/patches/02_profiler-message.dpatch	2008-06-05 21:06:19 UTC (rev 5558)
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_profiler-support.dpatch by Norbert Tretkowski <nobse at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Tweak message about profiler support, we _are_ using Debian :)
-
- at DPATCH@
-diff -Nur ipython-0.7.0.orig/IPython/Magic.py ipython-0.7.0/IPython/Magic.py
---- ipython-0.7.0.orig/IPython/Magic.py	2006-01-10 08:06:14.000000000 +0000
-+++ ipython-0.7.0/IPython/Magic.py	2006-01-21 19:31:53.000000000 +0000
-@@ -90,9 +90,9 @@
- 
-     def profile_missing_notice(self, *args, **kwargs):
-         error("""\
--The profile module could not be found.  If you are a Debian user,
--it has been removed from the standard Debian package because of its non-free
--license. To use profiling, please install"python2.3-profiler" from non-free.""")
-+The profile module could not be found. It has been removed from the standard
-+python packages because of its non-free license. To use profiling, install the
-+python-profiler package from non-free.""")
- 
-     def default_option(self,fn,optstr):
-         """Make an entry in the options_table for fn, with value optstr"""

Modified: packages/ipython/trunk/debian/patches/04_remove_shebang.dpatch
===================================================================
--- packages/ipython/trunk/debian/patches/04_remove_shebang.dpatch	2008-06-05 21:00:01 UTC (rev 5557)
+++ packages/ipython/trunk/debian/patches/04_remove_shebang.dpatch	2008-06-05 21:06:19 UTC (rev 5558)
@@ -4,17 +4,9 @@
 ## DP: remove useless shebang
 
 @DPATCH@
-diff -urNad ipython~/IPython/Extensions/ipy_completers.py ipython/IPython/Extensions/ipy_completers.py
---- ipython~/IPython/Extensions/ipy_completers.py	2007-11-09 21:06:56.000000000 +0100
-+++ ipython/IPython/Extensions/ipy_completers.py	2008-01-09 14:00:25.000000000 +0100
-@@ -1,4 +1,3 @@
--#!/usr/bin/env python
- 
- """ Implementations for various useful completers
- 
 diff -urNad ipython~/IPython/Extensions/ipy_gnuglobal.py ipython/IPython/Extensions/ipy_gnuglobal.py
---- ipython~/IPython/Extensions/ipy_gnuglobal.py	2008-01-09 14:00:25.000000000 +0100
-+++ ipython/IPython/Extensions/ipy_gnuglobal.py	2008-01-09 14:00:25.000000000 +0100
+--- 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
 -
@@ -22,8 +14,8 @@
  """
  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	2007-05-25 20:35:34.000000000 +0200
-+++ ipython/IPython/Extensions/ipy_render.py	2008-01-09 14:00:25.000000000 +0100
+--- 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
  
@@ -37,8 +29,8 @@
 \ 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	2007-09-08 01:02:28.000000000 +0200
-+++ ipython/IPython/Extensions/ipy_workdir.py	2008-01-09 14:00:40.000000000 +0100
+--- 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
  

Deleted: packages/ipython/trunk/debian/patches/05_no_manual_dir.dpatch
===================================================================
--- packages/ipython/trunk/debian/patches/05_no_manual_dir.dpatch	2008-06-05 21:00:01 UTC (rev 5557)
+++ packages/ipython/trunk/debian/patches/05_no_manual_dir.dpatch	2008-06-05 21:06:19 UTC (rev 5558)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_no_manual_dir.dpatch by Bernd Zeimetz <bzed at debian.org>
-##
-## DP: don't create empty directories
-
- at DPATCH@
-diff -urNad ipython~/setup.py ipython/setup.py
---- ipython~/setup.py	2008-01-09 14:03:27.000000000 +0100
-+++ ipython/setup.py	2008-01-09 14:05:50.000000000 +0100
-@@ -134,10 +134,8 @@
- 
- datafiles = [('data', docdirbase, docfiles),
-              ('data', pjoin(docdirbase, 'examples'),examfiles),
--             ('data', pjoin(docdirbase, 'manual'),manfiles),
-              ('data', manpagebase, manpages),
-              ('lib', 'IPython/UserConfig', cfgfiles),
--             ('data',pjoin(docdirbase, 'extensions'),igridhelpfiles),
-              ]
- 
- if 'setuptools' in sys.modules:


