[Python-modules-commits] [python-django-etcd-settings] 04/14: 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-etcd-settings.

commit 47b4cb84cffa00ffa0054e02d26da09460a51fe1
Merge: a02271c 06f9af2
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Wed Dec 14 09:47:58 2016 +0100

    merge patched into master

 .gitignore                                         |  1 -
 debian/.git-dpm                                    |  4 +-
 ...ile-to-avoid-yet-another-Build-Depends-on.patch | 63 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           | 36 +++++++++++++
 5 files changed, 102 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 43ec82b,0000000..a918f65
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
- 8f621f963901bc060b322d52b9033ba29d618fae
- 8f621f963901bc060b322d52b9033ba29d618fae
++06f9af2d293e0ef3774c3e99983f951a548a1ee7
++06f9af2d293e0ef3774c3e99983f951a548a1ee7
 +8f621f963901bc060b322d52b9033ba29d618fae
 +8f621f963901bc060b322d52b9033ba29d618fae
 +python-django-etcd-settings_0.1.11+dfsg.orig.tar.gz
 +7417d0c665a0d29025de15da71ab2b723cc109bc
 +21439
diff --cc debian/patches/0001-Add-setup-file-to-avoid-yet-another-Build-Depends-on.patch
index 0000000,0000000..0e20ad7
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Add-setup-file-to-avoid-yet-another-Build-Depends-on.patch
@@@ -1,0 -1,0 +1,63 @@@
++From 06f9af2d293e0ef3774c3e99983f951a548a1ee7 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Tue, 13 Dec 2016 22:12:01 +0100
++Subject: Add setup file to avoid yet another Build-Depends on py-pkgversion.
++
++py-pkgversion is not yet packaged for Debian.
++---
++ .gitignore |  1 -
++ setup.py   | 36 ++++++++++++++++++++++++++++++++++++
++ 2 files changed, 36 insertions(+), 1 deletion(-)
++ create mode 100755 setup.py
++
++diff --git a/.gitignore b/.gitignore
++index e9c84a9..1d75ac2 100644
++--- a/.gitignore
+++++ b/.gitignore
++@@ -170,4 +170,3 @@ Session.vim
++ 
++ # Project files
++ unittest.sqlite
++-/setup.py
++diff --git a/setup.py b/setup.py
++new file mode 100755
++index 0000000..4f83c3e
++--- /dev/null
+++++ b/setup.py
++@@ -0,0 +1,36 @@
+++#!/usr/bin/env python
+++# -*- coding: utf-8 -*-
+++import io
+++
+++from setuptools import setup, find_packages
+++
+++
+++setup(
+++    name='django-etcd-settings',
+++    version='0.1.11',
+++    description="A dynamic settings management solution for Django using ETCD",
+++    long_description=io.open('README.rst', encoding='utf-8').read(),
+++    author="Enrique Paz",
+++    author_email='enrique.pazperez at kpn.com',
+++    url='https://github.com/kpn-digital/django-etcd-settings',
+++    install_requires=[
+++        'Django>=1.7.5'
+++        'python-etcd>=0.4.1',
+++        'python-dateutil>=2.2',
+++        'six>=1.10.0',
+++    ],
+++    packages=find_packages(exclude=['tests*']),
+++    tests_require=['tox'],
+++    include_package_data=True,
+++    zip_safe=False,
+++    classifiers=[
+++        'Development Status :: 5 - Production/Stable',
+++        'Environment :: Web Environment',
+++        'Intended Audience :: Developers',
+++        'Operating System :: OS Independent',
+++        'Programming Language :: Python',
+++        'Programming Language :: Python :: 2',
+++        'Programming Language :: Python :: 2.7',
+++        'Topic :: Internet :: WWW/HTTP',
+++    ]
+++)
diff --cc debian/patches/series
index 0000000,0000000..61d1e68
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Add-setup-file-to-avoid-yet-another-Build-Depends-on.patch

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