[Python-modules-commits] [django-uwsgi] 04/10: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Mon Jul 17 07:45:26 UTC 2017
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository django-uwsgi.
commit 388bae9066f1491bb1275fe057bac8488978ad54
Merge: 1b640a5 92566b9
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Mon Jul 17 09:13:08 2017 +0200
merge patched into master
CONTRIBUTORS | 3 +
MANIFEST.in | 2 +-
PKG-INFO | 13 +-
README.rst | 8 ++
debian/.git-dpm | 6 +-
debian/patches/sphinx.patch | 4 +-
django_uwsgi.egg-info/PKG-INFO | 13 +-
django_uwsgi.egg-info/SOURCES.txt | 11 +-
django_uwsgi/.DS_Store | Bin 8196 -> 0 bytes
django_uwsgi/__init__.py | 4 +-
django_uwsgi/emperor/admin.py | 19 ++-
django_uwsgi/emperor/wagtail_hooks.py | 15 +++
django_uwsgi/mail.py | 2 +-
django_uwsgi/management/.DS_Store | Bin 6148 -> 0 bytes
django_uwsgi/management/commands/runuwsgi.py | 62 ++++-----
django_uwsgi/panels.py | 7 +-
django_uwsgi/stats.py | 13 +-
django_uwsgi/{task.py => tasks.py} | 1 +
django_uwsgi/templates/.DS_Store | Bin 6148 -> 0 bytes
django_uwsgi/templates/uwsgi/panel.html | 149 ++++++++++++++-------
django_uwsgi/templates/uwsgi/wagtail_uwsgi.html | 170 +++++++++++++++++-------
django_uwsgi/urls.py | 14 +-
django_uwsgi/views.py | 59 ++++++--
docs/cache.rst | 15 ++-
docs/conf.py | 2 +-
docs/configuration.rst | 4 +-
docs/email.rst | 2 +-
docs/emperor.rst | 13 +-
docs/features.rst | 2 +
docs/installation.rst | 5 +-
docs/integrations.rst | 5 +-
docs/screenshots.rst | 11 +-
docs/screenshots/screenshot1.png | Bin 130092 -> 100713 bytes
docs/screenshots/screenshot2.png | Bin 77379 -> 61452 bytes
docs/screenshots/screenshot3.png | Bin 51354 -> 75813 bytes
docs/screenshots/screenshot4.png | Bin 0 -> 74709 bytes
docs/screenshots/screenshot5.png | Bin 0 -> 56162 bytes
docs/todo.rst | 3 -
setup.cfg | 3 +
setup.py | 3 +
40 files changed, 459 insertions(+), 184 deletions(-)
diff --cc debian/.git-dpm
index fe92e59,0000000..340a9ae
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
- 7bd94169d222fc13d0f7715a0c93d0b3c0fe46be
- 7bd94169d222fc13d0f7715a0c93d0b3c0fe46be
- 65c13515bc8aa8ef032720ce5f8936fd501718fd
++92566b963776d80aab341e33b760859f877ece37
++92566b963776d80aab341e33b760859f877ece37
++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/sphinx.patch
index 6b22281,0000000..27060c6
mode 100644,000000..100644
--- a/debian/patches/sphinx.patch
+++ b/debian/patches/sphinx.patch
@@@ -1,32 -1,0 +1,32 @@@
- From 7bd94169d222fc13d0f7715a0c93d0b3c0fe46be Mon Sep 17 00:00:00 2001
++From 92566b963776d80aab341e33b760859f877ece37 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Mon, 26 Oct 2015 20:04:39 +0100
+Subject: Disable sphinx extensions that are not packaged yet
+
+Last-Update: 2015-09-14
+Forwarded: not-needed
+
+Patch-Name: sphinx.patch
+---
+ docs/conf.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
- index 0ee8952..21d7bad 100755
++index 13a529d..536ce71 100755
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -13,10 +13,10 @@ sys.path.insert(0, os.path.abspath('..'))
+ from django_uwsgi import __version__
+
+
+-extensions = [
+- 'sphinx.ext.intersphinx',
+- 'releases',
+-]
++#extensions = [
++# 'sphinx.ext.intersphinx',
++# 'releases',
++#]
+
+ releases_issue_uri = "https://github.com/unbit/django-uwsgi/issues/%s"
+ releases_release_uri = "https://github.com/unbit/django-uwsgi/tree/%s"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-uwsgi.git
More information about the Python-modules-commits
mailing list