[Python-modules-commits] [flask-login] 03/04: merge patched into master

[Carl Suster]

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

arcresu-guest pushed a commit to branch master
in repository flask-login.

commit 1f28532014c39b80978a7516a14e1bebab5c9706
Merge: 1539c3f 449cb9b
Author: Carl Suster <carl at contraflo.ws>
Date:   Thu Jan 12 12:45:50 2017 +1100

    merge patched into master

 debian/.git-dpm                                                       | 4 ++--
 debian/patches/0001-disable-github-fork-ribbon.patch                  | 4 +++-
 .../0002-allow-choice-of-nosetests-executable-in-run-tests.sh.patch   | 4 +++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index d5d0b53,0000000..a91e28a
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
- 5682a905c96d238d72ffafb0111af3e0eaaa9197
- 5682a905c96d238d72ffafb0111af3e0eaaa9197
++449cb9bdd32d7555ce6cf5b471c6c26eafd21567
++449cb9bdd32d7555ce6cf5b471c6c26eafd21567
 +a9de2f219c8069773b7270f13d2c2278e5381dbc
 +a9de2f219c8069773b7270f13d2c2278e5381dbc
 +flask-login_0.4.0.orig.tar.gz
 +932cd01cf317163f332a0b5e7b3a204f51733cd8
 +40606
diff --cc debian/patches/0001-disable-github-fork-ribbon.patch
index 8518b6a,0000000..5e72c70
mode 100644,000000..100644
--- a/debian/patches/0001-disable-github-fork-ribbon.patch
+++ b/debian/patches/0001-disable-github-fork-ribbon.patch
@@@ -1,25 -1,0 +1,27 @@@
- From 9f6c4ca9ea6de7f97f2fe5beb5bca3bc74d9b94d Mon Sep 17 00:00:00 2001
++From 3ec3de1008e19900e549de04a6d3fbf391339eb7 Mon Sep 17 00:00:00 2001
 +From: Carl Suster <carl at contraflo.ws>
 +Date: Sun, 8 Jan 2017 19:28:57 +1100
 +Subject: disable github fork ribbon
 +
 +Reconfigures documentation to exclude the GitHub fork ribbon image
 +hosted on the web, which triggers a privacy-breach-generic lintian
 +warning.
++
++Forwarded: not-needed
 +---
 + docs/conf.py | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
 +index 6e8f4ae..eafd8e3 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -105,7 +105,7 @@ html_theme = 'flask_small'
 + # Theme options are theme-specific and customize the look and feel of a theme
 + # further.  For a list of options available for each theme, see the
 + # documentation.
 +-html_theme_options = dict(github_fork='maxcountryman/flask-login', index_logo=False)
 ++html_theme_options = dict(github_fork=False, index_logo=False)
 + 
 + # Add any paths that contain custom themes here, relative to this directory.
 + html_theme_path = ['_themes']
diff --cc debian/patches/0002-allow-choice-of-nosetests-executable-in-run-tests.sh.patch
index 40fb9cf,0000000..b5b12c0
mode 100644,000000..100644
--- a/debian/patches/0002-allow-choice-of-nosetests-executable-in-run-tests.sh.patch
+++ b/debian/patches/0002-allow-choice-of-nosetests-executable-in-run-tests.sh.patch
@@@ -1,24 -1,0 +1,26 @@@
- From 5682a905c96d238d72ffafb0111af3e0eaaa9197 Mon Sep 17 00:00:00 2001
++From 449cb9bdd32d7555ce6cf5b471c6c26eafd21567 Mon Sep 17 00:00:00 2001
 +From: Carl Suster <carl at contraflo.ws>
 +Date: Sun, 8 Jan 2017 20:02:53 +1100
 +Subject: allow choice of nosetests executable in run-tests.sh
 +
 +Upstream hard codes `nosetests` but to run the tests for Python 3 this
 +must be called as `nosetests3` so this change allows this.
++
++Forwarded: https://github.com/maxcountryman/flask-login/pull/329
 +---
 + run-tests.sh | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/run-tests.sh b/run-tests.sh
 +index 44c174a..17e5307 100755
 +--- a/run-tests.sh
 ++++ b/run-tests.sh
 +@@ -30,7 +30,7 @@ else
 + fi
 + 
 + log "Running tests..."
 +-nosetests $NOSETEST_OPTIONS 2>&1 | tee -a $OUTPUT_PATH/test.log
 ++${NOSETEST:-nosetests} $NOSETEST_OPTIONS 2>&1 | tee -a $OUTPUT_PATH/test.log
 + ret=${PIPESTATUS[0]}
 + 
 + echo

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