[Python-modules-commits] [python-click-log] 04/05: merge patched into master

[Filip Pytloun]

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

fpytloun-guest pushed a commit to branch master
in repository python-click-log.

commit 770e778f83fcfa4fe4a53fbb46ee61a053a11d9f
Merge: 7a9ec73 d42f8f8
Author: Filip Pytloun <filip at pytloun.cz>
Date:   Mon Dec 11 17:28:33 2017 +0100

    merge patched into master

 click_log/__init__.py                                              | 2 +-
 click_log/core.py                                                  | 7 ++-----
 click_log/options.py                                               | 2 +-
 debian/.git-dpm                                                    | 6 +++---
 ...0001-Remove-embedded-image-in-docs-to-avoid-privacy-breac.patch | 2 +-
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --cc debian/.git-dpm
index b8ee43b,0000000..88caa60
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
- c02e119744a32c1cae0625936ce4271598f97a95
- c02e119744a32c1cae0625936ce4271598f97a95
- 711202b36632465cd24993c4be18ec7eeb6c5ac7
++d42f8f888da3d532d4edfd4db15f91c646cfb28f
++d42f8f888da3d532d4edfd4db15f91c646cfb28f
++fa168cb0f6d77277ddaded92ec94e58e6b097126
 +fa168cb0f6d77277ddaded92ec94e58e6b097126
 +python-click-log_0.2.1.orig.tar.gz
 +581923c513f7dab4e9685f958652c5891e1876b0
 +9326
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Remove-embedded-image-in-docs-to-avoid-privacy-breac.patch
index 22b2d2d,0000000..ff953d0
mode 100644,000000..100644
--- a/debian/patches/0001-Remove-embedded-image-in-docs-to-avoid-privacy-breac.patch
+++ b/debian/patches/0001-Remove-embedded-image-in-docs-to-avoid-privacy-breac.patch
@@@ -1,23 -1,0 +1,23 @@@
- From c02e119744a32c1cae0625936ce4271598f97a95 Mon Sep 17 00:00:00 2001
++From d42f8f888da3d532d4edfd4db15f91c646cfb28f Mon Sep 17 00:00:00 2001
 +From: Filip Pytloun <filip at pytloun.cz>
 +Date: Tue, 9 Aug 2016 11:45:44 +0200
 +Subject: Remove embedded image in docs to avoid privacy breach
 +
 +---
 + README.rst | 3 ---
 + 1 file changed, 3 deletions(-)
 +
 +diff --git a/README.rst b/README.rst
 +index ffe30d1..fe2cdc4 100644
 +--- a/README.rst
 ++++ b/README.rst
 +@@ -1,9 +1,6 @@
 + click-log
 + =========
 + 
 +-.. image:: https://travis-ci.org/click-contrib/click-log.svg?branch=master
 +-    :target: https://travis-ci.org/click-contrib/click-log
 +-
 + Integrates logging with click.
 + 
 + - `Documentation <https://click-log.readthedocs.org/>`_

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