[Python-modules-commits] [pylint-flask] 04/08: merge patched into master

[Daniel Stender]

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

danstender-guest pushed a commit to branch master
in repository pylint-flask.

commit f814089e839af4ea5cfe68f26bf59bd98828f6b2
Merge: 0ef5900 fef0403
Author: Daniel Stender <stender at debian.org>
Date:   Sat Aug 27 22:13:51 2016 +0200

    merge patched into master

 debian/.git-dpm                                      | 4 ++--
 debian/patches/0001-remove-logilab-common-deps.patch | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 71db977,0000000..8b89053
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
- a59af9dd2d0c890606c1e08893addb9b8aaf0939
- a59af9dd2d0c890606c1e08893addb9b8aaf0939
++fef0403d07e0daaa83ee7ba3f9be7357e2fa1308
++fef0403d07e0daaa83ee7ba3f9be7357e2fa1308
 +278ab3e00920b41e91e015835d083b4e9d87ca5a
 +278ab3e00920b41e91e015835d083b4e9d87ca5a
 +pylint-flask_0.3.orig.tar.xz
 +7efca2bf1243a19406b50d8932541382914fbc3a
 +3120
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-remove-logilab-common-deps.patch
index 06d598e,0000000..c6b4b75
mode 100644,000000..100644
--- a/debian/patches/0001-remove-logilab-common-deps.patch
+++ b/debian/patches/0001-remove-logilab-common-deps.patch
@@@ -1,34 -1,0 +1,34 @@@
- From a59af9dd2d0c890606c1e08893addb9b8aaf0939 Mon Sep 17 00:00:00 2001
++From fef0403d07e0daaa83ee7ba3f9be7357e2fa1308 Mon Sep 17 00:00:00 2001
 +From: Daniel Stender <stender at debian.org>
 +Date: Sat, 27 Aug 2016 22:08:21 +0200
 +Subject: remove-logilab-common-deps
 +
- Description: logilab-common does not seem to be used anywhere in
++logilab-common does not seem to be used anywhere in
 + pylint-flask. Thanks to Sebastian Ramacher.
 +Origin: https://github.com/jschaf/pylint-flask/pull/4
 +Bug: https://bugs.debian.org/835601
 +---
 + setup.py | 6 ++----
 + 1 file changed, 2 insertions(+), 4 deletions(-)
 +
 +diff --git a/setup.py b/setup.py
 +index dad8932..9284c1e 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -32,14 +32,12 @@ if sys.version_info < (2, 7):
 +     # pylint 1.4 dropped support for Python 2.6
 +     _install_requires += [
 +         'pylint>=1.0,<1.4',
 +-        'astroid>=1.0,<1.3.0',
 +-        'logilab-common>=0.60.0,<0.63',
 ++        'astroid>=1.0,<1.3.0'
 +     ]
 + else:
 +     _install_requires += [
 +         'pylint>=1.0',
 +-        'astroid>=1.0',
 +-        'logilab-common>=0.60.0',
 ++        'astroid>=1.0'
 +     ]
 + 
 + setup(

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