[Python-modules-commits] [flask-bcrypt] 05/09: merge patched into master

[Orestis Ioannou]

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

oorestisime-guest pushed a commit to branch master
in repository flask-bcrypt.

commit e32aa5d341a9d75660671ad1bded141015a74a62
Merge: 2284bc9 c4d33b0
Author: Orestis Ioannou <orestis at oioannou.com>
Date:   Fri Mar 11 23:32:41 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...Remove-image-from-amazonaws-in-docs-theme.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/_themes/flask_small/layout.html               |  3 +--
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 4c3b35a,0000000..e6711ca
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- c2febef34c81f22b9cbbbbca0c03fbd82a2f7270
- c2febef34c81f22b9cbbbbca0c03fbd82a2f7270
++c4d33b047b3c65ef575e6eee54330bec551601e3
++c4d33b047b3c65ef575e6eee54330bec551601e3
 +c2febef34c81f22b9cbbbbca0c03fbd82a2f7270
 +c2febef34c81f22b9cbbbbca0c03fbd82a2f7270
 +flask-bcrypt_0.7.1.orig.tar.gz
 +dffe44d8647fed2ed95e1951c0bcaf52919dd9ea
 +116978
diff --cc debian/patches/0001-Remove-image-from-amazonaws-in-docs-theme.patch
index 0000000,0000000..b5730b7
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Remove-image-from-amazonaws-in-docs-theme.patch
@@@ -1,0 -1,0 +1,23 @@@
++From c4d33b047b3c65ef575e6eee54330bec551601e3 Mon Sep 17 00:00:00 2001
++From: Orestis Ioannou <orestis at oioannou.com>
++Date: Fri, 11 Mar 2016 23:32:31 +0100
++Subject: Remove image from amazonaws in docs theme
++
++---
++ docs/_themes/flask_small/layout.html | 3 +--
++ 1 file changed, 1 insertion(+), 2 deletions(-)
++
++diff --git a/docs/_themes/flask_small/layout.html b/docs/_themes/flask_small/layout.html
++index aa1716a..d37d667 100644
++--- a/docs/_themes/flask_small/layout.html
+++++ b/docs/_themes/flask_small/layout.html
++@@ -14,8 +14,7 @@
++ {% block relbar1 %}{% endblock %}
++ {% block relbar2 %}
++   {% if theme_github_fork %}
++-    <a href="http://github.com/{{ theme_github_fork }}"><img style="position: fixed; top: 0; right: 0; border: 0;"
++-    src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
+++    <a href="http://github.com/{{ theme_github_fork }}">Fork me on GitHub</a>
++   {% endif %}
++ {% endblock %}
++ {% block sidebar1 %}{% endblock %}
diff --cc debian/patches/series
index 0000000,0000000..f4d7bc5
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Remove-image-from-amazonaws-in-docs-theme.patch

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