[Python-modules-commits] [python-atomicwrites] 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-atomicwrites.

commit d2359beb6ad59f544852e98be8504e845126b3d3
Merge: 4daddff 9217fbc
Author: Filip Pytloun <filip at pytloun.cz>
Date:   Mon Aug 22 19:13:16 2016 +0200

    merge patched into master

 .travis.yml                                        |  9 +++++----
 CONTRIBUTING.rst                                   | 11 +++++++++++
 atomicwrites/__init__.py                           | 10 +++++-----
 debian/.git-dpm                                    |  6 +++---
 ...privacy-breach-by-removing-embedded-image.patch |  2 +-
 tests/test_atomicwrites.py                         | 22 ++++++++++++++++++++++
 tox.ini                                            | 16 ++++++----------
 7 files changed, 53 insertions(+), 23 deletions(-)

diff --cc debian/.git-dpm
index 4c4389f,0000000..e97f997
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
- 933a53b9e7a58a18cbf65f28505f56e951883bcf
- 933a53b9e7a58a18cbf65f28505f56e951883bcf
- 1aaaf19f6b75d658a88bf03dcb1aba71ea21af79
++9217fbc8a0739edf49c25118c14517f63c2c4e66
++9217fbc8a0739edf49c25118c14517f63c2c4e66
++ecfe7186a2095f3eaed17d028d43c1340e1e823c
 +ecfe7186a2095f3eaed17d028d43c1340e1e823c
 +python-atomicwrites_1.1.5.orig.tar.gz
 +50b9ce2e8fb20aae8bdd5ad2ae17060de6725119
 +11050
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Fix-privacy-breach-by-removing-embedded-image.patch
index a9c6c8b,0000000..b1e1229
mode 100644,000000..100644
--- a/debian/patches/0001-Fix-privacy-breach-by-removing-embedded-image.patch
+++ b/debian/patches/0001-Fix-privacy-breach-by-removing-embedded-image.patch
@@@ -1,26 -1,0 +1,26 @@@
- From 933a53b9e7a58a18cbf65f28505f56e951883bcf Mon Sep 17 00:00:00 2001
++From 9217fbc8a0739edf49c25118c14517f63c2c4e66 Mon Sep 17 00:00:00 2001
 +From: Filip Pytloun <filip at pytloun.cz>
 +Date: Tue, 9 Aug 2016 13:03:50 +0200
 +Subject: Fix privacy-breach by removing embedded image
 +
 +---
 + README.rst | 6 ------
 + 1 file changed, 6 deletions(-)
 +
 +diff --git a/README.rst b/README.rst
 +index 3a5658c..ad25dcc 100644
 +--- a/README.rst
 ++++ b/README.rst
 +@@ -2,12 +2,6 @@
 + python-atomicwrites
 + ===================
 + 
 +-.. image:: https://travis-ci.org/untitaker/python-atomicwrites.svg?branch=master
 +-    :target: https://travis-ci.org/untitaker/python-atomicwrites
 +-
 +-.. image:: https://ci.appveyor.com/api/projects/status/vadc4le3c27to59x/branch/master?svg=true
 +-   :target: https://ci.appveyor.com/project/untitaker/python-atomicwrites/branch/master
 +-
 + Atomic file writes.
 + 
 + .. code-block:: python

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