[Python-modules-commits] [python-werkzeug] 05/07: 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 c4812ef9fcb40688a7d77e7042163f66df13e8d1
Merge: 9ea0bc2 df03a8c
Author: Ondřej Nový <onovy at debian.org>
Date:   Thu Sep 8 20:04:08 2016 +0200

    merge patched into master

 .travis.yml                                          |  6 +++---
 AUTHORS                                              |  2 ++
 CHANGES                                              | 16 +++++++++++++++-
 debian/.git-dpm                                      |  6 +++---
 ...-copies-of-object.inv-for-building-document.patch |  2 +-
 debian/patches/drop_ubuntu_font.patch                |  2 +-
 tests/contrib/test_wrappers.py                       | 10 ++++++++++
 tests/test_datastructures.py                         |  9 +++++++++
 tests/test_http.py                                   |  9 +++++++++
 tests/test_test.py                                   |  1 +
 tests/test_wrappers.py                               | 20 ++++++++++++++------
 werkzeug/__init__.py                                 |  2 +-
 werkzeug/contrib/wrappers.py                         |  2 +-
 werkzeug/datastructures.py                           |  6 +++++-
 werkzeug/debug/tbtools.py                            |  2 +-
 werkzeug/http.py                                     |  3 +--
 werkzeug/test.py                                     |  4 ++--
 17 files changed, 79 insertions(+), 23 deletions(-)

diff --cc debian/.git-dpm
index cf4efde,0000000..fba28c0
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
- e5ee65d2f4999de8d9c7481983dfc40bcd1ea90c
- e5ee65d2f4999de8d9c7481983dfc40bcd1ea90c
- 7e274781319973d4190701c37d48aca05a44d61d
++df03a8cc321ef56204b87125beb9bf21d0015cc6
++df03a8cc321ef56204b87125beb9bf21d0015cc6
++e2b21c202c14d81967c2ccb8b4ce5e63d61406b8
 +e2b21c202c14d81967c2ccb8b4ce5e63d61406b8
 +python-werkzeug_0.11.11+dfsg1.orig.tar.gz
 +3dd7a6091744adb8e2fb1ae8ba4dd8eb5007372e
 +1086362
 +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 425c606,0000000..d7fcdf9
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 e5ee65d2f4999de8d9c7481983dfc40bcd1ea90c Mon Sep 17 00:00:00 2001
++From df03a8cc321ef56204b87125beb9bf21d0015cc6 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 e2d4e0d..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://www.sqlalchemy.org/docs/05': None
 ++    'py': ('/usr/share/doc/python-doc/html', None),
 + }
diff --cc debian/patches/drop_ubuntu_font.patch
index d4a9619,0000000..33f2d82
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 8b5661e94696030b7ff471f3a7829738908dbb04 Mon Sep 17 00:00:00 2001
++From 8b6bd9ff93e580e08462c498d3da927cd6b8ced2 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 8833d01..6340a49 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