diff -pruN 1.4.1-1/debian/changelog 1.4.1-1ubuntu1/debian/changelog --- 1.4.1-1/debian/changelog 2022-05-06 11:41:21.000000000 +0000 +++ 1.4.1-1ubuntu1/debian/changelog 2022-08-25 19:35:26.000000000 +0000 @@ -1,3 +1,19 @@ +python-pecan (1.4.1-1ubuntu1) kinetic; urgency=low + + * Merge from Debian unstable, LP: #1987701. Remaining changes: + - d/p/no-intersphinx.patch: Dropped, but Debian still has it. + - d/p/remove-broken-test.patch: Dropped, but Debian still has it. + - d/gbp.conf: Retain for gbp and pristine-tar config. + - d/watch: Update based on move to https://github.com/pecan/pecan. + - d/control: Align (Build-)Depends with upstream. + - drop wrong pre/postrm scripts that handle pecan as an alternative when + it no longer is. + * Dropped changes, included upstream: + - debian/patches/fix-tests-on-python-3.10.patch: Pull in upstream patch + to fix build tests on python3.10 + + -- Nick Rosbrook Thu, 25 Aug 2022 15:35:26 -0400 + python-pecan (1.4.1-1) unstable; urgency=medium * New upstream release: @@ -11,6 +27,26 @@ python-pecan (1.4.1-1) unstable; urgency -- Thomas Goirand Fri, 06 May 2022 13:41:21 +0200 +python-pecan (1.3.3-4ubuntu2) jammy; urgency=medium + + * debian/patches/fix-tests-on-python-3.10.patch: Pull in upstream patch to + fix build tests on python3.10 (LP: #1965132). + + -- Nick Rosbrook Fri, 18 Mar 2022 15:41:54 -0400 + +python-pecan (1.3.3-4ubuntu1) jammy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/p/no-intersphinx.patch: Dropped. No longer needed. + - d/p/remove-broken-test.patch: Dropped. Fixed upstream. + - d/gbp.conf: Retain for gbp and pristine-tar config. + - d/watch: Update based on move to https://github.com/pecan/pecan. + - d/control: Align (Build-)Depends with upstream. + - drop wrong pre/postrm scripts that handle pecan as an alternative when + it no longer is. + + -- Steve Langasek Mon, 15 Nov 2021 09:04:08 -0800 + python-pecan (1.3.3-4) unstable; urgency=medium * Ran wrap-and-sort -bastk. @@ -21,6 +57,22 @@ python-pecan (1.3.3-4) unstable; urgency -- Thomas Goirand Wed, 27 Oct 2021 10:33:42 +0200 +python-pecan (1.3.3-3ubuntu1) focal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/p/no-intersphinx.patch: Dropped. No longer needed. + - d/p/remove-broken-test.patch: Dropped. Fixed upstream. + - d/gbp.conf: Retain for gbp and pristine-tar config. + - d/watch: Update based on move to https://github.com/pecan/pecan. + - d/control: Align (Build-)Depends with upstream. + - drop wrong pre/postrm scripts that handle pecan as an alternative when + it no longer is. + * Dropped changes, included in Debian: + - d/control: Enable autopkgtest-pkg-python testsuite. + - Drop python2 support. + + -- Steve Langasek Sat, 15 Feb 2020 17:01:42 -0800 + python-pecan (1.3.3-3) unstable; urgency=medium * Fixed installing alternatives (Close: #947313). @@ -48,6 +100,25 @@ python-pecan (1.3.3-1) experimental; urg -- Thomas Goirand Mon, 23 Sep 2019 17:24:13 +0200 +python-pecan (1.3.3-0ubuntu2) eoan; urgency=medium + + * Drop python2 support. + + -- Steve Langasek Thu, 12 Sep 2019 21:24:38 -0700 + +python-pecan (1.3.3-0ubuntu1) eoan; urgency=medium + + * Merge from Debian experimental. Remaining changes: + - d/control: Enable autopkgtest-pkg-python testsuite. + - d/p/no-intersphinx.patch: Dropped. No longer needed. + - d/p/remove-broken-test.patch: Dropped. Fixed upstream. + - d/gbp.conf: Retain for gbp and pristine-tar config. + - d/watch: Update based on move to https://github.com/pecan/pecan. + * New upstream release for OpenStack Train. + * d/control: Align (Build-)Depends with upstream. + + -- Corey Bryant Sun, 09 Jun 2019 21:10:40 -0400 + python-pecan (1.3.2-2) unstable; urgency=medium * Uploading to unstable. @@ -67,6 +138,18 @@ python-pecan (1.3.2-1) experimental; urg -- Thomas Goirand Fri, 24 Aug 2018 09:28:21 +0200 +python-pecan (1.3.2-0ubuntu1) cosmic; urgency=medium + + * d/gbp.conf: Update gbp configuration file. + * d/control: Update Vcs-* links and maintainers. + * d/watch: Update based on move to https://github.com/pecan/pecan. + * New upstream release. + * d/control: Align (Build-)Depends with upstream. + * d/p/no-intersphinx.patch: Dropped. No longer needed. + * d/p/remove-broken-test.patch: Dropped. Fixed upstream. + + -- Corey Bryant Wed, 08 Aug 2018 20:39:05 -0400 + python-pecan (1.2.1-2) unstable; urgency=medium * Team upload. @@ -201,3 +284,4 @@ python-pecan (0.2.2-1) experimental; urg * Initial release (Closes: #704760). -- Thomas Goirand Thu, 13 Dec 2012 06:31:35 +0000 + diff -pruN 1.4.1-1/debian/control 1.4.1-1ubuntu1/debian/control --- 1.4.1-1/debian/control 2022-05-06 11:41:21.000000000 +0000 +++ 1.4.1-1ubuntu1/debian/control 2022-05-06 15:47:02.000000000 +0000 @@ -1,7 +1,8 @@ Source: python-pecan Section: python Priority: optional -Maintainer: Debian OpenStack +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian OpenStack Uploaders: Thomas Goirand , Build-Depends: @@ -17,8 +18,8 @@ Build-Depends-Indep: python3-gunicorn, python3-jinja2, python3-kajiki, - python3-logutils, - python3-mako, + python3-logutils (>= 0.3), + python3-mako (>= 0.4.0), python3-markupsafe, python3-mock, python3-pytest, @@ -28,11 +29,11 @@ Build-Depends-Indep: python3-sqlalchemy, python3-unittest2, python3-virtualenv, - python3-webob, - python3-webtest, + python3-webob (>= 1:1.2dev), + python3-webtest (>= 1.3.1), Standards-Version: 4.1.1 -Vcs-Browser: https://salsa.debian.org/openstack-team/python/python-pecan -Vcs-Git: https://salsa.debian.org/openstack-team/python/python-pecan.git +Vcs-Browser: https://git.launchpad.net/~ubuntu-server-dev/ubuntu/+source/python-pecan +Vcs-Git: https://git.launchpad.net/~ubuntu-server-dev/ubuntu/+source/python-pecan Homepage: https://pypi.python.org/pypi/pecan Testsuite: autopkgtest-pkg-python @@ -59,14 +60,14 @@ Description: WSGI object-dispatching web Package: python3-pecan Architecture: all Depends: - python3-logutils, - python3-mako, + python3-logutils (>= 0.3), + python3-mako (>= 0.4.0), python3-markupsafe, python3-simplegeneric, python3-singledispatch, python3-six, - python3-webob, - python3-webtest, + python3-webob (>= 1:1.2dev), + python3-webtest (>= 1.3.1), ${misc:Depends}, ${python3:Depends}, Suggests: diff -pruN 1.4.1-1/debian/gbp.conf 1.4.1-1ubuntu1/debian/gbp.conf --- 1.4.1-1/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ 1.4.1-1ubuntu1/debian/gbp.conf 2020-02-16 01:01:42.000000000 +0000 @@ -0,0 +1,7 @@ +[DEFAULT] +debian-branch = master +upstream-tag = %(version)s +pristine-tar = True + +[buildpackage] +export-dir = ../build-area diff -pruN 1.4.1-1/debian/patches/no-intersphinx.patch 1.4.1-1ubuntu1/debian/patches/no-intersphinx.patch --- 1.4.1-1/debian/patches/no-intersphinx.patch 2022-05-06 11:41:21.000000000 +0000 +++ 1.4.1-1ubuntu1/debian/patches/no-intersphinx.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -Description: No intersphinx -Author: Thomas Goirand -Forwarded: not-needed -Last-Update: 2014-07-28 - ---- python-pecan-0.6.1.orig/docs/source/conf.py -+++ python-pecan-0.6.1/docs/source/conf.py -@@ -28,7 +28,7 @@ import os - - # Add any Sphinx extension module names here, as strings. They can be - # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. --extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx'] -+extensions = ['sphinx.ext.autodoc'] - - intersphinx_mapping = { - 'python': ('http://docs.python.org', None), diff -pruN 1.4.1-1/debian/patches/remove-broken-test.patch 1.4.1-1ubuntu1/debian/patches/remove-broken-test.patch --- 1.4.1-1/debian/patches/remove-broken-test.patch 2022-05-06 11:41:21.000000000 +0000 +++ 1.4.1-1ubuntu1/debian/patches/remove-broken-test.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -Description: Remove broken test - This test is failing only in Python 3.5 and 3.6. - . - This test is failing, while in fact the framework is doing exactly what - it should: raise an error. So the test is obviously wrong. -Author: Thomas Goirand -Forwarded: https://github.com/pecan/pecan/issues/94 -Last-Update: 2018-08-24 - -Index: python-pecan/pecan/tests/test_conf.py -=================================================================== ---- python-pecan.orig/pecan/tests/test_conf.py -+++ python-pecan/pecan/tests/test_conf.py -@@ -158,22 +158,6 @@ class TestConf(PecanTestCase): - f.name - ) - -- def test_config_with_non_package_relative_import(self): -- from pecan import configuration -- with tempfile.NamedTemporaryFile('wb', suffix='.py') as f: -- f.write(b_('\n'.join(['from . import variables']))) -- f.flush() -- configuration.Config({}) -- -- try: -- configuration.conf_from_file(f.name) -- except (ValueError, SystemError, ImportError) as e: -- assert 'relative import' in str(e) -- else: -- raise AssertionError( -- "A relative import-related error should have been raised" -- ) -- - def test_config_with_bad_import(self): - from pecan import configuration - path = ('bad', 'importerror.py') diff -pruN 1.4.1-1/debian/patches/series 1.4.1-1ubuntu1/debian/patches/series --- 1.4.1-1/debian/patches/series 2022-05-06 11:41:21.000000000 +0000 +++ 1.4.1-1ubuntu1/debian/patches/series 2022-08-25 19:35:26.000000000 +0000 @@ -1,3 +1 @@ -no-intersphinx.patch -remove-broken-test.patch disable-failing-tests.patch diff -pruN 1.4.1-1/debian/python3-pecan.postrm 1.4.1-1ubuntu1/debian/python3-pecan.postrm --- 1.4.1-1/debian/python3-pecan.postrm 2022-05-06 11:41:21.000000000 +0000 +++ 1.4.1-1ubuntu1/debian/python3-pecan.postrm 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "remove" ] || [ "$1" = "disappear" ] ; then - update-alternatives --remove pecan /usr/bin/python3-pecan - update-alternatives --remove gunicorn_pecan /usr/bin/python3-gunicorn_pecan -fi - -#DEBHELPER# - -exit 0 diff -pruN 1.4.1-1/debian/python3-pecan.prerm 1.4.1-1ubuntu1/debian/python3-pecan.prerm --- 1.4.1-1/debian/python3-pecan.prerm 2022-05-06 11:41:21.000000000 +0000 +++ 1.4.1-1ubuntu1/debian/python3-pecan.prerm 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "remove" ] ; then - update-alternatives --remove pecan /usr/bin/python3-pecan - update-alternatives --remove gunicorn_pecan /usr/bin/python3-gunicorn_pecan -fi - -#DEBHELPER# - -exit 0 diff -pruN 1.4.1-1/debian/watch 1.4.1-1ubuntu1/debian/watch --- 1.4.1-1/debian/watch 2022-05-06 11:41:21.000000000 +0000 +++ 1.4.1-1ubuntu1/debian/watch 2022-05-06 15:47:02.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -https://github.com/stackforge/pecan/tags .*/(\d[\d\.]+)\.tar\.gz +https://github.com/pecan/pecan/tags .*/(\d[\d\.]+)\.tar\.gz