[Python-modules-commits] [flask-ldapconn] 05/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 806b7017ba7544c05116339c87a28dbfd387396b
Merge: c9520b8 4379b32
Author: Dominik George <nik at naturalnet.de>
Date:   Sat Apr 29 15:46:52 2017 +0200

    merge patched into master

 README.rst                                         |  6 -----
 debian/.git-dpm                                    |  4 ++--
 .../0001-Remove-tracking-images-from-README.patch  | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --cc debian/.git-dpm
index 4067478,0000000..aed4028
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
- e629f044c6a9165c2ebb853bddf4db15ffb2b4da
- e629f044c6a9165c2ebb853bddf4db15ffb2b4da
++4379b325f26704cd08c5c6a2a369af577802313c
++4379b325f26704cd08c5c6a2a369af577802313c
 +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/0001-Remove-tracking-images-from-README.patch
index 0000000,0000000..af49123
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Remove-tracking-images-from-README.patch
@@@ -1,0 -1,0 +1,26 @@@
++From 4379b325f26704cd08c5c6a2a369af577802313c Mon Sep 17 00:00:00 2001
++From: Dominik George <nik at naturalnet.de>
++Date: Sat, 29 Apr 2017 15:46:38 +0200
++Subject: Remove tracking images from README.
++
++---
++ README.rst | 6 ------
++ 1 file changed, 6 deletions(-)
++
++diff --git a/README.rst b/README.rst
++index 1afe1db..d74f76c 100644
++--- a/README.rst
+++++ b/README.rst
++@@ -1,12 +1,6 @@
++ Flask-LDAPConn
++ ==============
++ 
++-.. image:: https://travis-ci.org/rroemhild/flask-ldapconn.svg?branch=master
++-    :target: https://travis-ci.org/rroemhild/flask-ldapconn
++-
++-.. image:: https://badge.fury.io/py/flask-ldapconn.svg
++-    :target: https://pypi.python.org/pypi/flask-ldapconn
++-
++ Flask-LDAPConn is a Flask extension providing `ldap3 <https://github.com/cannatag/ldap3>`_ (an LDAP V3 pure Python client) connection for accessing LDAP servers.
++ 
++ To abstract access to LDAP data this extension provides a simple ORM model.
diff --cc debian/patches/series
index 0000000,0000000..1b9a5a5
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Remove-tracking-images-from-README.patch

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