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

[Ondřej Nový]

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

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

commit 4294102c1240ff1a3fc97236fac29c522cb87498
Merge: 8858ca8 e44e3a9
Author: Ondřej Nový <onovy at debian.org>
Date:   Wed Dec 28 22:47:11 2016 +0100

    merge patched into master

 click_log/__init__.py                              |  2 +-
 click_log/core.py                                  | 19 +++++++-
 debian/.git-dpm                                    |  6 +--
 ...dded-image-in-docs-to-avoid-privacy-breac.patch |  2 +-
 tests/test_basic.py                                | 50 ++++++++++++++++++++++
 tox.ini                                            |  2 +-
 6 files changed, 73 insertions(+), 8 deletions(-)

diff --cc debian/.git-dpm
index c630562,0000000..a278ac4
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
- a45e59ededddce8188dac353d4bd61e246944c2f
- a45e59ededddce8188dac353d4bd61e246944c2f
- b7bba0cc50184fa9933a022543b19175cf5a1593
++e44e3a9caf9c6f05fbdf6667a6be6d662e56b8e7
++e44e3a9caf9c6f05fbdf6667a6be6d662e56b8e7
++f5d575527b24fe51899b9cfb40602ab4c7e62bfa
 +f5d575527b24fe51899b9cfb40602ab4c7e62bfa
 +python-click-log_0.1.8.orig.tar.gz
 +336cef0577ad84deae731e069c5d154624413681
 +9025
 +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 489b25d,0000000..4812c07
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 a45e59ededddce8188dac353d4bd61e246944c2f Mon Sep 17 00:00:00 2001
++From e44e3a9caf9c6f05fbdf6667a6be6d662e56b8e7 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