[Python-modules-commits] r7105 - in packages/python-soappy/trunk/debian (4 files)

bzed at users.alioth.debian.org bzed at users.alioth.debian.org
Tue Dec 16 13:36:56 UTC 2008 

    Date: Tuesday, December 16, 2008 @ 13:36:54
  Author: bzed
Revision: 7105

Restructuring the two patches to fix the problems with imports
of nested_scopes, that really closes: ##498928.

Modified:
  packages/python-soappy/trunk/debian/changelog
  packages/python-soappy/trunk/debian/patches/00list
  packages/python-soappy/trunk/debian/patches/rm_nested_scopes_import.dpatch
Deleted:
  packages/python-soappy/trunk/debian/patches/future_compat.dpatch

Modified: packages/python-soappy/trunk/debian/changelog
===================================================================
--- packages/python-soappy/trunk/debian/changelog	2008-12-13 14:24:24 UTC (rev 7104)
+++ packages/python-soappy/trunk/debian/changelog	2008-12-16 13:36:54 UTC (rev 7105)
@@ -1,3 +1,10 @@
+python-soappy (0.12.0-4) unstable; urgency=low
+
+  * Restructuring the two patches to fix the problems with imports
+    of nested_scopes, that really closes: ##498928.
+
+ -- Bernd Zeimetz <bzed at debian.org>  Sat, 29 Nov 2008 20:20:44 +0100
+
 python-soappy (0.12.0-3) unstable; urgency=high
 
   [ Serafeim Zanikolas ]

Modified: packages/python-soappy/trunk/debian/patches/00list
===================================================================
--- packages/python-soappy/trunk/debian/patches/00list	2008-12-13 14:24:24 UTC (rev 7104)
+++ packages/python-soappy/trunk/debian/patches/00list	2008-12-16 13:36:54 UTC (rev 7105)
@@ -1,5 +1,4 @@
 fpconst.dpatch
-future_compat.dpatch
 rm_bogus_shebang.dpatch
 fix_new_style_classes.dpatch
 rm_nested_scopes_import.dpatch

Deleted: packages/python-soappy/trunk/debian/patches/future_compat.dpatch
===================================================================
--- packages/python-soappy/trunk/debian/patches/future_compat.dpatch	2008-12-13 14:24:24 UTC (rev 7104)
+++ packages/python-soappy/trunk/debian/patches/future_compat.dpatch	2008-12-16 13:36:54 UTC (rev 7105)
@@ -1,75 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## future_compat.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: move "from __future__" lines up for Python 2.5 compatibility
-
- at DPATCH@
-diff -urNad trunk~/SOAPpy/Client.py trunk/SOAPpy/Client.py
---- trunk~/SOAPpy/Client.py	2005-02-21 21:27:09.000000000 +0100
-+++ trunk/SOAPpy/Client.py	2007-03-21 10:02:13.000000000 +0100
-@@ -40,11 +40,11 @@
- ################################################################################
- """
- 
-+from __future__ import nested_scopes
-+
- ident = '$Id: Client.py,v 1.27 2005/02/21 20:27:09 warnes Exp $'
- from version import __version__
- 
--from __future__ import nested_scopes
--
- #import xml.sax
- import urllib
- from types import *
-diff -urNad trunk~/SOAPpy/GSIServer.py trunk/SOAPpy/GSIServer.py
---- trunk~/SOAPpy/GSIServer.py	2005-02-15 17:32:22.000000000 +0100
-+++ trunk/SOAPpy/GSIServer.py	2007-03-21 10:02:26.000000000 +0100
-@@ -43,11 +43,11 @@
- ################################################################################
- """
- 
-+from __future__ import nested_scopes
-+
- ident = '$Id: GSIServer.py,v 1.5 2005/02/15 16:32:22 warnes Exp $'
- from version import __version__
- 
--from __future__ import nested_scopes
--
- #import xml.sax
- import re
- import socket
-diff -urNad trunk~/SOAPpy/Server.py trunk/SOAPpy/Server.py
---- trunk~/SOAPpy/Server.py	2005-02-15 17:32:22.000000000 +0100
-+++ trunk/SOAPpy/Server.py	2007-03-21 10:02:38.000000000 +0100
-@@ -40,11 +40,11 @@
- ################################################################################
- """
- 
-+from __future__ import nested_scopes
-+
- ident = '$Id: Server.py,v 1.21 2005/02/15 16:32:22 warnes Exp $'
- from version import __version__
- 
--from __future__ import nested_scopes
--
- #import xml.sax
- import re
- import socket
-diff -urNad trunk~/SOAPpy/Types.py trunk/SOAPpy/Types.py
---- trunk~/SOAPpy/Types.py	2005-02-22 05:29:43.000000000 +0100
-+++ trunk/SOAPpy/Types.py	2007-03-21 10:02:56.000000000 +0100
-@@ -33,11 +33,11 @@
- ################################################################################
- """
- 
-+from __future__ import nested_scopes
-+
- ident = '$Id: Types.py,v 1.19 2005/02/22 04:29:43 warnes Exp $'
- from version import __version__
- 
--from __future__ import nested_scopes
--
- import UserList
- import base64
- import cgi

