[Python-modules-commits] [django-uwsgi] 08/10: 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 django-uwsgi.

commit 755d54dd2ffc975a8c4f61ceebaa24c57636d13d
Merge: 012b088 1b874da
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Mon Jul 17 09:28:44 2017 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...opies-of-screenshot-images-to-prevent-pri.patch | 33 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/screenshots.rst                               |  8 +++---
 4 files changed, 40 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index 340a9ae,0000000..c9afce3
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
- 92566b963776d80aab341e33b760859f877ece37
- 92566b963776d80aab341e33b760859f877ece37
++1b874da10c992f7c45b68098ebca4c76a1b8a982
++1b874da10c992f7c45b68098ebca4c76a1b8a982
 +9939cc91144a5e9b54214d6e52e6b548c9ccb4d7
 +9939cc91144a5e9b54214d6e52e6b548c9ccb4d7
 +django-uwsgi_0.2.1.orig.tar.gz
 +a4d47452324ee01edf9fc1a368ccfe021f8cab2b
 +352285
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Use-local-copies-of-screenshot-images-to-prevent-pri.patch
index 0000000,0000000..821d2e6
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Use-local-copies-of-screenshot-images-to-prevent-pri.patch
@@@ -1,0 -1,0 +1,33 @@@
++From 1b874da10c992f7c45b68098ebca4c76a1b8a982 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Mon, 17 Jul 2017 09:27:48 +0200
++Subject: Use local copies of screenshot images to prevent privacy breach.
++
++---
++ docs/screenshots.rst | 8 ++++----
++ 1 file changed, 4 insertions(+), 4 deletions(-)
++
++diff --git a/docs/screenshots.rst b/docs/screenshots.rst
++index e597dd6..0ec2c67 100644
++--- a/docs/screenshots.rst
+++++ b/docs/screenshots.rst
++@@ -9,14 +9,14 @@ Screenshots
++ 
++ `Wagtail <https://github.com/torchbox/wagtail>`_ admin interface:
++ 
++-.. image:: https://github.com/unbit/django-uwsgi/raw/master/docs/screenshots/screenshot2.png
+++.. image:: screenshots/screenshot2.png
++ 
++-.. image:: https://github.com/unbit/django-uwsgi/raw/master/docs/screenshots/screenshot3.png
+++.. image:: screenshots/screenshot3.png
++ 
++ Emperor's Vassal Admin Panel
++ 
++-.. image:: https://github.com/unbit/django-uwsgi/raw/master/docs/screenshots/screenshot4.png
+++.. image:: screenshots/screenshot4.png
++ 
++ `django.contrib.admin <https://docs.djangoproject.com/en/1.10/ref/contrib/admin/>`_ interface
++ 
++-.. image:: https://github.com/unbit/django-uwsgi/raw/master/docs/screenshots/screenshot5.png
++\ No newline at end of file
+++.. image:: screenshots/screenshot5.png
diff --cc debian/patches/series
index ebe7073,0000000..4ae24fe
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +sphinx.patch
++0002-Use-local-copies-of-screenshot-images-to-prevent-pri.patch

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