[Python-modules-commits] [python-django-ordered-model] 05/07: 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 python-django-ordered-model.

commit 3c87a21bb0ebcf6b4149c2875c9e761f99bd82ed
Merge: 2096244 2436257
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Wed Jul 27 09:47:26 2016 +0200

    merge patched into master

 CHANGES.md                                         |  6 +++
 PKG-INFO                                           |  2 +-
 debian/.git-dpm                                    |  6 +--
 ...ols-in-setup.py-to-support-babel-integrat.patch |  6 +--
 ordered_model/admin.py                             | 25 +++++++----
 ordered_model/models.py                            |  4 ++
 ordered_model/tests/admin.py                       |  8 ++++
 ordered_model/tests/models.py                      |  5 +--
 ordered_model/tests/settings.py                    |  9 ++++
 ordered_model/tests/tests.py                       | 48 +++++++++++++++-------
 setup.py                                           |  2 +-
 11 files changed, 89 insertions(+), 32 deletions(-)

diff --cc debian/.git-dpm
index 59ce26f,0000000..7d526c6
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
- ef66aed4f887543620b7eadd104cab6b22ef7353
- ef66aed4f887543620b7eadd104cab6b22ef7353
- 12859220117d7cc25f1f684d50e072c21e2f1ac3
++2436257403858ddde7b75201fed2b7bf3abb2a51
++2436257403858ddde7b75201fed2b7bf3abb2a51
++3cc4266b4d5fdf3e19247d333ebaf295fbf5b6ac
 +3cc4266b4d5fdf3e19247d333ebaf295fbf5b6ac
 +python-django-ordered-model_1.2.1.orig.tar.gz
 +7a3a0caf89df63ffae42d49f328623b237ca7c0a
 +12819
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Use-setuptools-in-setup.py-to-support-babel-integrat.patch
index 14ce3da,0000000..accd5ce
mode 100644,000000..100644
--- a/debian/patches/0001-Use-setuptools-in-setup.py-to-support-babel-integrat.patch
+++ b/debian/patches/0001-Use-setuptools-in-setup.py-to-support-babel-integrat.patch
@@@ -1,23 -1,0 +1,23 @@@
- From ef66aed4f887543620b7eadd104cab6b22ef7353 Mon Sep 17 00:00:00 2001
++From 2436257403858ddde7b75201fed2b7bf3abb2a51 Mon Sep 17 00:00:00 2001
 +From: Michael Fladischer <FladischerMichael at fladi.at>
 +Date: Sat, 9 Jul 2016 17:16:28 +0200
 +Subject: Use setuptools in setup.py to support babel integration.
 +
 +---
 + setup.py | 4 ++--
 + 1 file changed, 2 insertions(+), 2 deletions(-)
 +
 +diff --git a/setup.py b/setup.py
- index 3bc38f3..0c2e309 100644
++index 7af3bbd..4c135c9 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -1,7 +1,7 @@
 + #!/usr/bin/env python
 + # -*- coding: utf-8 -*-
 +-from distutils.core import setup
 +- 
 ++from setuptools import setup
 ++
 + setup(
 +     name='django-ordered-model',
-      version='1.2.0',
++     version='1.2.1',

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