[Python-modules-commits] [python-werkzeug] 05/07: merge patched into master
Ondřej Nový
onovy at moszumanska.debian.org
Wed Dec 28 21:40:06 UTC 2016
This is an automated email from the git hooks/post-receive script.
onovy pushed a commit to branch master
in repository python-werkzeug.
commit 1c3bbd1e60b0dddc78c9d6cb3136b716434c5f5f
Merge: 8c8e52d c7489c5
Author: Ondřej Nový <onovy at debian.org>
Date: Wed Dec 28 22:35:28 2016 +0100
merge patched into master
CHANGES | 17 +++++++++++++++++
debian/.git-dpm | 6 +++---
...al-copies-of-object.inv-for-building-document.patch | 2 +-
debian/patches/drop_ubuntu_font.patch | 2 +-
setup.cfg | 2 +-
tests/test_datastructures.py | 18 ++++++++++++++++++
werkzeug/__init__.py | 2 +-
werkzeug/_reloader.py | 17 ++++++++++++++++-
werkzeug/datastructures.py | 11 ++++++++++-
werkzeug/test.py | 2 +-
10 files changed, 69 insertions(+), 10 deletions(-)
diff --cc debian/.git-dpm
index ad17ee2,0000000..97f9e07
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
- df03a8cc321ef56204b87125beb9bf21d0015cc6
- df03a8cc321ef56204b87125beb9bf21d0015cc6
- e2b21c202c14d81967c2ccb8b4ce5e63d61406b8
++c7489c5d0f0b722089060a16d7f422c6c7881385
++c7489c5d0f0b722089060a16d7f422c6c7881385
++a596b49313fe62d3b1d7d1cf64e76bb14db0339a
+a596b49313fe62d3b1d7d1cf64e76bb14db0339a
+python-werkzeug_0.11.13+dfsg1.orig.tar.gz
+3a6cd8af71d3fefc5a96c0f3205958679fcc8da0
+1086682
+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 d7fcdf9,0000000..4e3d953
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 df03a8cc321ef56204b87125beb9bf21d0015cc6 Mon Sep 17 00:00:00 2001
++From c7489c5d0f0b722089060a16d7f422c6c7881385 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 33f2d82,0000000..8dccc25
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 8b6bd9ff93e580e08462c498d3da927cd6b8ced2 Mon Sep 17 00:00:00 2001
++From 2b7ea1727d883e960d80be78acc98d0933b16b40 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
More information about the Python-modules-commits
mailing list