diff -Naur ubuntu/zsi-2.1~a1/debian/changelog debian/zsi-2.1~a1/debian/changelog --- ubuntu/zsi-2.1~a1/debian/changelog 2009-02-08 12:16:04.000000000 +0100 +++ debian/zsi-2.1~a1/debian/changelog 2009-02-08 10:58:30.000000000 +0100 @@ -1,36 +1,51 @@ -zsi (2.1~a1-1ubuntu1~ppa2) jaunty; urgency=low +zsi (2.1~a1-2) unstable; urgency=medium - * Merge from Debian unstable (LP: #237674) - * New upstream release - * Disabled import-oldxml.dpatch (Not required?) - - -- Savvas Radevic Sun, 08 Feb 2009 11:12:25 +0100 - -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 + [ Emilio Pozuelo Monfort ] + * debian/rules: + - Build with the default Python interpreter first, as distutils is + copying wsdl2py built with a non-default Python version, which has + pythonX.Y in its shebang and thus makes the package depend on a + non-default interpreter. + Also, build it with python instead of pythonX.Y for the default + interpreter, so that /usr/bin/wsdl2py has a standard shebang and + the package just depends on python. + Closes: #502453. - * Revert last change, explicitely add the directory in sys.path, - where the old _xmlplus module can be found. LP: #199014. + -- Bernd Zeimetz Tue, 21 Oct 2008 20:41:16 +0200 - -- Matthias Klose Tue, 01 Apr 2008 14:04:12 +0000 +zsi (2.1~a1-1) unstable; urgency=low -zsi (2.0-2ubuntu1) hardy; urgency=low + [ Bernd Zeimetz ] + * New upstream version + * debian/watch: Updating file to handle pre-release versions correctly. + * debian/control: + - Adding Homepage field, removing pseudo-field from description + - Rename XS-Vcs-* fields to Vcs-* (dpkg supports them now) + - Removing cdbs from Build-Depends, moving python-support to + Build-Depends-Indep + - Updating my email address. + - Bumping Standards-Version to 3.7.3. + - Fixing a minor spelling error: s/python/Python/ + - Adding Provides: ${python:Provides} to allow smooth upgrades and + backports. + * debian/rules: + - Replacing cdbs by a 'normal' file. + - Chmod 644 for an example cgi script. + * debian/patches: + - Updating bogus-shebang-remove.dpatch to fit the current version. + * debian/*.doc-base.*: + - Updating to fit into the new categories. + * debian/source.lintian-overrides: + - Dropping file as requested by lintian. - * Drop dependency on python-xml. LP: #199014. + [ Sandro Tosi ] + * debian/control + - uniforming Vcs-Browser field + * debian/copyright + - updated upstream author email and indented with 4 spaces + - general rewrite - -- Matthias Klose Fri, 21 Mar 2008 16:21:29 +0000 + -- Bernd Zeimetz Tue, 22 Apr 2008 11:15:44 +0200 zsi (2.0-2) unstable; urgency=low diff -Naur ubuntu/zsi-2.1~a1/debian/control debian/zsi-2.1~a1/debian/control --- ubuntu/zsi-2.1~a1/debian/control 2009-02-08 12:15:22.000000000 +0100 +++ debian/zsi-2.1~a1/debian/control 2009-02-08 10:58:30.000000000 +0100 @@ -1,25 +1,18 @@ Source: zsi Section: python Priority: optional -Maintainer: Ubuntu MOTU Developers -XSBC-Original-Maintainer: Debian Python Modules Team -Uploaders: Tristan Seligmann , - Bernd Zeimetz , - Stefano Zacchiroli -Build-Depends: cdbs, - debhelper (>= 7), - python-all, - python-support (>= 0.4), - dpatch, - python-xml +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/ Vcs-Svn: svn://svn.debian.org/python-modules/packages/zsi/trunk/ -Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/zsi/trunk/ -Standards-Version: 3.8.0 +Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/zsi/trunk/?op=log +Standards-Version: 3.7.3 Package: python-zsi Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, python-xml +Depends: python-xml, ${python:Depends}, ${misc:Depends} 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 -Naur ubuntu/zsi-2.1~a1/debian/patches/import-oldxml.dpatch debian/zsi-2.1~a1/debian/patches/import-oldxml.dpatch --- ubuntu/zsi-2.1~a1/debian/patches/import-oldxml.dpatch 2009-02-08 11:12:24.000000000 +0100 +++ debian/zsi-2.1~a1/debian/patches/import-oldxml.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,99 +0,0 @@ -#! /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 diff -Naur ubuntu/zsi-2.1~a1/debian/pycompat debian/zsi-2.1~a1/debian/pycompat --- ubuntu/zsi-2.1~a1/debian/pycompat 2009-02-08 12:06:47.000000000 +0100 +++ debian/zsi-2.1~a1/debian/pycompat 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -2 diff -Naur ubuntu/zsi-2.1~a1/debian/python-zsi.doc-base.guide debian/zsi-2.1~a1/debian/python-zsi.doc-base.guide --- ubuntu/zsi-2.1~a1/debian/python-zsi.doc-base.guide 2009-02-08 11:28:44.000000000 +0100 +++ debian/zsi-2.1~a1/debian/python-zsi.doc-base.guide 2009-02-08 10:58:30.000000000 +0100 @@ -16,7 +16,7 @@ WSDL document, and generally describe SOAP and XML Schema data types. For a low-level treatment of typecodes, and a description of SOAP-based processing see the ZSI manual. -Section: Apps/Programming/Python +Section: Programming/Python Format: PDF Files: /usr/share/doc/python-zsi/guide.pdf.gz diff -Naur ubuntu/zsi-2.1~a1/debian/python-zsi.doc-base.zsi debian/zsi-2.1~a1/debian/python-zsi.doc-base.zsi --- ubuntu/zsi-2.1~a1/debian/python-zsi.doc-base.zsi 2009-02-08 11:28:17.000000000 +0100 +++ debian/zsi-2.1~a1/debian/python-zsi.doc-base.zsi 2009-02-08 10:58:30.000000000 +0100 @@ -11,7 +11,7 @@ framework; a more complete solution is the responsibility of the application using ZSI. As usage patterns emerge, and common application frameworks are more understood, this may change. -Section: Apps/Programming/Python +Section: Programming/Python Format: PDF Files: /usr/share/doc/python-zsi/zsi.pdf.gz diff -Naur ubuntu/zsi-2.1~a1/debian/rules debian/zsi-2.1~a1/debian/rules --- ubuntu/zsi-2.1~a1/debian/rules 2009-02-08 11:43:16.000000000 +0100 +++ debian/zsi-2.1~a1/debian/rules 2009-02-08 10:58:30.000000000 +0100 @@ -1,16 +1,88 @@ #!/usr/bin/make -f -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © Tristan Seligmann -# See debian/copyright for details. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 PKGNAME:=python-zsi + PYDEFAULTVER:=$(shell pyversions -d) PYVERS:=$(shell pyversions -r) PYVERS:=python $(filter-out $(PYDEFAULTVER), $(PYVERS)) -DEB_PYTHON_SYSTEM = pysupport -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/dpatch.mk -include /usr/share/cdbs/1/class/python-distutils.mk +include /usr/share/dpatch/dpatch.make + +build: patch build-stamp +build-stamp: + dh_testdir + + set -e; \ + for py in $(PYVERS); do \ + $$py setup.py build; \ + done + +#disabled for now, tests fail +ifeq (a,b) +ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) + set -e ;\ + cd test ;\ + for py in $(PYVERS); do \ + PYTHONPATH=$(CURDIR)/build/lib $$py test_zsi.py; \ + done + cd wsdl2py;\ + for py in $(PYVERS); do \ + PYTHONPATH=$(CURDIR)/build/lib $$py runTests.py local ;\ + done +endif +endif + touch $@ + +clean: clean-patched unpatch +clean-patched: patch-stamp + dh_testdir + dh_testroot + rm -f install-stamp build-stamp + -for py in $(PYVERS); do \ + $$py setup.py clean; \ + done + find . -name \*.pyc | xargs rm -f + rm -rf build + dh_clean + +install: install-stamp +install-stamp: + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + set -e; \ + for py in $(PYVERS); do \ + $$py setup.py install --root=$(CURDIR)/debian/$(PKGNAME); \ + done + + dh_installdocs -A + dh_installexamples + find $(CURDIR)/debian/$(PKGNAME) -name .cvsignore -print0 | xargs -0 rm -f + chmod 644 $(CURDIR)/debian/$(PKGNAME)/usr/share/doc/python-zsi/examples/server/receive_request/simple/CGI/cgi.py + touch install-stamp + +binary-arch: build install +# We have nothing to do by default. + +binary-indep: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installman + dh_compress -X.py + dh_fixperms + dh_pysupport + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install \ + clean-patched patch unpatch