[Python-modules-commits] [django-q] 06/11: merge patched into master

[Pierre-Elliott Bécue]

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

peb-guest pushed a commit to branch master
in repository django-q.

commit 3753ebd480c944d8bdc4ae016bcf6bce8fc46a88
Merge: bee3244 b17a737
Author: Pierre-Elliott Bécue <becue at crans.org>
Date:   Tue Dec 12 14:39:26 2017 +0100

    merge patched into master

 README.rst                                         |  6 ---
 debian/.git-dpm                                    |  4 +-
 ...s-all-links-that-trigger-a-privacy-breach.patch | 45 ++++++++++++++++++++++
 debian/patches/0001_doc_strip_cdns.patch           | 20 ----------
 debian/patches/series                              |  2 +-
 docs/conf.py                                       |  7 ----
 6 files changed, 48 insertions(+), 36 deletions(-)

diff --cc debian/.git-dpm
index a5647fb,0000000..244ac0e
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
- 0c068a9f88c176063d9b8bf58b511cdd96737fe2
- 0c068a9f88c176063d9b8bf58b511cdd96737fe2
++b17a737c8c4527d0fcfeec68a929c2aad0137b90
++b17a737c8c4527d0fcfeec68a929c2aad0137b90
 +0c068a9f88c176063d9b8bf58b511cdd96737fe2
 +0c068a9f88c176063d9b8bf58b511cdd96737fe2
 +django-q_0.8.1.orig.tar.gz
 +70ac1b3a7f9f32975d5bb170af0c880ac80b95c0
 +517712
diff --cc debian/patches/0001-Removes-all-links-that-trigger-a-privacy-breach.patch
index 0000000,0000000..5ed2a63
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Removes-all-links-that-trigger-a-privacy-breach.patch
@@@ -1,0 -1,0 +1,45 @@@
++From b17a737c8c4527d0fcfeec68a929c2aad0137b90 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue at crans.org>
++Date: Tue, 12 Dec 2017 14:39:09 +0100
++Subject: Removes all links that trigger a privacy-breach
++
++---
++ README.rst   | 6 ------
++ docs/conf.py | 7 -------
++ 2 files changed, 13 deletions(-)
++
++diff --git a/README.rst b/README.rst
++index 2f326ff..af6faa5 100644
++--- a/README.rst
+++++ b/README.rst
++@@ -203,12 +203,6 @@ Acknowledgements
++    `HumanHash <https://github.com/zacharyvoase/humanhash>`__
++ -  Redditors feedback at `r/django <https://www.reddit.com/r/django/>`__
++ 
++-.. |image0| image:: https://travis-ci.org/Koed00/django-q.svg?branch=master
++-   :target: https://travis-ci.org/Koed00/django-q
++-.. |image1| image:: http://codecov.io/github/Koed00/django-q/coverage.svg?branch=master
++-   :target: http://codecov.io/github/Koed00/django-q?branch=master
++-.. |image2| image:: http://badges.gitter.im/Join%20Chat.svg
++-   :target: https://gitter.im/Koed00/django-q
++ .. |docs| image:: https://readthedocs.org/projects/docs/badge/?version=latest
++     :alt: Documentation Status
++     :scale: 100
++diff --git a/docs/conf.py b/docs/conf.py
++index c9b158f..d30c473 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -131,13 +131,6 @@ html_theme = 'alabaster'
++ html_theme_options = {
++     'description': "A multiprocessing task queue for Django",
++     'logo': 'logo.png',
++-    'github_user': 'Koed00',
++-    'github_repo': 'django-q',
++-    'gittip_user': 'koed00',
++-    'gratipay_user': 'koed00',
++-    'github_banner': True,
++-    'travis_button': True,
++-    'analytics_id': 'UA-64807059-1'
++ }
++ html_sidebars = {
++     '**': [
diff --cc debian/patches/series
index 45fe284,0000000..2e158c9
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,1 @@@
- 0001_doc_strip_cdns.patch
++0001-Removes-all-links-that-trigger-a-privacy-breach.patch

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