Modified: packages/python-soappy/trunk/debian/patches/rm_nested_scopes_import.dpatch
===================================================================
--- packages/python-soappy/trunk/debian/patches/rm_nested_scopes_import.dpatch	2008-12-13 14:24:24 UTC (rev 7104)
+++ packages/python-soappy/trunk/debian/patches/rm_nested_scopes_import.dpatch	2008-12-16 13:36:54 UTC (rev 7105)
@@ -1,56 +1,67 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## rm_nested_scopes_import.dpatch by  <serzan at hellug.gr>
+## rm_nested_scopes_import.dpatch by Bernd Zeimetz <bzed at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove imports of nested_scopes (not required in Python 2.1
-## DP: onwards).
+## DP: No description.
 
 @DPATCH@
-diff -urNad python-soappy-0.12.0~/SOAPpy/Client.py python-soappy-0.12.0/SOAPpy/Client.py
---- python-soappy-0.12.0~/SOAPpy/Client.py	2008-10-03 21:24:45.000000000 +0100
-+++ python-soappy-0.12.0/SOAPpy/Client.py	2008-10-03 21:25:20.000000000 +0100
-@@ -40,8 +40,6 @@
- ################################################################################
- """
- 
--from __future__ import nested_scopes
--
+diff -urNad python-soappy~/SOAPpy/Client.py python-soappy/SOAPpy/Client.py
+--- python-soappy~/SOAPpy/Client.py	2005-02-21 21:27:09.000000000 +0100
++++ python-soappy/SOAPpy/Client.py	2008-12-16 12:08:24.000000000 +0100
+@@ -43,7 +43,7 @@
  ident = '$Id: Client.py,v 1.27 2005/02/21 20:27:09 warnes Exp $'
  from version import __version__
  
-diff -urNad python-soappy-0.12.0~/SOAPpy/GSIServer.py python-soappy-0.12.0/SOAPpy/GSIServer.py
---- python-soappy-0.12.0~/SOAPpy/GSIServer.py	2008-10-03 21:24:45.000000000 +0100
-+++ python-soappy-0.12.0/SOAPpy/GSIServer.py	2008-10-03 21:25:22.000000000 +0100
-@@ -43,8 +43,6 @@
- ################################################################################
- """
+-from __future__ import nested_scopes
++
  
--from __future__ import nested_scopes
--
+ #import xml.sax
+ import urllib
+diff -urNad python-soappy~/SOAPpy/GSIServer.py python-soappy/SOAPpy/GSIServer.py
+--- python-soappy~/SOAPpy/GSIServer.py	2005-02-15 17:32:22.000000000 +0100
++++ python-soappy/SOAPpy/GSIServer.py	2008-12-16 12:08:24.000000000 +0100
+@@ -46,7 +46,7 @@
  ident = '$Id: GSIServer.py,v 1.5 2005/02/15 16:32:22 warnes Exp $'
  from version import __version__
  
-diff -urNad python-soappy-0.12.0~/SOAPpy/Server.py python-soappy-0.12.0/SOAPpy/Server.py
---- python-soappy-0.12.0~/SOAPpy/Server.py	2008-10-03 21:24:45.000000000 +0100
-+++ python-soappy-0.12.0/SOAPpy/Server.py	2008-10-03 21:25:25.000000000 +0100
-@@ -40,8 +40,6 @@
+-from __future__ import nested_scopes
++
+ 
+ #import xml.sax
+ import re
+diff -urNad python-soappy~/SOAPpy/NS.py python-soappy/SOAPpy/NS.py
+--- python-soappy~/SOAPpy/NS.py	2005-02-15 17:32:22.000000000 +0100
++++ python-soappy/SOAPpy/NS.py	2008-12-16 12:08:24.000000000 +0100
+@@ -40,7 +40,7 @@
  ################################################################################
  """
  
 -from __future__ import nested_scopes
--
++
+ 
+ ident = '$Id: NS.py,v 1.4 2005/02/15 16:32:22 warnes Exp $'
+ from version import __version__
+diff -urNad python-soappy~/SOAPpy/Server.py python-soappy/SOAPpy/Server.py
+--- python-soappy~/SOAPpy/Server.py	2005-02-15 17:32:22.000000000 +0100
++++ python-soappy/SOAPpy/Server.py	2008-12-16 12:08:24.000000000 +0100
+@@ -43,7 +43,7 @@
  ident = '$Id: Server.py,v 1.21 2005/02/15 16:32:22 warnes Exp $'
  from version import __version__
  
-diff -urNad python-soappy-0.12.0~/SOAPpy/Types.py python-soappy-0.12.0/SOAPpy/Types.py
---- python-soappy-0.12.0~/SOAPpy/Types.py	2008-10-03 21:24:45.000000000 +0100
-+++ python-soappy-0.12.0/SOAPpy/Types.py	2008-10-03 21:25:28.000000000 +0100
-@@ -33,8 +33,6 @@
- ################################################################################
- """
+-from __future__ import nested_scopes
++
  
--from __future__ import nested_scopes
--
+ #import xml.sax
+ import re
+diff -urNad python-soappy~/SOAPpy/Types.py python-soappy/SOAPpy/Types.py
+--- python-soappy~/SOAPpy/Types.py	2005-02-22 05:29:43.000000000 +0100
++++ python-soappy/SOAPpy/Types.py	2008-12-16 12:08:24.000000000 +0100
+@@ -36,7 +36,7 @@
  ident = '$Id: Types.py,v 1.19 2005/02/22 04:29:43 warnes Exp $'
  from version import __version__
  
+-from __future__ import nested_scopes
++
+ 
+ import UserList
+ import base64

More information about the Python-modules-commits mailing list