[Python-modules-commits] [python-atomicwrites] 05/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 ea97811c28fb9f97e18152b986cb8aeb87d5aa61
Merge: 276d6de 933a53b
Author: Filip Pytloun <filip at pytloun.cz>
Date:   Tue Aug 9 13:04:33 2016 +0200

    merge patched into master

 README.rst                                         |  6 -----
 debian/.git-dpm                                    |  4 ++--
 ...privacy-breach-by-removing-embedded-image.patch | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --cc debian/.git-dpm
index 1208d04,0000000..5583c0a
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
- 1aaaf19f6b75d658a88bf03dcb1aba71ea21af79
- 1aaaf19f6b75d658a88bf03dcb1aba71ea21af79
++933a53b9e7a58a18cbf65f28505f56e951883bcf
++933a53b9e7a58a18cbf65f28505f56e951883bcf
 +1aaaf19f6b75d658a88bf03dcb1aba71ea21af79
 +1aaaf19f6b75d658a88bf03dcb1aba71ea21af79
 +python-atomicwrites_1.1.0.orig.tar.gz
 +458a841c0d4abf0b56ce1a9e24c14a175fb7a842
 +10715
 +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 0000000,0000000..a9c6c8b
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Fix-privacy-breach-by-removing-embedded-image.patch
@@@ -1,0 -1,0 +1,26 @@@
++From 933a53b9e7a58a18cbf65f28505f56e951883bcf 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
diff --cc debian/patches/series
index 0000000,0000000..970f8ca
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Fix-privacy-breach-by-removing-embedded-image.patch

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