[Python-modules-commits] [routes] 05/08: merge patched into master

[Piotr Ożarowski]

This is an automated email from the git hooks/post-receive script.

piotr pushed a commit to branch master
in repository routes.

commit 83faff385ec15fd799a199d696cce978cf479c3a
Merge: b2bc97d 65520a4
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Thu Jul 20 20:34:46 2017 +0200

    merge patched into master

 CHANGELOG.rst                                              |  7 +++++++
 PKG-INFO                                                   | 11 +++++++++--
 Routes.egg-info/PKG-INFO                                   | 11 +++++++++--
 Routes.egg-info/requires.txt                               |  2 +-
 debian/.git-dpm                                            |  6 +++---
 debian/patches/drop_changes_from_description.patch         |  4 ++--
 debian/patches/remove_missing_todo_include_from_docs.patch |  2 +-
 docs/conf.py                                               |  6 +++---
 routes/mapper.py                                           |  2 +-
 routes/middleware.py                                       |  4 ++--
 routes/route.py                                            |  1 -
 setup.cfg                                                  |  7 +++++++
 setup.py                                                   |  4 ++--
 13 files changed, 47 insertions(+), 20 deletions(-)

diff --cc debian/.git-dpm
index be459e4,0000000..2f7b86a
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 53a83305397bee01c4dc4e48ad18703cde007353
- 53a83305397bee01c4dc4e48ad18703cde007353
- 2e615fd7f67621c075ac7429bc998f0498a2b6a0
++65520a4394e347dcc3c0a1e392a7b8eb29609fbe
++65520a4394e347dcc3c0a1e392a7b8eb29609fbe
++c7c6c1dfaf242d990aebdabc58586d54e5b444b9
 +c7c6c1dfaf242d990aebdabc58586d54e5b444b9
 +routes_2.4.1.orig.tar.gz
 +7d0f75875aa571399c488b435e4cf738507a2f49
 +182403
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/drop_changes_from_description.patch
index b031e2e,0000000..3da702c
mode 100644,000000..100644
--- a/debian/patches/drop_changes_from_description.patch
+++ b/debian/patches/drop_changes_from_description.patch
@@@ -1,34 -1,0 +1,34 @@@
- From 53a83305397bee01c4dc4e48ad18703cde007353 Mon Sep 17 00:00:00 2001
++From 65520a4394e347dcc3c0a1e392a7b8eb29609fbe Mon Sep 17 00:00:00 2001
 +From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
 +Date: Thu, 8 Oct 2015 13:43:58 -0700
 +Subject: drop_changes_from_description
 +
 +Patch-Name: drop_changes_from_description.patch
 +---
 + setup.py | 6 +++---
 + 1 file changed, 3 insertions(+), 3 deletions(-)
 +
 +diff --git a/setup.py b/setup.py
- index 742c645..81d2877 100644
++index 4255f6d..b389db9 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -9,8 +9,8 @@ from setuptools import setup, find_packages
 + here = os.path.abspath(os.path.dirname(__file__))
 + with io.open(os.path.join(here, 'README.rst'), encoding='utf8') as f:
 +     README = f.read()
 +-with io.open(os.path.join(here, 'CHANGELOG.rst'), encoding='utf8') as f:
 +-    CHANGES = f.read()
 ++#with io.open(os.path.join(here, 'CHANGELOG.rst'), encoding='utf8') as f:
 ++#    CHANGES = f.read()
 + PY3 = sys.version_info[0] == 3
 + 
 + extra_options = {
 +@@ -26,7 +26,7 @@ if PY3:
 + setup(name="Routes",
 +       version=__version__,
 +       description='Routing Recognition and Generation Tools',
 +-      long_description=README + '\n\n' + CHANGES,
 ++      long_description=README,
 +       classifiers=["Development Status :: 5 - Production/Stable",
 +                    "Intended Audience :: Developers",
 +                    "License :: OSI Approved :: MIT License",
diff --cc debian/patches/remove_missing_todo_include_from_docs.patch
index 82c6f4d,0000000..6b2fdb0
mode 100644,000000..100644
--- a/debian/patches/remove_missing_todo_include_from_docs.patch
+++ b/debian/patches/remove_missing_todo_include_from_docs.patch
@@@ -1,22 -1,0 +1,22 @@@
- From bb81c383f2a8062443238b7e6cb401085ae13658 Mon Sep 17 00:00:00 2001
++From 2b24c1004344e8236217e27c5a7c35d3c83cc164 Mon Sep 17 00:00:00 2001
 +From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
 +Date: Thu, 8 Oct 2015 13:43:57 -0700
 +Subject: remove_missing_todo_include_from_docs
 +
 +Patch-Name: remove_missing_todo_include_from_docs.patch
 +---
 + docs/index.rst | 1 -
 + 1 file changed, 1 deletion(-)
 +
 +diff --git a/docs/index.rst b/docs/index.rst
 +index 972c6fe..feabc11 100644
 +--- a/docs/index.rst
 ++++ b/docs/index.rst
 +@@ -65,7 +65,6 @@ Documentation
 +    restful
 +    uni_redirect_rest
 +    changes
 +-   todo
 + 
 + .. toctree::
 +    :maxdepth: 1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/routes.git