[Python-modules-commits] [python-django-extensions] 04/18: 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 858ec0af8d8555bd86762201981398ed8d18df07
Merge: b963610 536a0fd
Author: Michael Fladischer <fladi at debian.org>
Date:   Mon May 16 17:18:24 2016 +0200

    merge patched into master

 .gitignore                                         |  2 +
 CHANGELOG.md                                       | 44 +++++++++++++++++
 debian/.git-dpm                                    |  6 +--
 debian/patches/0001-01-werkzeug-package.diff.patch |  2 +-
 django_extensions/__init__.py                      |  2 +-
 django_extensions/compat.py                        | 57 +++++++++-------------
 django_extensions/db/fields/__init__.py            | 17 ++++++-
 django_extensions/jobs/daily/cache_cleanup.py      |  4 +-
 .../management/commands/admin_generator.py         |  4 +-
 .../management/commands/describe_form.py           |  2 +-
 .../management/commands/dumpscript.py              | 10 ++--
 .../management/commands/pipchecker.py              |  6 ++-
 .../management/commands/runprofileserver.py        | 21 +++-----
 django_extensions/management/modelviz.py           | 13 +++--
 django_extensions/management/shells.py             | 10 +++-
 docs/command_extensions.rst                        |  3 ++
 docs/conf.py                                       |  2 +-
 docs/runserver_plus.rst                            | 27 +++++++++-
 docs/shell_plus.rst                                |  6 +++
 19 files changed, 165 insertions(+), 73 deletions(-)

diff --cc debian/.git-dpm
index 35ec818,0000000..57d53a3
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
- 74050c7a46757ffe86165414c63a5c1b005f6cba
- 74050c7a46757ffe86165414c63a5c1b005f6cba
- 6f7d6c6b2899bc99eace29aee502ecc3ea08ef88
++536a0fdc20712f3a606d7e609c237ff985222e66
++536a0fdc20712f3a606d7e609c237ff985222e66
++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/0001-01-werkzeug-package.diff.patch
index b232315,0000000..5ca9e51
mode 100644,000000..100644
--- a/debian/patches/0001-01-werkzeug-package.diff.patch
+++ b/debian/patches/0001-01-werkzeug-package.diff.patch
@@@ -1,25 -1,0 +1,25 @@@
- From 74050c7a46757ffe86165414c63a5c1b005f6cba Mon Sep 17 00:00:00 2001
++From 536a0fdc20712f3a606d7e609c237ff985222e66 Mon Sep 17 00:00:00 2001
 +From: Chris Lamb <lamby at debian.org>
 +Date: Sat, 24 Oct 2015 14:34:26 +1100
 +Subject: 01-werkzeug-package.diff
 +
 +Description:
 + Point people towards installing the python-werzeug package, not to download
 + random files from the internet.
 +---
 + django_extensions/management/commands/runserver_plus.py | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/django_extensions/management/commands/runserver_plus.py b/django_extensions/management/commands/runserver_plus.py
 +index 34bd869..f88efa8 100644
 +--- a/django_extensions/management/commands/runserver_plus.py
 ++++ b/django_extensions/management/commands/runserver_plus.py
 +@@ -175,7 +175,7 @@ class Command(BaseCommand):
 +                     pass
 + 
 +         except ImportError:
 +-            raise CommandError("Werkzeug is required to use runserver_plus.  Please visit http://werkzeug.pocoo.org/ or install via pip. (pip install Werkzeug)")
 ++            raise CommandError("Werkzeug is required to use runserver_plus.  Please install `python-werkzeug'")
 + 
 +         pdb_option = options.get('pdb', False)
 +         ipdb_option = options.get('ipdb', False)

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