[Python-modules-commits] [python-django-ordered-model] 04/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 8af263d65a0fb59480534e58a174a25451d27739
Merge: e03240b ec2925a
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Mon Oct 17 10:37:14 2016 +0200

    merge patched into master

 CHANGES.md                                         |  6 ++
 PKG-INFO                                           |  2 +-
 README.md                                          | 13 ++++
 debian/.git-dpm                                    |  6 +-
 ...ols-in-setup.py-to-support-babel-integrat.patch |  6 +-
 ordered_model/admin.py                             | 16 ++---
 ordered_model/models.py                            | 43 +++++++-----
 ordered_model/tests/models.py                      |  3 +-
 ordered_model/tests/tests.py                       | 82 ++++++++++++++++++++++
 setup.py                                           |  2 +-
 10 files changed, 146 insertions(+), 33 deletions(-)

diff --cc debian/.git-dpm
index f550207,0000000..7012e9a
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
- 2436257403858ddde7b75201fed2b7bf3abb2a51
- 2436257403858ddde7b75201fed2b7bf3abb2a51
- 3cc4266b4d5fdf3e19247d333ebaf295fbf5b6ac
++ec2925a7a331cfde4c41d8e69460bc3c74fb7182
++ec2925a7a331cfde4c41d8e69460bc3c74fb7182
++e65c3d1cd99648233be5e7a96d2b9de81d444af4
 +e65c3d1cd99648233be5e7a96d2b9de81d444af4
 +python-django-ordered-model_1.3.0.orig.tar.gz
 +55173c12881db05c6316d7bd257f4c591fdc7e62
 +13634
 +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 accd5ce,0000000..ae4a675
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 2436257403858ddde7b75201fed2b7bf3abb2a51 Mon Sep 17 00:00:00 2001
++From ec2925a7a331cfde4c41d8e69460bc3c74fb7182 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 7af3bbd..4c135c9 100644
++index 678315b..d2c4c87 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.1',
++     version='1.3.0',

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