[Python-modules-commits] [django-allauth] 02/07: merge patched into master

Pierre-Elliott Bécue peb-guest at moszumanska.debian.org
Wed Dec 13 16:06:54 UTC 2017


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 840e26793e14b60e97e6176ef621a2fd3c452169
Merge: bd8481f 7fd0a5b
Author: Pierre-Elliott Bécue <becue at crans.org>
Date:   Wed Dec 13 16:46:12 2017 +0100

    merge patched into master

 allauth/locale/es/LC_MESSAGES/django.mo            | Bin 13890 -> 13890 bytes
 allauth/locale/es/LC_MESSAGES/django.po            |   2 +-
 allauth/locale/pt_PT/LC_MESSAGES/django.mo         | Bin 10642 -> 10642 bytes
 allauth/locale/pt_PT/LC_MESSAGES/django.po         |   2 +-
 allauth/locale/sv/LC_MESSAGES/django.mo            | Bin 11050 -> 11050 bytes
 allauth/locale/sv/LC_MESSAGES/django.po            |   2 +-
 allauth/locale/tr/LC_MESSAGES/django.mo            | Bin 10605 -> 10605 bytes
 allauth/locale/tr/LC_MESSAGES/django.po            |   2 +-
 debian/.git-dpm                                    |   4 +-
 ...l-privacy-breack-links-from-documentation.patch |   6 +-
 ...rongly-encoded-character-in-some-po-files.patch | 104 +++++++++++++++++++++
 debian/patches/series                              |   1 +
 12 files changed, 112 insertions(+), 11 deletions(-)

diff --cc debian/.git-dpm
index 82fd949,0000000..b16c9a2
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
- ece2630f8ad505b643bb82a39761bb2c62077aea
- ece2630f8ad505b643bb82a39761bb2c62077aea
++7fd0a5bb41e6a9c09ebfa2b21e636d59028daaca
++7fd0a5bb41e6a9c09ebfa2b21e636d59028daaca
 +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 4239a24,0000000..faccd94
