[Python-modules-commits] [django-allauth] 04/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 2ec6cf186ade65b5503dd2bc724be9d8ec17c063
Merge: 840e267 7286867
Author: Pierre-Elliott Bécue <becue at crans.org>
Date: Wed Dec 13 16:47:55 2017 +0100
merge patched into master
allauth/locale/es/LC_MESSAGES/django.mo | Bin 13890 -> 13890 bytes
allauth/locale/pt_PT/LC_MESSAGES/django.mo | Bin 10642 -> 10642 bytes
allauth/locale/sv/LC_MESSAGES/django.mo | Bin 11050 -> 11050 bytes
allauth/locale/tr/LC_MESSAGES/django.mo | Bin 10605 -> 10605 bytes
debian/.git-dpm | 4 +-
...gly-encoded-characters-in-some-.po-files.patch} | 56 +++------------------
debian/patches/series | 2 +-
7 files changed, 11 insertions(+), 51 deletions(-)
diff --cc debian/.git-dpm
index b16c9a2,0000000..08f663d
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
- 7fd0a5bb41e6a9c09ebfa2b21e636d59028daaca
- 7fd0a5bb41e6a9c09ebfa2b21e636d59028daaca
++72868671fbec84c377d6b63557759e54a5dc8a27
++72868671fbec84c377d6b63557759e54a5dc8a27
+80ce46c3075fcaea6dbfdf110cf4364ac0f881b0
+80ce46c3075fcaea6dbfdf110cf4364ac0f881b0
+django-allauth_0.34.0.orig.tar.gz
+d603ef7dcfdbf739252ed598b795225ce6344fcb
+475030
diff --cc debian/patches/0002-Fixes-wrongly-encoded-characters-in-some-.po-files.patch
index 3bcc116,0000000..df4c9f8
mode 100644,000000..100644
--- a/debian/patches/0002-Fixes-wrongly-encoded-characters-in-some-.po-files.patch
+++ b/debian/patches/0002-Fixes-wrongly-encoded-characters-in-some-.po-files.patch
@@@ -1,104 -1,0 +1,64 @@@
- From 7fd0a5bb41e6a9c09ebfa2b21e636d59028daaca Mon Sep 17 00:00:00 2001
++From 72868671fbec84c377d6b63557759e54a5dc8a27 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
++Date: Wed, 13 Dec 2017 16:47:51 +0100
++Subject: Fixes wrongly encoded characters 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
++ allauth/locale/es/LC_MESSAGES/django.po | 2 +-
++ allauth/locale/pt_PT/LC_MESSAGES/django.po | 2 +-
++ allauth/locale/sv/LC_MESSAGES/django.po | 2 +-
++ allauth/locale/tr/LC_MESSAGES/django.po | 2 +-
++ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+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 539e587,0000000..a8bf472
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,2 @@@
+0001-Remove-all-privacy-breack-links-from-documentation.patch
- 0002-Fixes-wrongly-encoded-character-in-some-po-files.patch
++0002-Fixes-wrongly-encoded-characters-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