[Python-modules-commits] [case] 04/07: 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 3e16b1fd4f437f09b9c884d946c11ea0bb9febf6
Merge: 7e7a49f 9fc175a
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Sat Feb 25 08:12:25 2017 +0000

    merge patched into master

 Changelog                                                     |  7 +++++++
 PKG-INFO                                                      |  4 ++--
 README.rst                                                    |  2 +-
 case/__init__.py                                              |  2 +-
 case/mock.py                                                  | 11 ++++++++++-
 case/pytest.py                                                |  9 +++++++--
 debian/.git-dpm                                               |  6 +++---
 ...Remove-image-from-remote-donation-site-privacy-issue.patch |  2 +-
 docs/includes/introduction.txt                                |  2 +-
 9 files changed, 33 insertions(+), 12 deletions(-)

diff --cc debian/.git-dpm
index f00a7a7,0000000..93946b9
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
- 0c38e44585d69b923370b06464336c2c1b9d8368
- 0c38e44585d69b923370b06464336c2c1b9d8368
- bdea23fac772b285e1cd98b14978fa21b1ff1dd7
++9fc175a323f58df7e496206e56a1ed15ad35707d
++9fc175a323f58df7e496206e56a1ed15ad35707d
++bc16cbafc230361ff2050dfc2ef8cc29fcea88aa
 +bc16cbafc230361ff2050dfc2ef8cc29fcea88aa
 +case_1.5.3+dfsg.orig.tar.gz
 +284f56d4d9716f43716caaba6b289f5e404b81eb
 +53114
 +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 21f9991,0000000..6e6201c
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,25 -1,0 +1,25 @@@
- From 0c38e44585d69b923370b06464336c2c1b9d8368 Mon Sep 17 00:00:00 2001
++From 9fc175a323f58df7e496206e56a1ed15ad35707d 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..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" value="Donate">
 +     </form>
 + </div>

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