[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 f1c665d68dfe426839da40b06c0aa4dbf72784f8
Merge: bba13cf b08d650
Author: Ondřej Nový <onovy at debian.org>
Date:   Mon Jan 2 11:03:52 2017 +0100

    merge patched into master

 .travis.yml                                            |  2 ++
 CHANGES                                                | 15 +++++++++++++++
 debian/.git-dpm                                        |  6 +++---
 ...al-copies-of-object.inv-for-building-document.patch |  2 +-
 debian/patches/drop_ubuntu_font.patch                  |  2 +-
 tox.ini                                                |  2 +-
 werkzeug/__init__.py                                   |  2 +-
 werkzeug/serving.py                                    | 18 ++++++++++++++++--
 8 files changed, 40 insertions(+), 9 deletions(-)

diff --cc debian/.git-dpm
index 2c29160,0000000..ab4d6ef
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
- c7489c5d0f0b722089060a16d7f422c6c7881385
- c7489c5d0f0b722089060a16d7f422c6c7881385
- a596b49313fe62d3b1d7d1cf64e76bb14db0339a
++b08d6505830e166da703715d450782a5d627917b
++b08d6505830e166da703715d450782a5d627917b
++a369104063069f8c093872f8b6ce642a5e15cd41
 +a369104063069f8c093872f8b6ce642a5e15cd41
 +python-werkzeug_0.11.15+dfsg1.orig.tar.gz
 +d4da324a4f0d02b4021db662b8ba443e1e57a604
 +1086740
 +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 4e3d953,0000000..2d5938f
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 c7489c5d0f0b722089060a16d7f422c6c7881385 Mon Sep 17 00:00:00 2001
++From b08d6505830e166da703715d450782a5d627917b 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 8dccc25,0000000..2d9eb72
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 2b7ea1727d883e960d80be78acc98d0933b16b40 Mon Sep 17 00:00:00 2001
++From 7b623e008862cd73652bd2d6b0787ada3dd64cfa 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