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

[bzed at users.alioth.debian.org]

    Date: Wednesday, January 9, 2008 @ 13:08:21
  Author: bzed
Revision: 4340

* debian/patches/05_no_manual_dir.dpatch:
  - Adding patch to stop setup.py from creating empty directories.

Added:
  packages/ipython/trunk/debian/patches/05_no_manual_dir.dpatch
Modified:
  packages/ipython/trunk/debian/changelog
  packages/ipython/trunk/debian/patches/04_remove_shebang.dpatch
  packages/ipython/trunk/debian/rules

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2008-01-09 12:59:06 UTC (rev 4339)
+++ packages/ipython/trunk/debian/changelog	2008-01-09 13:08:21 UTC (rev 4340)
@@ -16,6 +16,8 @@
     - Adding file.
   * debian/patches/{03_ipy_gnuglobal,04_remove_shebang}.dpatch:
     - Updating patches.
+  * debian/patches/05_no_manual_dir.dpatch:
+    - Adding patch to stop setup.py from creating empty directories.
 
   [ Sandro Tosi ]
   * debian/control

Modified: packages/ipython/trunk/debian/patches/04_remove_shebang.dpatch
===================================================================
--- packages/ipython/trunk/debian/patches/04_remove_shebang.dpatch	2008-01-09 12:59:06 UTC (rev 4339)
+++ packages/ipython/trunk/debian/patches/04_remove_shebang.dpatch	2008-01-09 13:08:21 UTC (rev 4340)
@@ -6,15 +6,15 @@
 @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 13:57:05.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 13:57:04.000000000 +0100
-+++ ipython/IPython/Extensions/ipy_gnuglobal.py	2008-01-09 13:57:35.000000000 +0100
+--- 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
 @@ -1,5 +1,3 @@
 -#!/usr/bin/env python
 -
@@ -23,7 +23,7 @@
  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 13:58:19.000000000 +0100
++++ ipython/IPython/Extensions/ipy_render.py	2008-01-09 14:00:25.000000000 +0100
 @@ -1,4 +1,3 @@
 -#!/usr/bin/env python
  
@@ -36,3 +36,11 @@
 -    
 \ 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
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ 
+ import IPython.ipapi
+ ip = IPython.ipapi.get()

Added: packages/ipython/trunk/debian/patches/05_no_manual_dir.dpatch
===================================================================
--- packages/ipython/trunk/debian/patches/05_no_manual_dir.dpatch	                        (rev 0)
+++ packages/ipython/trunk/debian/patches/05_no_manual_dir.dpatch	2008-01-09 13:08:21 UTC (rev 4340)
@@ -0,0 +1,20 @@
+#! /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:


Property changes on: packages/ipython/trunk/debian/patches/05_no_manual_dir.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/ipython/trunk/debian/rules
===================================================================
--- packages/ipython/trunk/debian/rules	2008-01-09 12:59:06 UTC (rev 4339)
+++ packages/ipython/trunk/debian/rules	2008-01-09 13:08:21 UTC (rev 4340)
@@ -23,6 +23,7 @@
 	chmod +x $(CURDIR)/debian/ipython/usr/share/python-support/ipython/IPython/upgrade_dir.py
 	chmod +x $(CURDIR)/debian/ipython/usr/share/python-support/ipython/IPython/Extensions/pickleshare.py
 	chmod +x $(CURDIR)/debian/ipython/usr/share/python-support/ipython/IPython/irunner.py
+	chmod +x $(CURDIR)/debian/ipython/usr/share/python-support/ipython/IPython/external/mglob.py
 
 get-orig-source:
 	uscan --verbose --rename --repack