diff -pruN 2.0.1-1/debian/changelog 2.0.1-1ubuntu1/debian/changelog --- 2.0.1-1/debian/changelog 2021-12-04 17:49:38.000000000 +0000 +++ 2.0.1-1ubuntu1/debian/changelog 2021-12-10 23:20:35.000000000 +0000 @@ -1,3 +1,11 @@ +python-formencode (2.0.1-1ubuntu1) jammy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/p/fix-tld-regex.diff: Drop overly aggressive TLD regex, since admins + frequently define their own. LP: #1569077 + + -- Steve Langasek Fri, 10 Dec 2021 15:20:35 -0800 + python-formencode (2.0.1-1) unstable; urgency=low [ Neil Muller ] @@ -15,6 +23,14 @@ python-formencode (2.0.1-1) unstable; ur -- Neil Muller Sat, 04 Dec 2021 17:49:38 +0000 +python-formencode (2.0.0-2ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/p/fix-tld-regex.diff: Drop overly aggressive TLD regex, since admins + frequently define their own. LP: #1569077 + + -- Steve Langasek Thu, 28 Jan 2021 14:21:14 -0800 + python-formencode (2.0.0-2) unstable; urgency=low [ Neil Muller ] @@ -29,6 +45,14 @@ python-formencode (2.0.0-2) unstable; ur -- Piotr Ożarowski Thu, 07 Jan 2021 10:52:01 +0100 +python-formencode (2.0.0-1ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/p/fix-tld-regex.diff: Drop overly aggressive TLD regex, since admins + frequently define their own. LP: #1569077 + + -- Steve Langasek Wed, 06 Jan 2021 17:49:16 -0800 + python-formencode (2.0.0-1) unstable; urgency=low [ Ondřej Nový ] @@ -57,6 +81,22 @@ python-formencode (2.0.0-1) unstable; ur -- Neil Muller Wed, 16 Dec 2020 10:26:37 +0200 +python-formencode (1.3.1-1ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/p/fix-tld-regex.diff: Drop overly aggressive TLD regex, since admins + frequently define their own. LP: #1569077 + * Dropped changes, no longer needed: + - d/python-formencode.examples: Dropped as the current Ubuntu package + doesn't have the upstream examples/ directory. + - d/p/*: Handle CRLF differences in patches as the Ubuntu package's + upstream source contains CRLFs. + - d/p/ubuntu-disable-tests.diff: Disable some tests to allow formencode + to build. + - d/watch: Update to use pypi.debian.net. + + -- Steve Langasek Sun, 25 Oct 2020 00:24:55 -0700 + python-formencode (1.3.1-1) unstable; urgency=medium [ Neil Muller ] @@ -74,6 +114,24 @@ python-formencode (1.3.1-1) unstable; ur -- Neil Muller Sat, 22 Aug 2020 17:50:09 +0200 +python-formencode (1.3.0-6ubuntu1) groovy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/p/fix-tld-regex.diff: Drop overly aggressive TLD regex, since admins + frequently define their own. LP: #1569077 + - d/p/ubuntu-disable-tests.diff: Disable some tests to allow formencode + to build. + - d/p/*: Handle CRLF differences in patches as the Ubuntu package's + upstream source contains CRLFs. + - d/watch: Update to use pypi.debian.net. + - d/python-formencode.examples: Dropped as the current Ubuntu package + doesn't have the upstream examples/ directory. + * Dropped changes, included in Debian: + - Disable tests that use python-pycountry. + - Remove python-pycountry from Build-Depends (Closes: #944034). + + -- Steve Langasek Thu, 07 May 2020 17:15:45 -0700 + python-formencode (1.3.0-6) unstable; urgency=medium * Team upload. @@ -112,6 +170,35 @@ python-formencode (1.3.0-4) unstable; ur -- Stuart Prescott Sun, 01 Dec 2019 12:04:05 +1100 +python-formencode (1.3.0-3ubuntu3) focal; urgency=medium + + [ Stuart Prescott ] + * Disable tests that use python-pycountry. + * Remove python-pycountry from Build-Depends (Closes: #944034). + + -- Corey Bryant Fri, 10 Jan 2020 14:09:34 -0500 + +python-formencode (1.3.0-3ubuntu2) focal; urgency=medium + + * No-change rebuild to generate dependencies on python2. + + -- Matthias Klose Tue, 17 Dec 2019 13:59:04 +0100 + +python-formencode (1.3.0-3ubuntu1) eoan; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - d/p/fix-tld-regex.diff: Drop overly aggressive TLD regex, since admins + frequently define their own. LP: #1569077 + - d/p/ubuntu-disable-tests.diff: Disable some tests to allow formencode + to build. + - d/p/*: Handle CRLF differences in patches as the Ubuntu package's + upstream source contains CRLFs. + - d/python-formencode.examples: Dropped as the current Ubuntu package + doesn't have the upstream examples/ directory. + - d/watch: Update to use pypi.debian.net. + + -- Corey Bryant Tue, 23 Apr 2019 16:00:12 -0400 + python-formencode (1.3.0-3) unstable; urgency=medium [ Chris Lamb ] @@ -171,6 +258,42 @@ python-formencode (1.3.0-1) unstable; ur -- Neil Muller Fri, 17 Jun 2016 22:47:57 +0000 +python-formencode (1.3.0-0ubuntu5) xenial; urgency=medium + + * Restore dropped rule. + + -- LaMont Jones Wed, 20 Apr 2016 10:08:39 -0600 + +python-formencode (1.3.0-0ubuntu4) xenial; urgency=medium + + * Properly deliver formencode-i18n files. LP:# 1569035 + + -- LaMont Jones Wed, 20 Apr 2016 09:44:29 -0600 + +python-formencode (1.3.0-0ubuntu3) xenial; urgency=medium + + * Drop overly aggressive TLD regex, since admins frequently define their + own. LP: #1569077 + + -- LaMont Jones Mon, 11 Apr 2016 17:14:17 -0600 + +python-formencode (1.3.0-0ubuntu2) xenial; urgency=medium + + * debian/control: Depends on python-dnspython instead of python-dns. + The code requires python-dnspython and not python-dns. + + -- Andres Rodriguez Thu, 18 Feb 2016 09:11:02 -0500 + +python-formencode (1.3.0-0ubuntu1) xenial; urgency=medium + + * New upstream release + * Build with python3 + * debian/watch: update. + * debian/patches/ubuntu-disable-tests.diff: Disable some tests to allow + formencode to build + + -- Andres Rodriguez Fri, 06 Nov 2015 18:00:32 +0000 + python-formencode (1.2.6-2) unstable; urgency=medium * Team upload @@ -414,10 +537,10 @@ python-formencode (0.2.3dev-0) unstable; -- Robert J. Tanner Sat, 12 Nov 2005 11:48:11 -0600 - python-formencode (0.2.2-0) unstable; urgency=low * Initial Release * ITP: python-formencode (Closes: #338382) -- Robert J. Tanner Wed, 9 Nov 2005 17:26:09 -0600 + diff -pruN 2.0.1-1/debian/control 2.0.1-1ubuntu1/debian/control --- 2.0.1-1/debian/control 2021-12-04 08:12:33.000000000 +0000 +++ 2.0.1-1ubuntu1/debian/control 2021-12-04 22:40:28.000000000 +0000 @@ -11,7 +11,8 @@ Build-Depends: python3-six, python3-setuptools, python3-setuptools-scm, -Maintainer: Fabio Tranchitella +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Fabio Tranchitella Uploaders: Debian Python Team , Piotr Ożarowski , diff -pruN 2.0.1-1/debian/patches/fix-tld-regex.diff 2.0.1-1ubuntu1/debian/patches/fix-tld-regex.diff --- 2.0.1-1/debian/patches/fix-tld-regex.diff 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.1-1ubuntu1/debian/patches/fix-tld-regex.diff 2020-10-25 07:24:55.000000000 +0000 @@ -0,0 +1,11 @@ +--- a/formencode/validators.py ++++ b/formencode/validators.py +@@ -1450,7 +1450,7 @@ + (?: # ip or domain + (?P(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))| + (?P[a-z0-9][a-z0-9\-]{,62}\.)* # subdomain +- (?P[a-z]{2,63}|xn--[a-z0-9\-]{2,59}) # top level domain ++ (?P[a-z]{2,63}|xn--[a-z0-9\-]{2,59}|[a-z0-9]{1,63}|[a-z0-9][a-z0-9\-]{,61}[a-z0-9]) # top level domain + ) + (?::[0-9]{1,5})? # port + # files/delims/etc diff -pruN 2.0.1-1/debian/patches/series 2.0.1-1ubuntu1/debian/patches/series --- 2.0.1-1/debian/patches/series 2021-11-06 09:02:40.000000000 +0000 +++ 2.0.1-1ubuntu1/debian/patches/series 2021-12-04 22:40:28.000000000 +0000 @@ -3,3 +3,4 @@ 0003-Remove-tests-from-test_email-that-require-dns.patch 0004-Drop-setuptools_scm_git_archive-requirement-from-set.patch 0005-Remove-LICENSE.txt-from-the-list-of-installed-files.patch +fix-tld-regex.diff