[Python-modules-commits] [vcr.py] 05/06: merge patched into master

[Daniele Tricoli]

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

eriol-guest pushed a commit to branch master
in repository vcr.py.

commit f3d1ce31cd35d7c7f5cca5a2743ae078d00b86f3
Merge: c8939af 55f496d
Author: Daniele Tricoli <eriol at mornie.org>
Date:   Sun Aug 28 18:51:19 2016 +0200

    merge patched into master

 README.rst                                      |  5 -----
 debian/.git-dpm                                 |  4 ++--
 debian/patches/remove-privacy-breach-urls.patch | 27 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 4 files changed, 30 insertions(+), 7 deletions(-)

diff --cc debian/.git-dpm
index 0e71d62,0000000..4418e93
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
- 4dac0b8a3dd26a14acb4f8a1b4c846e4bc93535f
- 4dac0b8a3dd26a14acb4f8a1b4c846e4bc93535f
++55f496d8182bc109cfa991d37adf06fe794ae144
++55f496d8182bc109cfa991d37adf06fe794ae144
 +4dac0b8a3dd26a14acb4f8a1b4c846e4bc93535f
 +4dac0b8a3dd26a14acb4f8a1b4c846e4bc93535f
 +vcr.py_1.10.0.orig.tar.gz
 +fdb5dc711f5dec04f20614b7286ecad45baee16f
 +323346
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/remove-privacy-breach-urls.patch
index 0000000,0000000..df8d9c8
new file mode 100644
--- /dev/null
+++ b/debian/patches/remove-privacy-breach-urls.patch
@@@ -1,0 -1,0 +1,27 @@@
++From 55f496d8182bc109cfa991d37adf06fe794ae144 Mon Sep 17 00:00:00 2001
++From: Daniele Tricoli <eriol at mornie.org>
++Date: Sun, 28 Aug 2016 18:50:51 +0200
++Subject: Remove privacy breach URLs
++
++Forwarded: not-needed
++Patch-Name: remove-privacy-breach-urls.patch
++---
++ README.rst | 5 -----
++ 1 file changed, 5 deletions(-)
++
++diff --git a/README.rst b/README.rst
++index 85854f5..8df1fe4 100644
++--- a/README.rst
+++++ b/README.rst
++@@ -1,11 +1,6 @@
++-|PyPI| |Build Status| |Waffle Ready| |Gitter|
++-
++ VCR.py
++ ======
++ 
++-.. image:: https://raw.github.com/kevin1024/vcrpy/master/vcr.png
++-   :alt: vcr.py
++-
++ This is a Python version of `Ruby's VCR
++ library <https://github.com/vcr/vcr>`__.
++ 
diff --cc debian/patches/series
index 0000000,0000000..450c871
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++remove-privacy-breach-urls.patch

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