[Python-modules-commits] [flask-ldapconn] 10/15: merge patched into master

[Dominik George]

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

natureshadow-guest pushed a commit to branch master
in repository flask-ldapconn.

commit addc2618559512be20aabc305409a408c7861665
Merge: bbfe735 30de46a
Author: Dominik George <nik at naturalnet.de>
Date:   Sat Apr 29 15:58:29 2017 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../0002-Be-less-strict-on-dependencies.patch      | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  6 ++---
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index aed4028,0000000..c0921a5
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
- 4379b325f26704cd08c5c6a2a369af577802313c
- 4379b325f26704cd08c5c6a2a369af577802313c
++30de46ae4c46e70d55092d83c8adf5463017b6e3
++30de46ae4c46e70d55092d83c8adf5463017b6e3
 +e629f044c6a9165c2ebb853bddf4db15ffb2b4da
 +e629f044c6a9165c2ebb853bddf4db15ffb2b4da
 +flask-ldapconn_0.6.13.orig.tar.gz
 +018468685d1b228a8444a298afdc7e20477aaebd
 +8731
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Be-less-strict-on-dependencies.patch
index 0000000,0000000..08fb2f3
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Be-less-strict-on-dependencies.patch
@@@ -1,0 -1,0 +1,26 @@@
++From 30de46ae4c46e70d55092d83c8adf5463017b6e3 Mon Sep 17 00:00:00 2001
++From: Dominik George <nik at naturalnet.de>
++Date: Sat, 29 Apr 2017 15:58:13 +0200
++Subject: Be less strict on dependencies.
++
++---
++ setup.py | 6 +++---
++ 1 file changed, 3 insertions(+), 3 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index fc5dadb..04b1162 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -28,9 +28,9 @@ setup(
++     zip_safe=False,
++     platforms='any',
++     install_requires=[
++-        'Flask==0.10.1',
++-        'ldap3==1.3.1',
++-        'six==1.10.0'
+++        'Flask',
+++        'ldap3',
+++        'six'
++     ],
++     classifiers=[
++         'Development Status :: 4 - Beta',
diff --cc debian/patches/series
index 1b9a5a5,0000000..6bb76df
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Remove-tracking-images-from-README.patch
++0002-Be-less-strict-on-dependencies.patch

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