[Python-modules-commits] [vine] 05/09: merge patched into master
Christopher Stuart Hoskin
mans0954 at moszumanska.debian.org
Fri Oct 27 19:12:04 UTC 2017
This is an automated email from the git hooks/post-receive script.
mans0954 pushed a commit to branch master
in repository vine.
commit 66b84acb28c3f8a94303ed6ee9843698f5f7bcb2
Merge: b1ac7a3 35eab89
Author: Christopher Hoskin <mans0954 at debian.org>
Date: Fri Oct 27 19:52:16 2017 +0100
merge patched into master
Changelog | 13 +++++++-
PKG-INFO | 8 +++--
README.rst | 2 +-
debian/.git-dpm | 6 ++--
...e-from-remote-donation-site-privacy-issue.patch | 2 +-
debian/patches/0002-Reproducible-build.patch | 36 ----------------------
debian/patches/series | 1 -
docs/includes/introduction.txt | 2 +-
setup.cfg | 1 -
setup.py | 4 +++
vine/__init__.py | 2 +-
vine/five.py | 7 ++++-
vine/promises.py | 4 +++
vine/synchronization.py | 2 +-
14 files changed, 40 insertions(+), 50 deletions(-)
diff --cc debian/.git-dpm
index e01a9f4,0000000..30926bc
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
- 00aa09b14a812d1699914f6c79ebfae6ae7019b6
- 00aa09b14a812d1699914f6c79ebfae6ae7019b6
- 6633143b4f28ec57dab8a04dbbd2e8ca1bbadc43
++35eab897ac8de3e6c3653eae916bcf9fb10ced89
++35eab897ac8de3e6c3653eae916bcf9fb10ced89
++25eba831e0721ec1567637c3c9ff706d1a1f78cb
+25eba831e0721ec1567637c3c9ff706d1a1f78cb
+vine_1.1.4+dfsg.orig.tar.gz
+388207aa9bf128a96d794163182a916f0fce40b7
+47273
+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 c599abe,0000000..f625c27
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 0b73c823ff5ae3cf55ee8505461995978019b30d Mon Sep 17 00:00:00 2001
++From 35eab897ac8de3e6c3653eae916bcf9fb10ced89 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 3c36217,0000000..c13357b
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
+0001-Remove-image-from-remote-donation-site-privacy-issue.patch
- 0002-Reproducible-build.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/vine.git
More information about the Python-modules-commits
mailing list