[Python-modules-commits] [django-allauth] 04/13: 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-allauth.

commit b5633d699a01c0986c449351184dc35bb9ec0e3a
Merge: 6544d2f ece2630
Author: Pierre-Elliott Bécue <becue at crans.org>
Date:   Tue Dec 12 10:36:20 2017 +0100

    merge patched into master

 README.rst                                         | 22 ------------
 debian/.git-dpm                                    |  4 +--
 ...l-privacy-breack-links-from-documentation.patch | 42 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 45 insertions(+), 24 deletions(-)

diff --cc debian/.git-dpm
index d52da1b,0000000..82fd949
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
- 80ce46c3075fcaea6dbfdf110cf4364ac0f881b0
- 80ce46c3075fcaea6dbfdf110cf4364ac0f881b0
++ece2630f8ad505b643bb82a39761bb2c62077aea
++ece2630f8ad505b643bb82a39761bb2c62077aea
 +80ce46c3075fcaea6dbfdf110cf4364ac0f881b0
 +80ce46c3075fcaea6dbfdf110cf4364ac0f881b0
 +django-allauth_0.34.0.orig.tar.gz
 +d603ef7dcfdbf739252ed598b795225ce6344fcb
 +475030
diff --cc debian/patches/0001-Remove-all-privacy-breack-links-from-documentation.patch
index 0000000,0000000..faccd94
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Remove-all-privacy-breack-links-from-documentation.patch
@@@ -1,0 -1,0 +1,42 @@@
++From ece2630f8ad505b643bb82a39761bb2c62077aea 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 10:35:57 +0100
++Subject: Remove all privacy breack links from documentation
++
++---
++ README.rst | 22 ----------------------
++ 1 file changed, 22 deletions(-)
++
++diff --git a/README.rst b/README.rst
++index ed5a479..51d1713 100644
++--- a/README.rst
+++++ b/README.rst
++@@ -2,28 +2,6 @@
++ Welcome to django-allauth!
++ ==========================
++ 
++-.. image:: https://badge.fury.io/py/django-allauth.png
++-   :target: http://badge.fury.io/py/django-allauth
++-
++-.. image:: https://travis-ci.org/pennersr/django-allauth.png
++-   :target: http://travis-ci.org/pennersr/django-allauth
++-
++-.. image:: https://img.shields.io/pypi/v/django-allauth.svg
++-   :target: https://pypi.python.org/pypi/django-allauth
++-
++-.. image:: https://coveralls.io/repos/pennersr/django-allauth/badge.png?branch=master
++-   :alt: Coverage Status
++-   :target: https://coveralls.io/r/pennersr/django-allauth
++-
++-.. image:: https://pennersr.github.io/img/bitcoin-badge.svg
++-   :target: https://blockchain.info/address/1AJXuBMPHkaDCNX2rwAy34bGgs7hmrePEr
++-
++-.. image:: https://img.shields.io/badge/code%20style-pep8-green.svg
++-   :target: https://www.python.org/dev/peps/pep-0008/
++-
++-.. image:: https://img.shields.io/badge/code_style-standard-brightgreen.svg
++-   :target: http://standardjs.com
++-
++ Integrated set of Django applications addressing authentication,
++ registration, account management as well as 3rd party (social) account
++ authentication.
diff --cc debian/patches/series
index 0000000,0000000..023af78
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Remove-all-privacy-breack-links-from-documentation.patch

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