[Python-modules-commits] [django-picklefield] 03/09: 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-picklefield.

commit 31f1656b827cdf2d76f318b67f482007c859a1e9
Merge: 0820e72 fe068eb
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Thu Jul 13 11:14:09 2017 +0200

    merge patched into master

 PKG-INFO                                 | 18 ++++++++++++--
 README.rst                               | 15 ++++++++++++
 debian/.git-dpm                          |  6 ++---
 debian/patches/fix_tests.patch           | 30 ------------------------
 debian/patches/series                    |  1 -
 setup.cfg                                |  1 -
 setup.py                                 |  3 +--
 src/django_picklefield.egg-info/PKG-INFO | 18 ++++++++++++--
 src/picklefield/compat.py                |  9 -------
 src/picklefield/fields.py                | 40 ++++++++++++++------------------
 src/picklefield/tests.py                 | 38 ++++++++++++++++++++++++++----
 11 files changed, 103 insertions(+), 76 deletions(-)

diff --cc debian/.git-dpm
index 91d6ce0,0000000..b3625c0
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
- e734fbaf6fa03f984df4d9f473679dca324fdeff
- e734fbaf6fa03f984df4d9f473679dca324fdeff
- 3b92ee0c27c8ebd6eab0881cb5d15413045edbd0
++fe068eb0ecefd309f2e6ee81b911080589910da7
++fe068eb0ecefd309f2e6ee81b911080589910da7
++fe068eb0ecefd309f2e6ee81b911080589910da7
 +fe068eb0ecefd309f2e6ee81b911080589910da7
 +django-picklefield_1.0.0.orig.tar.gz
 +6cf14c470f95b6fcc1bea820f3b8e3ab57ce0f4f
 +12939
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

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