[Python-modules-commits] [case] 05/08: 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 case.

commit 34083c52a1a12031a19cbc6e2bd491dfe22bea34
Merge: f193609 0c38e44
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Thu Feb 16 09:22:03 2017 +0000

    merge patched into master

 debian/.git-dpm                                                  | 4 ++--
 ...01-Remove-image-from-remote-donation-site-privacy-issue.patch | 9 ++++++---
 docs/_templates/sidebardonations.html                            | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index ed75a0d,0000000..0eb1ab3
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
- 5e21aa3315cd085224616a13df03ab33593c7d10
- 5e21aa3315cd085224616a13df03ab33593c7d10
++0c38e44585d69b923370b06464336c2c1b9d8368
++0c38e44585d69b923370b06464336c2c1b9d8368
 +bdea23fac772b285e1cd98b14978fa21b1ff1dd7
 +bdea23fac772b285e1cd98b14978fa21b1ff1dd7
 +case_1.5.2+dfsg.orig.tar.gz
 +89a7c7d303b0af0c26397b57354ada6dc73d0d42
 +53016
 +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 f404f26,0000000..21f9991
mode 100644,000000..100644
--- a/debian/patches/0001-Remove-image-from-remote-donation-site-privacy-issue.patch
+++ b/debian/patches/0001-Remove-image-from-remote-donation-site-privacy-issue.patch
@@@ -1,22 -1,0 +1,25 @@@
- From 5e21aa3315cd085224616a13df03ab33593c7d10 Mon Sep 17 00:00:00 2001
++From 0c38e44585d69b923370b06464336c2c1b9d8368 Mon Sep 17 00:00:00 2001
 +From: Christopher Hoskin <mans0954 at debian.org>
 +Date: Thu, 16 Feb 2017 08:50:45 +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..78c771d 100644
++index 90c930b..43291df 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" alt="PayPal - The safer, easier way to pay online!">
+++    <input type="submit"  border="0" name="submit" value="Donate">
 +     </form>
 + </div>

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