diff -Nru python-webob-1.2.3/debian/changelog python-webob-1.2.3/debian/changelog --- python-webob-1.2.3/debian/changelog 2013-05-30 18:00:22.000000000 +0000 +++ python-webob-1.2.3/debian/changelog 2013-07-25 08:00:35.000000000 +0000 @@ -1,8 +1,45 @@ -python-webob (1.2.3-0ubuntu2~cloud0) precise-havana; urgency=low +python-webob (1.2.3-2ubuntu1~cloud0) precise-havana; urgency=low * New update for the Ubuntu Cloud Archive. - -- Chuck Short Thu, 30 May 2013 13:00:22 -0500 + -- James Page Thu, 25 Jul 2013 09:00:35 +0100 + +python-webob (1.2.3-2ubuntu1) saucy; urgency=low + + [ Yolanda Robla ] + * Merge from Debian unstable (LP: #1201323). Remaining changes: + + Added python 3 support: + - debian/control + - debian/rules + + debian/patches/fix_test_headers2.patch: Test should pass independently + of the order of result. + + debian/watch: Keep PyPI download. + + [ Barry Warsaw ] + * Added DEP-3 headers to fix_test_headers2.patch. + + -- Barry Warsaw Tue, 23 Jul 2013 17:55:26 -0400 + +python-webob (1.2.3-2) unstable; urgency=low + + [ Jakub Wilk ] + * Use canonical URIs for Vcs-* fields. + + [ Thomas Goirand ] + * Uploading to unstable. + + -- Thomas Goirand Sat, 11 May 2013 07:53:25 +0000 + +python-webob (1.2.3-1) experimental; urgency=low + + * Team upload. + * New upstream release. + * Uploading to experimental. + * Increase compat level and debhelper to 9. + * Added missing --install-layout=deb when calling setup.py. + * Bumped standard-version to 3.9.4 (no change). + + -- Thomas Goirand Thu, 14 Feb 2013 18:01:49 +0000 python-webob (1.2.3-0ubuntu2) saucy; urgency=low diff -Nru python-webob-1.2.3/debian/compat python-webob-1.2.3/debian/compat --- python-webob-1.2.3/debian/compat 2011-01-15 21:22:58.000000000 +0000 +++ python-webob-1.2.3/debian/compat 2013-07-23 21:46:58.000000000 +0000 @@ -1 +1 @@ -5 +9 diff -Nru python-webob-1.2.3/debian/control python-webob-1.2.3/debian/control --- python-webob-1.2.3/debian/control 2013-05-23 19:05:11.000000000 +0000 +++ python-webob-1.2.3/debian/control 2013-07-23 22:04:45.000000000 +0000 @@ -5,13 +5,15 @@ XSBC-Original-Maintainer: Debian Python Modules Team Uploaders: Christoph Haas , Piotr Ożarowski , Soren Hansen -Build-Depends: debhelper (>= 5), quilt -Build-Depends-Indep: python-all (>= 2.6.6-3), python-setuptools (>= 0.6b3-1~), python-nose, - python3-all (>= 3.1.2-7~), python3-setuptools, python3-nose +Build-Depends: debhelper (>= 9), quilt +Build-Depends-Indep: python-all (>= 2.6.6-3), + python-setuptools (>= 0.6b3-1~), python-sphinx (>= 1.0.7+dfsg-1~), + python-webtest, python-nose, python3-all (>= 3.1.2-7~), + python3-setuptools, python3-nose Standards-Version: 3.9.4 Homepage: http://webob.org/ -Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-webob/trunk/ -Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-webob/trunk/ +Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-webob/trunk/ +Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-webob/trunk/ X-Python-Version: >= 2.5 X-Python3-Version: >= 3.0 diff -Nru python-webob-1.2.3/debian/copyright python-webob-1.2.3/debian/copyright --- python-webob-1.2.3/debian/copyright 2011-01-15 21:22:58.000000000 +0000 +++ python-webob-1.2.3/debian/copyright 2013-07-23 21:46:58.000000000 +0000 @@ -1,39 +1,34 @@ -This package was originally debianized by Christoph Haas on -Sun, 20 Apr 2008 10:42:43 +0200 and is maintained by the Debian Python Modules -Team. - -It was downloaded from http://pythonpaste.org/webob/ - -Upstream Author: - - Ian Bicking - -Copyright: - - Copyright © 2008 Ian Bicking - -License (MIT): - - Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation - files (the "Software"), to deal in the Software without - restriction, including without limitation the rights to use, - copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following - conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. - -The Debian packaging is also licensed under the terms of the above MIT license. - +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: webob +Upstream-Contact: Ian Bicking +Source: https://github.com/Pylons/webob + +Files: debian/* +Copyright: (c) 2008, Christoph Haas + (c) 2008-2011, Piotr Ożarowski + (c) 2009, Chris Lamb + (c) 2013, Thomas Goirand +License: MIT + +Files: * +Copyright: 2008-2012, Ian Bicking +License: MIT + +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. diff -Nru python-webob-1.2.3/debian/patches/fix_test_headers2.patch python-webob-1.2.3/debian/patches/fix_test_headers2.patch --- python-webob-1.2.3/debian/patches/fix_test_headers2.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-webob-1.2.3/debian/patches/fix_test_headers2.patch 2013-07-23 21:46:43.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Test should pass independently of the order of result. +Author: Yolanda Robla +Forwarded: no + +@@ -0,0 +1,12 @@ +--- a/tests/test_request.py 2013-07-15 09:25:02.000000000 +0000 ++++ b/tests/test_request.py 2013-07-15 09:34:34.962943891 +0000 +@@ -2662,7 +2662,7 @@ + self.assertTrue(i in r.headers and + 'HTTP_'+i.upper().replace('-', '_') in r.environ) + r.headers = {'Server':'Apache'} +- self.assertEqual(list(r.environ.keys()), ['a', 'HTTP_SERVER']) ++ self.assertEqual(set(list(r.environ.keys())), set(['a', 'HTTP_SERVER'])) + + def test_host_url(self): + # Request has a read only property host_url that combines several diff -Nru python-webob-1.2.3/debian/patches/series python-webob-1.2.3/debian/patches/series --- python-webob-1.2.3/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ python-webob-1.2.3/debian/patches/series 2013-07-23 21:46:43.000000000 +0000 @@ -0,0 +1 @@ +fix_test_headers2.patch diff -Nru python-webob-1.2.3/debian/rules python-webob-1.2.3/debian/rules --- python-webob-1.2.3/debian/rules 2013-05-23 19:14:36.000000000 +0000 +++ python-webob-1.2.3/debian/rules 2013-07-23 21:48:49.000000000 +0000 @@ -29,12 +29,14 @@ python setup.py install \ --no-compile --install-layout=deb \ --single-version-externally-managed \ - --root $(CURDIR)/debian/$(package) + --root $(CURDIR)/debian/$(package) \ + --install-layout=deb # python3 python3 setup.py install \ --no-compile --install-layout=deb \ --single-version-externally-managed \ - --root $(CURDIR)/debian/python3-webob + --root $(CURDIR)/debian/python3-webob \ + --install-layout=deb ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) python setup.py test --quiet