mode 100644,000000..100644
--- a/debian/patches/0001-Remove-all-privacy-breack-links-from-documentation.patch
+++ b/debian/patches/0001-Remove-all-privacy-breack-links-from-documentation.patch
@@@ -1,46 -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
- Description: Remove all privacy breack links from documentation
-  This patch cleans the README.rst file from its links to outside
-  websites, as they're just some pretty badges telling that the c-i passes
-  or things like that, and then, useless into debian and triggering a
-  privacy breach.
++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/0002-Fixes-wrongly-encoded-character-in-some-po-files.patch
index 0000000,0000000..3bcc116
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Fixes-wrongly-encoded-character-in-some-po-files.patch
@@@ -1,0 -1,0 +1,104 @@@
++From 7fd0a5bb41e6a9c09ebfa2b21e636d59028daaca Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue at crans.org>
++Date: Wed, 13 Dec 2017 16:42:14 +0100
++Subject: Fixes wrongly encoded character in some po files
++
++---
++ allauth/locale/es/LC_MESSAGES/django.mo    | Bin 13890 -> 13890 bytes
++ allauth/locale/es/LC_MESSAGES/django.po    |   2 +-
++ allauth/locale/pt_PT/LC_MESSAGES/django.mo | Bin 10642 -> 10642 bytes
++ allauth/locale/pt_PT/LC_MESSAGES/django.po |   2 +-
++ allauth/locale/sv/LC_MESSAGES/django.mo    | Bin 11050 -> 11050 bytes
++ allauth/locale/sv/LC_MESSAGES/django.po    |   2 +-
++ allauth/locale/tr/LC_MESSAGES/django.mo    | Bin 10605 -> 10605 bytes
++ allauth/locale/tr/LC_MESSAGES/django.po    |   2 +-
++ 8 files changed, 4 insertions(+), 4 deletions(-)
++
++diff --git a/allauth/locale/es/LC_MESSAGES/django.mo b/allauth/locale/es/LC_MESSAGES/django.mo
++index c81106acd06999eba7be6e8884b693d448a0f857..b07e9127071de570950b4dd5c3552b64a7c35893 100644
++GIT binary patch
++delta 15
++WcmX?<b0}wnp&ZlE1)GiK_$2^1)dlVV
++
++delta 15
++WcmX?<b0}wnp&ZkpuFb}B{1N~-JO$MN
++
++diff --git a/allauth/locale/es/LC_MESSAGES/django.po b/allauth/locale/es/LC_MESSAGES/django.po
++index a33bbcf..bdb8a9a 100644
++--- a/allauth/locale/es/LC_MESSAGES/django.po
+++++ b/allauth/locale/es/LC_MESSAGES/django.po
++@@ -9,7 +9,7 @@ msgstr ""
++ "Report-Msgid-Bugs-To: \n"
++ "POT-Creation-Date: 2017-10-29 09:56-0500\n"
++ "PO-Revision-Date: 2014-08-12 00:30+0200\n"
++-"Last-Translator: Jannis Š\n"
+++"Last-Translator: Jannis Š\n"
++ "Language-Team: Spanish (http://www.transifex.com/projects/p/django-allauth/"
++ "language/es/)\n"
++ "Language: es\n"
++diff --git a/allauth/locale/pt_PT/LC_MESSAGES/django.mo b/allauth/locale/pt_PT/LC_MESSAGES/django.mo
++index dd9f05c7f5d1c3f19dc4d0309ae57466dafb1d3c..33164554f7401ef4be0754e9aba7baf92ee6c70b 100644
++GIT binary patch
++delta 15
++XcmbOfJSlj?A91Fm3pW1~pCSkVJk$qb
++
++delta 15
++XcmbOfJSlj?A91EbU7P=jPZ0zFJUa(T
++
++diff --git a/allauth/locale/pt_PT/LC_MESSAGES/django.po b/allauth/locale/pt_PT/LC_MESSAGES/django.po
++index a25859d..88ab9b3 100644
++--- a/allauth/locale/pt_PT/LC_MESSAGES/django.po
+++++ b/allauth/locale/pt_PT/LC_MESSAGES/django.po
++@@ -9,7 +9,7 @@ msgstr ""
++ "Report-Msgid-Bugs-To: \n"
++ "POT-Creation-Date: 2017-10-29 09:56-0500\n"
++ "PO-Revision-Date: 2014-08-12 00:33+0200\n"
++-"Last-Translator: Jannis Š\n"
+++"Last-Translator: Jannis Š\n"
++ "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/"
++ "django-allauth/language/pt_PT/)\n"
++ "Language: pt_PT\n"
++diff --git a/allauth/locale/sv/LC_MESSAGES/django.mo b/allauth/locale/sv/LC_MESSAGES/django.mo
++index 9f9c6724c233c95def8682d8026d1f3e86079beb..c7ab55a2512a0461daaae09f262af8520e32b58e 100644
++GIT binary patch
++delta 15
++XcmZ1#wkmAH4 at st@3pW3fG!O&;KH3K`
++
++delta 15
++XcmZ1#wkmAH4 at ss&U7LSN8VCXaK0yZ;
++
++diff --git a/allauth/locale/sv/LC_MESSAGES/django.po b/allauth/locale/sv/LC_MESSAGES/django.po
++index 86861f0..34cad4c 100644
++--- a/allauth/locale/sv/LC_MESSAGES/django.po
+++++ b/allauth/locale/sv/LC_MESSAGES/django.po
++@@ -9,7 +9,7 @@ msgstr ""
++ "Report-Msgid-Bugs-To: \n"
++ "POT-Creation-Date: 2017-10-29 09:56-0500\n"
++ "PO-Revision-Date: 2014-08-12 00:35+0200\n"
++-"Last-Translator: Jannis Š\n"
+++"Last-Translator: Jannis Š\n"
++ "Language-Team: Swedish (http://www.transifex.com/projects/p/django-allauth/"
++ "language/sv/)\n"
++ "Language: sv\n"
++diff --git a/allauth/locale/tr/LC_MESSAGES/django.mo b/allauth/locale/tr/LC_MESSAGES/django.mo
++index ab77145d81a06da47fedead75bf3ed2d9327820d..e13dcfeba1379783f29b4136c37c7caae36a4132 100644
++GIT binary patch
++delta 15
++WcmaDG^fqV%vjo%81)EtVG6VrQ#0B~Q
++
++delta 15
++WcmaDG^fqV%vjo$juFb3x8G-;fD+S>I
++
++diff --git a/allauth/locale/tr/LC_MESSAGES/django.po b/allauth/locale/tr/LC_MESSAGES/django.po
++index c6b54ae..6814f18 100644
++--- a/allauth/locale/tr/LC_MESSAGES/django.po
+++++ b/allauth/locale/tr/LC_MESSAGES/django.po
++@@ -10,7 +10,7 @@ msgstr ""
++ "Report-Msgid-Bugs-To: \n"
++ "POT-Creation-Date: 2017-10-29 09:56-0500\n"
++ "PO-Revision-Date: 2014-08-12 00:35+0200\n"
++-"Last-Translator: Jannis Š\n"
+++"Last-Translator: Jannis Š\n"
++ "Language-Team: Turkish (http://www.transifex.com/projects/p/django-allauth/"
++ "language/tr/)\n"
++ "Language: tr\n"
diff --cc debian/patches/series
index 023af78,0000000..539e587
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Remove-all-privacy-breack-links-from-documentation.patch
++0002-Fixes-wrongly-encoded-character-in-some-po-files.patch

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



More information about the Python-modules-commits mailing list