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

commit cfead1b3599c04febc4027f19e9ccbf8ff1f9ae3
Merge: f19d5a0 7bd9416
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Wed Oct 19 11:53:31 2016 +0200

    merge patched into master

 .editorconfig                                   |  12 ---
 .gitignore                                      |  93 ------------------------
 LICENSE                                         |   2 +-
 MANIFEST.in                                     |   1 +
 PKG-INFO                                        |  10 +--
 README.rst                                      |   4 +-
 debian/.git-dpm                                 |   6 +-
 debian/patches/sphinx.patch                     |   2 +-
 django_uwsgi.egg-info/PKG-INFO                  |  10 +--
 django_uwsgi.egg-info/SOURCES.txt               |   9 ++-
 django_uwsgi.egg-info/pbr.json                  |   1 -
 django_uwsgi/.DS_Store                          | Bin 0 -> 8196 bytes
 django_uwsgi/__init__.py                        |   2 +-
 django_uwsgi/emperor/apps.py                    |   2 +-
 django_uwsgi/emperor/migrations/0001_initial.py |  37 ++++++++++
 django_uwsgi/emperor/migrations/__init__.py     |   0
 django_uwsgi/management/.DS_Store               | Bin 0 -> 6148 bytes
 django_uwsgi/stats.py                           |   2 +-
 django_uwsgi/templates/.DS_Store                | Bin 0 -> 6148 bytes
 django_uwsgi/templates/uwsgi/panel.html         |  18 ++++-
 django_uwsgi/urls.py                            |   6 +-
 docs/emperor.rst                                |  20 +++++
 docs/index.rst                                  |   1 +
 docs/todo.rst                                   |   3 +
 setup.cfg                                       |   2 +-
 setup.py                                        |   4 +-
 26 files changed, 109 insertions(+), 138 deletions(-)

diff --cc debian/.git-dpm
index 52e923b,0000000..464fa87
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
- 4e121dd101fd3b50fbe70d5cf12433e2ef520505
- 4e121dd101fd3b50fbe70d5cf12433e2ef520505
- 3c43c0552f6269504ef1307f133cf65187e59bd4
++7bd94169d222fc13d0f7715a0c93d0b3c0fe46be
++7bd94169d222fc13d0f7715a0c93d0b3c0fe46be
++65c13515bc8aa8ef032720ce5f8936fd501718fd
 +65c13515bc8aa8ef032720ce5f8936fd501718fd
 +django-uwsgi_0.1.6.orig.tar.gz
 +317a6f12983fa8da79e60c9caf736531803a58af
 +261109
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/sphinx.patch
index 4508f27,0000000..6b22281
mode 100644,000000..100644
--- a/debian/patches/sphinx.patch
+++ b/debian/patches/sphinx.patch
@@@ -1,32 -1,0 +1,32 @@@
- From 4e121dd101fd3b50fbe70d5cf12433e2ef520505 Mon Sep 17 00:00:00 2001
++From 7bd94169d222fc13d0f7715a0c93d0b3c0fe46be 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
 +--- 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