[Python-modules-commits] [flask-ldapconn] 13/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 73c874c9bd58fc73a9c276572635078464ecc08b
Merge: 21be55b 742e6d7
Author: Dominik George <nik at naturalnet.de>
Date:   Sat Apr 29 16:05:48 2017 +0200

    merge patched into master

 debian/.git-dpm                                          | 4 ++--
 debian/patches/0002-Be-less-strict-on-dependencies.patch | 6 +++---
 setup.py                                                 | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index c0921a5,0000000..85b52f0
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
- 30de46ae4c46e70d55092d83c8adf5463017b6e3
- 30de46ae4c46e70d55092d83c8adf5463017b6e3
++742e6d7dd7f204f323ff9f343e3432157173b161
++742e6d7dd7f204f323ff9f343e3432157173b161
 +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 08fb2f3,0000000..0b51aac
mode 100644,000000..100644
--- a/debian/patches/0002-Be-less-strict-on-dependencies.patch
+++ b/debian/patches/0002-Be-less-strict-on-dependencies.patch
@@@ -1,26 -1,0 +1,26 @@@
- From 30de46ae4c46e70d55092d83c8adf5463017b6e3 Mon Sep 17 00:00:00 2001
++From 742e6d7dd7f204f323ff9f343e3432157173b161 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
++index fc5dadb..16fdd8b 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',
+++        'ldap3<2.0',
 ++        'six'
 +     ],
 +     classifiers=[
 +         'Development Status :: 4 - Beta',

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