[Python-modules-commits] [vine] 02/02: merge patched into master

[Christopher Stuart Hoskin]

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

mans0954 pushed a commit to branch master
in repository vine.

commit 8aac4c2fe01ad276797b170b6ce4bfc22266607b
Merge: 4d1a707 0b73c82
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Thu Feb 16 17:41:40 2017 +0000

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...e-from-remote-donation-site-privacy-issue.patch | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/_templates/sidebardonations.html              |  3 +--
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 9ee7601,0000000..d04f2d9
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
- 6633143b4f28ec57dab8a04dbbd2e8ca1bbadc43
- 6633143b4f28ec57dab8a04dbbd2e8ca1bbadc43
++0b73c823ff5ae3cf55ee8505461995978019b30d
++0b73c823ff5ae3cf55ee8505461995978019b30d
 +6633143b4f28ec57dab8a04dbbd2e8ca1bbadc43
 +6633143b4f28ec57dab8a04dbbd2e8ca1bbadc43
 +vine_1.1.3+dfsg.orig.tar.gz
 +b80f204c4f5e18d01e1c85974a15354f1b330f06
 +49282
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Remove-image-from-remote-donation-site-privacy-issue.patch
index 0000000,0000000..c599abe
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Remove-image-from-remote-donation-site-privacy-issue.patch
@@@ -1,0 -1,0 +1,25 @@@
++From 0b73c823ff5ae3cf55ee8505461995978019b30d Mon Sep 17 00:00:00 2001
++From: Christopher Hoskin <mans0954 at debian.org>
++Date: Thu, 16 Feb 2017 17:40:00 +0000
++Subject: Remove image from remote donation site (privacy issue)
++
++Forwarded: not-needed
++Author: Christopher Hoskin <mans0954 at debian.org>
++Last-Update: 16-Feb-2017
++---
++ docs/_templates/sidebardonations.html | 3 +--
++ 1 file changed, 1 insertion(+), 2 deletions(-)
++
++diff --git a/docs/_templates/sidebardonations.html b/docs/_templates/sidebardonations.html
++index 90c930b..e4c26a5 100644
++--- a/docs/_templates/sidebardonations.html
+++++ b/docs/_templates/sidebardonations.html
++@@ -4,7 +4,6 @@
++     <input type="hidden" name="cmd" value="_s-xclick">
++     <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----MIIHTwYJKoZIhvcNAQcEoIIHQDCCBzwCAQExggEwMIIBLAIBADCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwDQYJKoZIhvcNAQEBBQAEgYA2+c723xlntHKQYQR9yn9BEtUhDoUUlnOqhniqvNMWB4k2R0JpVkrNSu5JCbdjNOqDXKHoRfIWe3HXJJMPZBJKFMD5Izprb6xEZlTGaWnlrGXFfkdBaILQQgWYqV0DnuNmtDXCvfYmyu0p1K04 [...]
++     ">
++-    <input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
++-    <img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
+++    <input type="submit" border="0" name="submit" value="Donate">
++     </form>
++ </div>
diff --cc debian/patches/series
index 0000000,0000000..c13357b
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Remove-image-from-remote-donation-site-privacy-issue.patch

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