[Python-modules-commits] [python-django-mptt] 03/04: 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-mptt.

commit 3133adf89c62350fc4d86063e3325c3dd8be4bdd
Merge: e43df1c f1be583
Author: Brian May <bam at debian.org>
Date:   Fri Feb 3 08:01:35 2017 +1100

    merge patched into master

 MANIFEST.in                                        |    1 -
 PKG-INFO                                           |    2 +-
 README.rst                                         |   13 +-
 debian/.git-dpm                                    |    6 +-
 ...-Prepare-the-manager-using-code-for-Djang.patch |  375 ----
 debian/patches/series                              |    1 -
 django_mptt.egg-info/PKG-INFO                      |    2 +-
 django_mptt.egg-info/SOURCES.txt                   |   27 +-
 docs/admin.rst                                     |   38 +-
 docs/install.rst                                   |    7 +-
 docs/models.rst                                    |    2 +-
 docs/templates.rst                                 |    6 +-
 docs/upgrade.rst                                   |   29 +-
 mptt/__init__.py                                   |    2 +-
 mptt/admin.py                                      |  123 +-
 mptt/compat.py                                     |    8 +
 mptt/forms.py                                      |    2 +-
 mptt/locale/de/LC_MESSAGES/django.mo               |  Bin 2953 -> 4514 bytes
 mptt/locale/de/LC_MESSAGES/django.po               |  161 +-
 mptt/locale/fi/LC_MESSAGES/django.mo               |  Bin 0 -> 4355 bytes
 mptt/locale/fi/LC_MESSAGES/django.po               |  198 ++
 mptt/locale/fr/LC_MESSAGES/django.mo               |  Bin 3624 -> 4633 bytes
 mptt/locale/fr/LC_MESSAGES/django.po               |  200 +-
 mptt/locale/hu/LC_MESSAGES/django.mo               |  Bin 0 -> 4507 bytes
 mptt/locale/hu/LC_MESSAGES/django.po               |  194 ++
 mptt/locale/zh_Hant/LC_MESSAGES/django.mo          |  Bin 0 -> 4030 bytes
 mptt/locale/zh_Hant/LC_MESSAGES/django.po          |  160 ++
 mptt/managers.py                                   |   21 +-
 mptt/models.py                                     |   44 +-
 mptt/querysets.py                                  |    4 +-
 mptt/templates/admin/mptt_change_list.html         |    4 +-
 mptt/templates/admin/mptt_filter.html              |    9 +
 mptt/templatetags/mptt_admin.py                    |  169 +-
 mptt/templatetags/mptt_tags.py                     |    2 +-
 mptt/utils.py                                      |    2 +-
 tests/.coveragerc                                  |   24 -
 tests/.gitignore                                   |    2 -
 tests/__init__.py                                  |    1 -
 tests/myapp/__init__.py                            |    1 -
 tests/myapp/admin.py                               |   13 -
 tests/myapp/doctests.txt                           | 1593 ---------------
 tests/myapp/fixtures/categories.json               |  132 --
 tests/myapp/fixtures/genres.json                   |  134 --
 tests/myapp/fixtures/items.json                    |   20 -
 tests/myapp/fixtures/persons.json                  |   14 -
 tests/myapp/models.py                              |  303 ---
 tests/myapp/tests.py                               | 2111 --------------------
 tests/myapp/urls.py                                |   11 -
 tests/mydatabase                                   |  Bin 610304 -> 0 bytes
 tests/requirements.txt                             |    3 -
 tests/runtests.sh                                  |   22 -
 tests/settings.py                                  |   55 -
 52 files changed, 1196 insertions(+), 5055 deletions(-)

diff --cc debian/.git-dpm
index 367b9eb,0000000..d50a8b9
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
- 53f25a8b35fbec95b19adcb00d083d2269f9dcec
- 53f25a8b35fbec95b19adcb00d083d2269f9dcec
- 74b1458b16004b3b50cb640c51af814de7282ba7
++f1be583238e9aab224984117530c18a34744f390
++f1be583238e9aab224984117530c18a34744f390
++f1be583238e9aab224984117530c18a34744f390
 +f1be583238e9aab224984117530c18a34744f390
 +python-django-mptt_0.8.7.orig.tar.gz
 +b6fbc1d41c96443c455faa5e5dbd068f06c4b664
 +92548
 +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/python-django-mptt.git