[Python-modules-commits] [python-django-extensions] 02/03: 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 a708970e9c6283ca7345427cf96261464c8bc5c9
Merge: ccff532 fe22c16
Author: Brian May <bam at debian.org>
Date:   Tue Apr 26 16:32:11 2016 +1000

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...d-Error-binding-parameter-2-in-Django-1.9.patch | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 django_extensions/db/fields/json.py                |  3 ++-
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index c3c3172,0000000..c12af69
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
- 3b05e07ea0d6447606af73efc8e8c4a303d21fc3
- 3b05e07ea0d6447606af73efc8e8c4a303d21fc3
++fe22c16e9b097a0c63f88d98511d86f65d996102
++fe22c16e9b097a0c63f88d98511d86f65d996102
 +e8e55ed79fca5962cfdf96bd3c9340e9a0c5b98b
 +e8e55ed79fca5962cfdf96bd3c9340e9a0c5b98b
 +python-django-extensions_1.6.1.orig.tar.gz
 +5d0f9ab626ed127820f8966faaade4d98b876ab5
 +170321
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Fixed-Error-binding-parameter-2-in-Django-1.9.patch
index 0000000,0000000..8856a9d
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Fixed-Error-binding-parameter-2-in-Django-1.9.patch
@@@ -1,0 -1,0 +1,25 @@@
++From fe22c16e9b097a0c63f88d98511d86f65d996102 Mon Sep 17 00:00:00 2001
++From: Piotr Jarolewski <piotr.jarolewski at allegrogroup.com>
++Date: Mon, 28 Dec 2015 13:47:49 +0100
++Subject: Fixed 'Error binding parameter 2' in Django 1.9
++
++Source https://github.com/django-extensions/django-extensions/commit/54fe88df801d289882a79824be92d823ab7be33e.patch
++Fixes https://github.com/django-extensions/django-extensions/issues/796
++---
++ django_extensions/db/fields/json.py | 3 ++-
++ 1 file changed, 2 insertions(+), 1 deletion(-)
++
++diff --git a/django_extensions/db/fields/json.py b/django_extensions/db/fields/json.py
++index 89eece7..313c6c4 100644
++--- a/django_extensions/db/fields/json.py
+++++ b/django_extensions/db/fields/json.py
++@@ -100,7 +100,8 @@ class JSONField(six.with_metaclass(models.SubfieldBase, models.TextField)):
++         # run through `dumps`
++         if not isinstance(value, six.string_types):
++             value = dumps(value)
++-        return super(JSONField, self).get_db_prep_save(value, connection=connection, **kwargs)
+++
+++        return value
++ 
++     def south_field_triple(self):
++         """Returns a suitable description of this field for South."""
diff --cc debian/patches/series
index a5b8584,0000000..fc45005
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-01-werkzeug-package.diff.patch
++0002-Fixed-Error-binding-parameter-2-in-Django-1.9.patch

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