[Python-modules-commits] [python-django-extensions] 03/07: merge patched into master

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository python-django-extensions.

commit 778ffcec90970c1bc929b887871d9f73590a4d3f
Merge: 156653c d38fb66
Author: Michael Fladischer <fladi at debian.org>
Date:   Thu May 19 11:09:40 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...e-URLs-to-use-local-copy-of-images-to-pre.patch | 49 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/runserver_plus.rst                            |  8 ++--
 4 files changed, 56 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index 57d53a3,0000000..91a9c7f
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
- 536a0fdc20712f3a606d7e609c237ff985222e66
- 536a0fdc20712f3a606d7e609c237ff985222e66
++d38fb6627fe31e9b3412d6b93a3f2b4df4e765ca
++d38fb6627fe31e9b3412d6b93a3f2b4df4e765ca
 +cd6e080fa705fcd290cf62d0ea7a9c2823a4544d
 +cd6e080fa705fcd290cf62d0ea7a9c2823a4544d
 +python-django-extensions_1.6.7.orig.tar.gz
 +96acdbb2756dfb7be8f1faf94a67197ea38c5418
 +176128
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Change-image-URLs-to-use-local-copy-of-images-to-pre.patch
index 0000000,0000000..a5c78ec
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Change-image-URLs-to-use-local-copy-of-images-to-pre.patch
@@@ -1,0 -1,0 +1,49 @@@
++From d38fb6627fe31e9b3412d6b93a3f2b4df4e765ca Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <fladi at debian.org>
++Date: Thu, 19 May 2016 11:08:28 +0200
++Subject: Change image URLs to use local copy of images to prevent privacy
++ breach.
++
++---
++ docs/runserver_plus.rst | 8 ++++----
++ 1 file changed, 4 insertions(+), 4 deletions(-)
++
++diff --git a/docs/runserver_plus.rst b/docs/runserver_plus.rst
++index 98b1f47..f80ea5b 100644
++--- a/docs/runserver_plus.rst
+++++ b/docs/runserver_plus.rst
++@@ -43,14 +43,14 @@ Usage
++ Instead of the default Django traceback page, the Werkzeug traceback page 
++ will be shown when an exception occurs.
++ 
++-.. image:: https://f.cloud.github.com/assets/202559/1261027/2637f826-2c22-11e3-83c6-646acc87808b.png
+++.. image:: images/2637f826-2c22-11e3-83c6-646acc87808b.png
++     :alt: werkzeug-traceback
++ 
++ Along with the typical traceback information we have a couple of options. These
++ options appear when hovering over a particular traceback line.  Notice that
++ two buttons appear to the right:
++ 
++-.. image:: https://f.cloud.github.com/assets/202559/1261035/558ad0ee-2c22-11e3-8ddd-6678d84d77e7.png
+++.. image:: images/558ad0ee-2c22-11e3-8ddd-6678d84d77e7.png
++     :alt: werkzeug-options
++ 
++ The options are:
++@@ -61,7 +61,7 @@ View Source
++ 
++ This displays the source underneath the traceback:
++ 
++-.. image:: https://f.cloud.github.com/assets/202559/1261036/583c8c42-2c22-11e3-9eb9-5c16b8732512.png
+++.. image:: images/583c8c42-2c22-11e3-9eb9-5c16b8732512.png
++     :alt: werkzeug-source
++ 
++ Being able to view the source file is handy because it provides more
++@@ -78,7 +78,7 @@ Interactive Debugging Console
++ Clicking on this button opens up a new pane under the traceback line
++ you're on. This is the money shot:
++ 
++-.. image:: https://f.cloud.github.com/assets/202559/1261037/5d12eda6-2c22-11e3-802a-2639ff8813fa.png
+++.. image:: images/5d12eda6-2c22-11e3-802a-2639ff8813fa.png
++     :alt: werkzeug-debugger
++ 
++ An ajax based console appears in the pane and you can start debugging.
diff --cc debian/patches/series
index a5b8584,0000000..bceebc3
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-01-werkzeug-package.diff.patch
++0002-Change-image-URLs-to-use-local-copy-of-images-to-pre.patch

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