diff -pruN 3.12.6-2/debian/changelog 3.12.6-2ubuntu1/debian/changelog --- 3.12.6-2/debian/changelog 2011-11-08 12:25:07.000000000 +0000 +++ 3.12.6-2ubuntu1/debian/changelog 2011-11-14 20:21:37.000000000 +0000 @@ -1,3 +1,13 @@ +zope.publisher (3.12.6-2ubuntu1) precise; urgency=low + + * Merge with Debian. Remaining changes: + - src/zope/publisher/tests/test_xmlrpc.py, + src/zope/publisher/tests/test_paste.py: Fix ZPL version, committed + upstream. + * debian/patches/zpl-2.0: Store license fix as a patch. + + -- Gediminas Paulauskas Mon, 14 Nov 2011 22:13:57 +0200 + zope.publisher (3.12.6-2) unstable; urgency=low * Team upload. @@ -23,6 +33,15 @@ zope.publisher (3.12.6-1) unstable; urge -- Arnaud Fontaine Tue, 18 Oct 2011 23:01:16 +0900 +zope.publisher (3.12.6-0ubuntu1) natty; urgency=low + + * New upstream release. + * src/zope/publisher/tests/test_xmlrpc.py, + src/zope/publisher/tests/test_paste.py: Fix ZPL version, committed + upstream. + + -- Gediminas Paulauskas Wed, 23 Mar 2011 19:41:44 +0200 + zope.publisher (3.12.4-0ubuntu1) maverick; urgency=low * New upstream release. diff -pruN 3.12.6-2/debian/control 3.12.6-2ubuntu1/debian/control --- 3.12.6-2/debian/control 2011-11-08 12:26:00.000000000 +0000 +++ 3.12.6-2ubuntu1/debian/control 2011-11-14 20:08:38.000000000 +0000 @@ -1,7 +1,8 @@ Source: zope.publisher Section: zope Priority: extra -Maintainer: Debian/Ubuntu Zope Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian/Ubuntu Zope Team Uploaders: Brian Sutherland , Fabio Tranchitella Build-Depends: debhelper (>= 7), diff -pruN 3.12.6-2/debian/patches/series 3.12.6-2ubuntu1/debian/patches/series --- 3.12.6-2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 3.12.6-2ubuntu1/debian/patches/series 2011-11-14 20:15:55.000000000 +0000 @@ -0,0 +1 @@ +zpl-2.0 diff -pruN 3.12.6-2/debian/patches/zpl-2.0 3.12.6-2ubuntu1/debian/patches/zpl-2.0 --- 3.12.6-2/debian/patches/zpl-2.0 1970-01-01 00:00:00.000000000 +0000 +++ 3.12.6-2ubuntu1/debian/patches/zpl-2.0 2011-11-14 20:19:09.000000000 +0000 @@ -0,0 +1,31 @@ +Description: Fix ZPL version in some source files + Version is ZPL 2.1 but some file headers refer to an older version. +Author: Gediminas Paulauskas +Forwarded: http://svn.zope.org/zope.publisher/trunk/?rev=121101&view=rev + +Index: zope.publisher/src/zope/publisher/tests/test_paste.py +=================================================================== +--- zope.publisher.orig/src/zope/publisher/tests/test_paste.py ++++ zope.publisher/src/zope/publisher/tests/test_paste.py +@@ -4,7 +4,7 @@ + # All Rights Reserved. + # + # This software is subject to the provisions of the Zope Public License, +-# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution. ++# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution. + # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED + # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS +Index: zope.publisher/src/zope/publisher/tests/test_xmlrpc.py +=================================================================== +--- zope.publisher.orig/src/zope/publisher/tests/test_xmlrpc.py ++++ zope.publisher/src/zope/publisher/tests/test_xmlrpc.py +@@ -4,7 +4,7 @@ + # All Rights Reserved. + # + # This software is subject to the provisions of the Zope Public License, +-# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution. ++# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution. + # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED + # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS diff -pruN 3.12.6-2/.pc/applied-patches 3.12.6-2ubuntu1/.pc/applied-patches --- 3.12.6-2/.pc/applied-patches 1970-01-01 00:00:00.000000000 +0000 +++ 3.12.6-2ubuntu1/.pc/applied-patches 2011-11-15 05:21:08.000000000 +0000 @@ -0,0 +1 @@ +zpl-2.0 diff -pruN 3.12.6-2/.pc/zpl-2.0/src/zope/publisher/tests/test_paste.py 3.12.6-2ubuntu1/.pc/zpl-2.0/src/zope/publisher/tests/test_paste.py --- 3.12.6-2/.pc/zpl-2.0/src/zope/publisher/tests/test_paste.py 1970-01-01 00:00:00.000000000 +0000 +++ 3.12.6-2ubuntu1/.pc/zpl-2.0/src/zope/publisher/tests/test_paste.py 2010-12-17 12:38:23.000000000 +0000 @@ -0,0 +1,69 @@ +############################################################################## +# +# Copyright (c) Zope Corporation and Contributors. +# All Rights Reserved. +# +# This software is subject to the provisions of the Zope Public License, +# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution. +# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED +# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS +# FOR A PARTICULAR PURPOSE. +# +############################################################################## +import re, unittest +import doctest +from zope.testing import renormalizing + +class SamplePublication: + + def __init__(self, global_config, **options): + self.args = global_config, options + + def beforeTraversal(self, request): + pass + + def getApplication(self, request): + return self + + def callTraversalHooks(self, request, ob): + pass + + def traverseName(self, request, ob, name): + return self + + def afterTraversal(self, request, ob): + pass + + def callObject(self, request, ob): + return (u'Thanks for your request:
\n' + u'

