diff -u zsi-2.1~a1/debian/control zsi-2.1~a1/debian/control --- zsi-2.1~a1/debian/control +++ zsi-2.1~a1/debian/control @@ -1,18 +1,16 @@ Source: zsi Section: python Priority: optional -Maintainer: Debian Python Modules Team -Uploaders: Tristan Seligmann , Bernd Zeimetz , Stefano Zacchiroli -Build-Depends: debhelper (>= 5.0.37.1), python-all, dpatch -Build-Depends-Indep: python-support (>= 0.4) -Homepage: http://pywebsvcs.sourceforge.net/ +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian Python Modules Team +Uploaders: Tristan Seligmann , Bernd Zeimetz , Stefano Zacchiroli +Build-Depends: cdbs (>= 0.4.41), debhelper (>= 5.0.37.1), python (>= 2.3.5-7), python-support (>= 0.4), dpatch, python-xml Vcs-Svn: svn://svn.debian.org/python-modules/packages/zsi/trunk/ Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/zsi/trunk/?op=log -Standards-Version: 3.7.3 - +Standards-Version: 3.8.0.0 Package: python-zsi Architecture: all -Depends: python-xml, ${python:Depends}, ${misc:Depends} +Depends: ${python:Depends}, ${misc:Depends}, python-xml Conflicts: python2.3-zsi (<= 1.5.0-3), python2.4-zsi (<= 1.5.0-3) Replaces: python2.3-zsi (<= 1.5.0-3), python2.4-zsi (<= 1.5.0-3) Provides: ${python:Provides} diff -u zsi-2.1~a1/debian/changelog zsi-2.1~a1/debian/changelog --- zsi-2.1~a1/debian/changelog +++ zsi-2.1~a1/debian/changelog @@ -1,3 +1,18 @@ +zsi (2.1~a1-1ubuntu1) intrepid; urgency=low + * Merge from Debian unstable (LP: #237674). Remaining Ubuntu changes: + - debian/control: add python-xml to Build-Depends field + - Drop import-oldxml patch + * Bump Standards-Version to 3.8.0.0. + + -- Leo Iannacone Thu, 05 Jun 2008 18:12:31 +0200 + +zsi (2.1~a1-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - SUMMARISE HERE + + -- Ubuntu Merge-o-Matic Thu, 01 May 2008 04:49:20 +0100 + zsi (2.1~a1-1) unstable; urgency=low [ Bernd Zeimetz ] @@ -32,6 +47,32 @@ -- Bernd Zeimetz Tue, 22 Apr 2008 11:15:44 +0200 +zsi (2.0-2ubuntu4) hardy; urgency=low + + * Readd dependency on python-xml. LP: #199014. + + -- Matthias Klose Wed, 09 Apr 2008 15:25:46 +0000 + +zsi (2.0-2ubuntu3) hardy; urgency=low + + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Andrea Colangelo Wed, 02 Apr 2008 08:54:01 +0200 + +zsi (2.0-2ubuntu2) hardy; urgency=low + + * Revert last change, explicitely add the directory in sys.path, + where the old _xmlplus module can be found. LP: #199014. + + -- Matthias Klose Tue, 01 Apr 2008 14:04:12 +0000 + +zsi (2.0-2ubuntu1) hardy; urgency=low + + * Drop dependency on python-xml. LP: #199014. + + -- Matthias Klose Fri, 21 Mar 2008 16:21:29 +0000 + zsi (2.0-2) unstable; urgency=low * debian/pycompat: @@ -145,7 +186,7 @@ is never build from a package. Closes: bug#253062 -- Wichert Akkerman Sun, 20 Jun 2004 20:44:16 +0200 - + zsi (1.5.0-1) unstable; urgency=low * New upstream version @@ -188,0 +230 @@ + diff -u zsi-2.1~a1/debian/patches/00list zsi-2.1~a1/debian/patches/00list --- zsi-2.1~a1/debian/patches/00list +++ zsi-2.1~a1/debian/patches/00list @@ -2,0 +3 @@ +#import-oldxml only in patch2: unchanged: --- zsi-2.1~a1.orig/ZSI/wstools/Namespaces.py +++ zsi-2.1~a1/ZSI/wstools/Namespaces.py @@ -10,6 +10,8 @@ """ ident = "$Id: Namespaces.py 1160 2006-03-17 19:28:11Z boverhof $" +import sys +sys.path.append('/usr/lib/python%s/site-packages/oldxml' % sys.version[:3]) try: from xml.ns import SOAP, SCHEMA, WSDL, XMLNS, DSIG, ENCRYPTION DSIG.C14N = "http://www.w3.org/TR/2001/REC-xml-c14n-20010315" only in patch2: unchanged: --- zsi-2.1~a1.orig/ZSI/wstools/c14n.py +++ zsi-2.1~a1/ZSI/wstools/c14n.py @@ -47,6 +47,8 @@ http://www.w3.org/Consortium/Legal/copyright-software-19980720 ''' +import sys +sys.path.append('/usr/lib/python%s/site-packages/oldxml' % sys.version[:3]) import string from xml.dom import Node try: only in patch2: unchanged: --- zsi-2.1~a1.orig/ZSI/wstools/Utility.py +++ zsi-2.1~a1/ZSI/wstools/Utility.py @@ -15,6 +15,7 @@ ident = "$Id: Utility.py 1405 2007-07-10 20:25:44Z boverhof $" import sys, types, httplib, urllib, socket, weakref +sys.path.append('/usr/lib/python%s/site-packages/oldxml' % sys.version[:3]) from os.path import isfile from string import join, strip, split from UserDict import UserDict only in patch2: unchanged: --- zsi-2.1~a1.orig/ZSI/TC.py +++ zsi-2.1~a1/ZSI/TC.py @@ -3,6 +3,8 @@ '''General typecodes. ''' +import sys +sys.path.append('/usr/lib/python%s/site-packages/oldxml' % sys.version[:3]) from ZSI import _copyright, _children, _child_elements, \ _floattypes, _stringtypes, _seqtypes, _find_attr, _find_attrNS, _find_attrNodeNS, \ _find_arraytype, _find_default_namespace, _find_href, _find_encstyle, \ only in patch2: unchanged: --- zsi-2.1~a1.orig/ZSI/__init__.py +++ zsi-2.1~a1/ZSI/__init__.py @@ -144,6 +144,8 @@ ## ## Stuff imported from elsewhere. +import sys +sys.path.append('/usr/lib/python%s/site-packages/oldxml' % sys.version[:3]) from xml.dom import Node as _Node import types as _types only in patch2: unchanged: --- zsi-2.1~a1.orig/test/test_t4.py +++ zsi-2.1~a1/test/test_t4.py @@ -1,4 +1,6 @@ #!/usr/bin/env python +import sys +sys.path.append('/usr/lib/python%s/site-packages/oldxml' % sys.version[:3]) import unittest, sys from ZSI import * from ZSI import resolvers only in patch2: unchanged: --- zsi-2.1~a1.orig/test/test_t5.py +++ zsi-2.1~a1/test/test_t5.py @@ -1,4 +1,6 @@ #!/usr/bin/env python +import sys +sys.path.append('/usr/lib/python%s/site-packages/oldxml' % sys.version[:3]) import unittest, multifile, mimetools from ZSI import * from ZSI import resolvers only in patch2: unchanged: --- zsi-2.1~a1.orig/debian/patches/import-oldxml.dpatch +++ zsi-2.1~a1/debian/patches/import-oldxml.dpatch @@ -0,0 +1,99 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## import-oldxml.dpatch +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +--- ./test/test_t6.py~ 2006-10-18 00:53:19.000000000 +0200 ++++ ./test/test_t6.py 2008-04-01 16:10:54.000000000 +0200 +@@ -1,5 +1,6 @@ + #!/usr/bin/env python + import unittest, sys, multifile, mimetools, base64 ++sys.path.append('/usr/lib/python%s/site-packages/oldxml' % sys.version[:3]) + from xml.dom import Node + from xml.dom.ext.reader import PyExpat + from ZSI import * +--- ./test/test_t5.py~ 2003-07-20 06:49:14.000000000 +0200 ++++ ./test/test_t5.py 2008-04-01 16:11:10.000000000 +0200 +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import sys ++sys.path.append('/usr/lib/python%s/site-packages/oldxml' % sys.version[:3]) + import unittest, multifile, mimetools + from ZSI import * + from ZSI import resolvers +--- ./test/test_t4.py~ 2006-10-18 00:53:19.000000000 +0200 ++++ ./test/test_t4.py 2008-04-01 16:11:17.000000000 +0200 +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import sys ++sys.path.append('/usr/lib/python%s/site-packages/oldxml' % sys.version[:3]) + import unittest, sys + from ZSI import * + from ZSI import resolvers +--- ./ZSI/wstools/Utility.py~ 2006-11-07 01:47:23.000000000 +0100 ++++ ./ZSI/wstools/Utility.py 2008-04-01 16:08:57.000000000 +0200 +@@ -15,6 +15,7 @@ + ident = "$Id: Utility.py 1297 2006-11-07 00:47:23Z sanxiyn $" + + import sys, types, httplib, urllib, socket, weakref ++sys.path.append('/usr/lib/python%s/site-packages/oldxml' % sys.version[:3]) + from os.path import isfile + from string import join, strip, split + from UserDict import UserDict +--- ./ZSI/wstools/c14n.py~ 2006-03-31 01:47:16.000000000 +0200 ++++ ./ZSI/wstools/c14n.py 2008-04-01 16:09:29.000000000 +0200 +@@ -47,6 +47,8 @@ + http://www.w3.org/Consortium/Legal/copyright-software-19980720 + ''' + ++import sys ++sys.path.append('/usr/lib/python%s/site-packages/oldxml' % sys.version[:3]) + import string + from xml.dom import Node + try: +--- ./ZSI/wstools/Namespaces.py~ 2006-03-17 20:28:11.000000000 +0100 ++++ ./ZSI/wstools/Namespaces.py 2008-04-01 16:09:10.000000000 +0200 +@@ -10,6 +10,8 @@ + """ + + ident = "$Id: Namespaces.py 1160 2006-03-17 19:28:11Z boverhof $" ++import sys ++sys.path.append('/usr/lib/python%s/site-packages/oldxml' % sys.version[:3]) + try: + from xml.ns import SOAP, SCHEMA, WSDL, XMLNS, DSIG, ENCRYPTION + DSIG.C14N = "http://www.w3.org/TR/2001/REC-xml-c14n-20010315" +--- ./ZSI/TC.py~ 2007-01-30 20:04:09.000000000 +0100 ++++ ./ZSI/TC.py 2008-04-01 16:10:09.000000000 +0200 +@@ -3,6 +3,8 @@ + '''General typecodes. + ''' + ++import sys ++sys.path.append('/usr/lib/python%s/site-packages/oldxml' % sys.version[:3]) + from ZSI import _copyright, _children, _child_elements, \ + _floattypes, _stringtypes, _seqtypes, _find_attr, _find_attrNS, _find_attrNodeNS, \ + _find_arraytype, _find_default_namespace, _find_href, _find_encstyle, \ +--- ./ZSI/__init__.py~ 2006-10-20 00:31:07.000000000 +0200 ++++ ./ZSI/__init__.py 2008-04-01 16:10:40.000000000 +0200 +@@ -144,6 +144,8 @@ + + ## + ## Stuff imported from elsewhere. ++import sys ++sys.path.append('/usr/lib/python%s/site-packages/oldxml' % sys.version[:3]) + from xml.dom import Node as _Node + import types as _types + +--- ./ZSI/parse.py~ 2006-10-13 02:12:32.000000000 +0200 ++++ ./ZSI/parse.py 2008-04-01 16:10:28.000000000 +0200 +@@ -3,6 +3,8 @@ + '''SOAP messaging parsing. + ''' + ++import sys ++sys.path.append('/usr/lib/python%s/site-packages/oldxml' % sys.version[:3]) + from ZSI import _copyright, _children, _attrs, _child_elements, _stringtypes, \ + _backtrace, EvaluateException, ParseException, _valid_encoding, \ + _Node, _find_attr, _resolve_prefix