[Python-modules-commits] [django-markupfield] 02/05: record new upstream branch created by importing django-markupfield_1.4.2.orig.tar.gz and merge it

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository django-markupfield.

commit 7ed7ca6c375ff01ff9f618e96cfa22385df68200
Merge: 6732ee8 ec9d688
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Tue Jun 20 09:32:11 2017 +0200

    record new upstream branch created by importing django-markupfield_1.4.2.orig.tar.gz and merge it

 CHANGELOG                               | 92 ---------------------------------
 PKG-INFO                                | 11 +++-
 README.rst                              |  9 ++++
 debian/.git-dpm                         | 14 ++---
 django_markupfield.egg-info/PKG-INFO    | 11 +++-
 django_markupfield.egg-info/SOURCES.txt |  1 -
 django_markupfield.egg-info/pbr.json    |  2 +-
 markupfield/__init__.py                 |  2 +-
 markupfield/fields.py                   |  2 +-
 markupfield/tests/models.py             |  3 ++
 markupfield/tests/tests.py              | 28 +++++++++-
 setup.py                                |  2 +-
 12 files changed, 70 insertions(+), 107 deletions(-)

diff --cc debian/.git-dpm
index c489e9b,0000000..0403116
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
- e2eb281a0d63f467ad9aa2c1e2eb469ce8189b16
- e2eb281a0d63f467ad9aa2c1e2eb469ce8189b16
- e2eb281a0d63f467ad9aa2c1e2eb469ce8189b16
- e2eb281a0d63f467ad9aa2c1e2eb469ce8189b16
- django-markupfield_1.4.1.orig.tar.gz
- 1c6ab34353567663a795116b5da715a3784bccba
- 16127
++ec9d6886f2863a42a704212d79fca30ee3f8cb0e
++ec9d6886f2863a42a704212d79fca30ee3f8cb0e
++ec9d6886f2863a42a704212d79fca30ee3f8cb0e
++ec9d6886f2863a42a704212d79fca30ee3f8cb0e
++django-markupfield_1.4.2.orig.tar.gz
++a5aea71475d5c6fb386dd56298e8d3112f7fdaf4
++15758
 +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-markupfield.git