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

commit 59dcd0a23155f753ecce60ef84c5876183a6712e
Merge: 0e9adbe 04a5e82
Author: Ondřej Nový <onovy at debian.org>
Date:   Thu Sep 1 16:31:59 2016 +0200

    merge patched into master

 README.rst                                         |  3 ---
 debian/.git-dpm                                    |  4 ++--
 .../0004-Removed-privacy-breach-in-docs.patch      | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index 74ab7e7,0000000..5ef2cab
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
- 391a9238b7d78ffc991328ce016bf6628ab006af
- 391a9238b7d78ffc991328ce016bf6628ab006af
++04a5e8228fa57b23b53fb7bf3592728f171bb841
++04a5e8228fa57b23b53fb7bf3592728f171bb841
 +81834bfdd6e021247c5ca0c6ec4abe55cc246ca5
 +81834bfdd6e021247c5ca0c6ec4abe55cc246ca5
 +pycurl_7.43.0.orig.tar.gz
 +e8e9c7e9ae91ae32096b8c86cfc7d49976a66d1b
 +182522
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0004-Removed-privacy-breach-in-docs.patch
index 0000000,0000000..4aa4312
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-Removed-privacy-breach-in-docs.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 04a5e8228fa57b23b53fb7bf3592728f171bb841 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy at debian.org>
++Date: Thu, 1 Sep 2016 16:31:49 +0200
++Subject: Removed privacy breach in docs
++
++---
++ README.rst | 3 ---
++ 1 file changed, 3 deletions(-)
++
++diff --git a/README.rst b/README.rst
++index 46916d3..f449280 100644
++--- a/README.rst
+++++ b/README.rst
++@@ -1,9 +1,6 @@
++ PycURL -- A Python Interface To The cURL library
++ ================================================
++ 
++-.. image:: https://api.travis-ci.org/pycurl/pycurl.png
++-	   :target: https://travis-ci.org/pycurl/pycurl
++-
++ 
++ PycURL is a Python interface to `libcurl`_, the multiprotocol file
++ transfer library. Similarly to the urllib_ Python module,
diff --cc debian/patches/series
index 292c6d6,0000000..03c7fbe
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,4 @@@
 +10_setup.py.patch
 +20_build_doc_for_debian.patch
 +30_debianize_tests.patch
++0004-Removed-privacy-breach-in-docs.patch

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