[Python-modules-commits] [python-django-localflavor] 08/09: merge patched into master

[Orestis Ioannou]

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

oorestisime-guest pushed a commit to branch master
in repository python-django-localflavor.

commit 8edee8557def86d30887efb742312f34dc04f022
Merge: e56aea3 d83b7c9
Author: Orestis Ioannou <orestis at oioannou.com>
Date:   Sat Nov 28 11:36:23 2015 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...d-install_requires-identifier-in-setup.py.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  1 +
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 1ea03af,0000000..db00174
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
- a91bfb4ab0f4aba1c546a4d957910552f5c2fbb0
- a91bfb4ab0f4aba1c546a4d957910552f5c2fbb0
++d83b7c9167dae15f76b59f974e443215816439be
++d83b7c9167dae15f76b59f974e443215816439be
 +a91bfb4ab0f4aba1c546a4d957910552f5c2fbb0
 +a91bfb4ab0f4aba1c546a4d957910552f5c2fbb0
 +django-localflavor_1.2.orig.tar.gz
 +e2eb9c1ab9b266f4b31f3f22fb574d16b47b0379
 +2618306
diff --cc debian/patches/0001-Add-install_requires-identifier-in-setup.py.patch
index 0000000,0000000..999a2e6
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Add-install_requires-identifier-in-setup.py.patch
@@@ -1,0 -1,0 +1,23 @@@
++From d83b7c9167dae15f76b59f974e443215816439be Mon Sep 17 00:00:00 2001
++From: Orestis Ioannou <orestis at oioannou.com>
++Date: Sat, 28 Nov 2015 11:35:11 +0100
++Subject: Add install_requires identifier in setup.py
++
++Added the runtime dependencies in install_requires so that
++dh-python would automatically pick them
++---
++ setup.py | 1 +
++ 1 file changed, 1 insertion(+)
++
++diff --git a/setup.py b/setup.py
++index dff599a..0482d90 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -119,6 +119,7 @@ setup(
++     author_email='foundation at djangoproject.com',
++     packages=find_packages(exclude=['tests', 'tests.*']),
++     package_data=find_package_data(),
+++    install_requires= ['six', 'django'],
++     classifiers=[
++         'Development Status :: 5 - Production/Stable',
++         'Environment :: Web Environment',
diff --cc debian/patches/series
index 0000000,0000000..60793b5
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Add-install_requires-identifier-in-setup.py.patch

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