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

[Ondřej Nový]

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

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

commit c0db05357648ae1c306ddc6509a56df77493318d
Merge: 11894d5 8b5661e
Author: Ondřej Nový <novy at ondrej.org>
Date:   Wed May 25 22:33:38 2016 +0200

    merge patched into master

 CHANGES                               | 10 +++++++++
 CONTRIBUTING.rst                      |  4 ++++
 debian/.git-dpm                       |  6 +++---
 debian/patches/drop_ubuntu_font.patch |  2 +-
 tests/test_formparser.py              |  3 ++-
 tests/test_wsgi.py                    | 15 ++++++++++++++
 werkzeug/__init__.py                  |  2 +-
 werkzeug/debug/__init__.py            |  7 +++++--
 werkzeug/filesystem.py                |  2 +-
 werkzeug/formparser.py                |  5 +++--
 werkzeug/wsgi.py                      | 39 +++++++++++++++++++++++++++++++++--
 11 files changed, 82 insertions(+), 13 deletions(-)

diff --cc debian/.git-dpm
index bf4a029,0000000..7866278
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
- 8d81a77e2700129548d236e0d43cd399b52822d9
- 8d81a77e2700129548d236e0d43cd399b52822d9
- f888071666bddf458ff403c23cb41a508d74b44d
++8b5661e94696030b7ff471f3a7829738908dbb04
++8b5661e94696030b7ff471f3a7829738908dbb04
++7e274781319973d4190701c37d48aca05a44d61d
 +7e274781319973d4190701c37d48aca05a44d61d
 +python-werkzeug_0.11.10+dfsg1.orig.tar.gz
 +9c96dfdb374e89f1d1e9d1fa0666498def69a699
 +1086483
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/drop_ubuntu_font.patch
index 508ea6a,0000000..d4a9619
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 8d81a77e2700129548d236e0d43cd399b52822d9 Mon Sep 17 00:00:00 2001
++From 8b5661e94696030b7ff471f3a7829738908dbb04 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