[Python-modules-commits] [python-django-extensions] 05/06: merge patched into master

[Brian May]

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

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

commit 8111bbdbd30c61f5497624e914a305bbedd85dfb
Merge: 23b8fb2 df2917f
Author: Brian May <bam at debian.org>
Date:   Wed Nov 18 17:29:09 2015 +1100

    merge patched into master

 .gitignore                                          |  1 +
 CHANGELOG.md                                        | 21 +++++++++++++++++++++
 debian/.git-dpm                                     |  6 +++---
 debian/patches/0001-01-werkzeug-package.diff.patch  |  2 +-
 django_extensions/__init__.py                       |  2 +-
 .../management/commands/print_settings.py           |  6 ++++++
 django_extensions/management/commands/reset_db.py   | 12 ++++++++----
 django_extensions/management/modelviz.py            | 12 +++++++++---
 django_extensions/management/shells.py              |  2 ++
 django_extensions/management/technical_response.py  |  2 +-
 .../{migrations => south_migrations}/0001_empty.py  |  0
 .../{migrations => south_migrations}/__init__.py    |  0
 docs/conf.py                                        |  2 +-
 docs/creating_release.txt                           |  6 +++++-
 docs/export_emails.rst                              | 10 +++++-----
 docs/print_settings.rst                             |  5 ++++-
 setup.cfg                                           |  1 -
 tox.ini                                             | 19 +++++++++++++++++--
 18 files changed, 85 insertions(+), 24 deletions(-)

diff --cc debian/.git-dpm
index 59703de,0000000..b54969d
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
- b338c2fd8f53304cf7b462fd91cd7db38465550d
- b338c2fd8f53304cf7b462fd91cd7db38465550d
- ab5069fe8d44daa6b3fc004252476a00ed6c3f63
++df2917feaf0e7f594df643db475e7abc1fc4ab7e
++df2917feaf0e7f594df643db475e7abc1fc4ab7e
++9e6fc9d532df2ce38eaab6e0409af25c193331d8
 +9e6fc9d532df2ce38eaab6e0409af25c193331d8
 +python-django-extensions_1.5.9.orig.tar.gz
 +c399e0bc7a7653c94f8911d3f396944bedbe6d83
 +203324
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-01-werkzeug-package.diff.patch
index 8ed02e5,0000000..bf9b0b1
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 b338c2fd8f53304cf7b462fd91cd7db38465550d Mon Sep 17 00:00:00 2001
++From df2917feaf0e7f594df643db475e7abc1fc4ab7e 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 cfa5ff8..ad36249 100644
 +--- a/django_extensions/management/commands/runserver_plus.py
 ++++ b/django_extensions/management/commands/runserver_plus.py
 +@@ -158,7 +158,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