%s

\n
\n%s\n
\n' + u'

Publication arguments:

\n' + u'Globals: %r
\nOptions: %r\n' + % (request.__class__.__name__, request, + self.args[0], self.args[1]) + ) + + def afterCall(self, request, ob): + pass + + def handleException(self, object, request, exc_info, retry_allowed=1): + return 'Ouch!' + + def endRequest(self, request, ob): + pass + + def getDefaultTraversal(self, request, ob): + return self, () + +def test_suite(): + return unittest.TestSuite(( + doctest.DocFileSuite( + '../paste.txt', + optionflags=doctest.ELLIPSIS | doctest.NORMALIZE_WHITESPACE, + ), + )) + +if __name__ == '__main__': + unittest.main(defaultTest='test_suite') + diff -pruN 3.12.6-2/.pc/zpl-2.0/src/zope/publisher/tests/test_xmlrpc.py 3.12.6-2ubuntu1/.pc/zpl-2.0/src/zope/publisher/tests/test_xmlrpc.py --- 3.12.6-2/.pc/zpl-2.0/src/zope/publisher/tests/test_xmlrpc.py 1970-01-01 00:00:00.000000000 +0000 +++ 3.12.6-2ubuntu1/.pc/zpl-2.0/src/zope/publisher/tests/test_xmlrpc.py 2010-12-17 12:38:23.000000000 +0000 @@ -0,0 +1,47 @@ +############################################################################## +# +# Copyright (c) 2004 Zope Foundation and Contributors. +# All Rights Reserved. +# +# This software is subject to the provisions of the Zope Public License, +# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution. +# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED +# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS +# FOR A PARTICULAR PURPOSE. +# +############################################################################## +"""Testing the XML-RPC Publisher code. +""" +import doctest +import xmlrpclib +import zope.component.testing +from zope.publisher import xmlrpc +from zope.security.checker import defineChecker, Checker, CheckerPublic + +def setUp(test): + zope.component.testing.setUp(test) + zope.component.provideAdapter(xmlrpc.ListPreMarshaller) + zope.component.provideAdapter(xmlrpc.TuplePreMarshaller) + zope.component.provideAdapter(xmlrpc.BinaryPreMarshaller) + zope.component.provideAdapter(xmlrpc.FaultPreMarshaller) + zope.component.provideAdapter(xmlrpc.DateTimePreMarshaller) + zope.component.provideAdapter(xmlrpc.PythonDateTimePreMarshaller) + zope.component.provideAdapter(xmlrpc.DictPreMarshaller) + + defineChecker(xmlrpclib.Binary, + Checker({'data':CheckerPublic, + 'decode':CheckerPublic, + 'encode': CheckerPublic}, {})) + defineChecker(xmlrpclib.Fault, + Checker({'faultCode':CheckerPublic, + 'faultString': CheckerPublic}, {})) + defineChecker(xmlrpclib.DateTime, + Checker({'value':CheckerPublic}, {})) + +def test_suite(): + return doctest.DocFileSuite( + "xmlrpc.txt", package="zope.publisher", + setUp=setUp, tearDown=zope.component.testing.tearDown, + optionflags=doctest.ELLIPSIS + ) diff -pruN 3.12.6-2/src/zope/publisher/tests/test_paste.py 3.12.6-2ubuntu1/src/zope/publisher/tests/test_paste.py --- 3.12.6-2/src/zope/publisher/tests/test_paste.py 2010-12-17 12:38:23.000000000 +0000 +++ 3.12.6-2ubuntu1/src/zope/publisher/tests/test_paste.py 2011-11-15 05:21:08.000000000 +0000 @@ -4,7 +4,7 @@ # All Rights Reserved. # # This software is subject to the provisions of the Zope Public License, -# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution. +# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution. # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS diff -pruN 3.12.6-2/src/zope/publisher/tests/test_xmlrpc.py 3.12.6-2ubuntu1/src/zope/publisher/tests/test_xmlrpc.py --- 3.12.6-2/src/zope/publisher/tests/test_xmlrpc.py 2010-12-17 12:38:23.000000000 +0000 +++ 3.12.6-2ubuntu1/src/zope/publisher/tests/test_xmlrpc.py 2011-11-15 05:21:08.000000000 +0000 @@ -4,7 +4,7 @@ # All Rights Reserved. # # This software is subject to the provisions of the Zope Public License, -# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution. +# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution. # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS