[Python-modules-commits] [python-werkzeug] 05/06: merge patched into master

[Ondřej Nový]

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

onovy pushed a commit to branch master
in repository python-werkzeug.

commit ff26fdfd7d0dda7a449e7ad6aff3c39da8707ceb
Merge: 354ec64 170709a
Author: Ondřej Nový <onovy at debian.org>
Date:   Sat Jun 3 14:07:54 2017 +0200

    merge patched into master

 AUTHORS                                            |  1 +
 CHANGES                                            | 10 +++++++++
 debian/.git-dpm                                    |  6 +++---
 ...opies-of-object.inv-for-building-document.patch |  2 +-
 debian/patches/drop_ubuntu_font.patch              |  2 +-
 werkzeug/__init__.py                               |  2 +-
 werkzeug/datastructures.py                         |  2 +-
 werkzeug/security.py                               | 24 ++++++++++++++--------
 werkzeug/serving.py                                |  5 ++++-
 9 files changed, 37 insertions(+), 17 deletions(-)

diff --cc debian/.git-dpm
index cf88b69,0000000..3f8cabb
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
- 968f728ecc0d86f9146b697c6bc67a7b6a87e225
- 968f728ecc0d86f9146b697c6bc67a7b6a87e225
- 827d4435b27a2a55dc196b1957344ba1a15ac4f9
++170709a41bf8832191d7964da919ce95b898f5fa
++170709a41bf8832191d7964da919ce95b898f5fa
++b37322db34f064597f733e84bb5f57090957a41a
 +b37322db34f064597f733e84bb5f57090957a41a
 +python-werkzeug_0.12.2+dfsg1.orig.tar.gz
 +de8b469f5ba7c4e4d8f395f8b4e63ea8821228b0
 +1098161
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Use-local-copies-of-object.inv-for-building-document.patch
index 375d780,0000000..d38baa2
mode 100644,000000..100644
--- a/debian/patches/0002-Use-local-copies-of-object.inv-for-building-document.patch
+++ b/debian/patches/0002-Use-local-copies-of-object.inv-for-building-document.patch
@@@ -1,21 -1,0 +1,21 @@@
- From 968f728ecc0d86f9146b697c6bc67a7b6a87e225 Mon Sep 17 00:00:00 2001
++From 170709a41bf8832191d7964da919ce95b898f5fa Mon Sep 17 00:00:00 2001
 +From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy at debian.org>
 +Date: Mon, 11 Jul 2016 07:11:44 +0200
 +Subject: Use local copies of object.inv for building documentation
 +
 +---
 + docs/conf.py | 3 +--
 + 1 file changed, 1 insertion(+), 2 deletions(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
 +index 540ae20..cbbbbb6 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -209,6 +209,5 @@ latex_use_modindex = False
 + 
 + # Example configuration for intersphinx: refer to the Python standard library.
 + intersphinx_mapping = {
 +-    'http://docs.python.org/dev': None,
 +-    'http://docs.sqlalchemy.org/en/latest/': None
 ++    'py': ('/usr/share/doc/python-doc/html', None),
 + }
diff --cc debian/patches/drop_ubuntu_font.patch
index 663f29e,0000000..3b38fa5
mode 100644,000000..100644
--- a/debian/patches/drop_ubuntu_font.patch
+++ b/debian/patches/drop_ubuntu_font.patch
@@@ -1,25 -1,0 +1,25 @@@
- From f62f8be4f1b5bcf27e7a6621ce030054f2fd8c82 Mon Sep 17 00:00:00 2001
++From b3966565b90c1d0b00ed7d55f2cdf2780e7987d5 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:25:38 -0700
 +Subject: drop_ubuntu_font
 +
 +Patch-Name: drop_ubuntu_font.patch
 +---
 + werkzeug/debug/shared/style.css | 4 +---
 + 1 file changed, 1 insertion(+), 3 deletions(-)
 +
 +diff --git a/werkzeug/debug/shared/style.css b/werkzeug/debug/shared/style.css
 +index 2f4c5be..4e9fbe2 100644
 +--- a/werkzeug/debug/shared/style.css
 ++++ b/werkzeug/debug/shared/style.css
 +@@ -1,9 +1,7 @@
 + @font-face {
 +-  font-family: 'Ubuntu';
 ++  font-family: 'Ubuntu', 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva', 'Verdana';
 +   font-style: normal;
 +   font-weight: normal;
 +-  src: local('Ubuntu'), local('Ubuntu-Regular'),
 +-    url('?__debugger__=yes&cmd=resource&f=ubuntu.ttf') format('truetype');
 + }
 + 
 + body, input  { font-family: 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva',

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