[Python-modules-commits] [python-django-ordered-model] 05/06: 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 a7267f1a6d41869177ee8e45c58c93e246723640
Merge: db66c11 ef66aed
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Sat Jul 9 17:17:40 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...ols-in-setup.py-to-support-babel-integrat.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  4 ++--
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index e3f1742,0000000..5fc9463
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 12859220117d7cc25f1f684d50e072c21e2f1ac3
- 12859220117d7cc25f1f684d50e072c21e2f1ac3
++ef66aed4f887543620b7eadd104cab6b22ef7353
++ef66aed4f887543620b7eadd104cab6b22ef7353
 +12859220117d7cc25f1f684d50e072c21e2f1ac3
 +12859220117d7cc25f1f684d50e072c21e2f1ac3
 +python-django-ordered-model_1.2.0.orig.tar.gz
 +fb9902031e450bf3185764122b1c3f93f4129a35
 +12299
diff --cc debian/patches/0001-Use-setuptools-in-setup.py-to-support-babel-integrat.patch
index 0000000,0000000..14ce3da
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-setuptools-in-setup.py-to-support-babel-integrat.patch
@@@ -1,0 -1,0 +1,23 @@@
++From ef66aed4f887543620b7eadd104cab6b22ef7353 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
++--- 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',
diff --cc debian/patches/series
index 0000000,0000000..cf58af8
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Use-setuptools-in-setup.py-to-support-babel-integrat.patch

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