[Python-modules-commits] [django-recurrence] 06/09: merge patched into master

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository django-recurrence.

commit a025bf40dd021ddcef490e0eca199799a4369e6e
Merge: ea65412 718bf26
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Wed Oct 19 13:30:24 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...-Make-PO-Revision-Date-parseable-by-babel.patch | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 recurrence/locale/eu/LC_MESSAGES/django.po         |  2 +-
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index d8c8ffb,0000000..68ba47b
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
- 961b7a8474a9f6fd2864d96287b334d4950bccaf
- 961b7a8474a9f6fd2864d96287b334d4950bccaf
++718bf26dd420b03e9ad22f6bd33ad4b5c95f6a81
++718bf26dd420b03e9ad22f6bd33ad4b5c95f6a81
 +961b7a8474a9f6fd2864d96287b334d4950bccaf
 +961b7a8474a9f6fd2864d96287b334d4950bccaf
 +django-recurrence_1.4.0.orig.tar.gz
 +ed5b43ac06154977ffda0841f57350213fb38987
 +90175
diff --cc debian/patches/0001-Make-PO-Revision-Date-parseable-by-babel.patch
index 0000000,0000000..b8be678
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Make-PO-Revision-Date-parseable-by-babel.patch
@@@ -1,0 -1,0 +1,24 @@@
++From 718bf26dd420b03e9ad22f6bd33ad4b5c95f6a81 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Mon, 17 Oct 2016 10:10:47 +0200
++Subject: Make PO-Revision-Date parseable by babel.
++
++Babel does not accoutn for a ":" in the timezone, raising a ValueError exception
++when one tries to compile the catalog.
++---
++ recurrence/locale/eu/LC_MESSAGES/django.po | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/recurrence/locale/eu/LC_MESSAGES/django.po b/recurrence/locale/eu/LC_MESSAGES/django.po
++index 9040b61..921a4b4 100644
++--- a/recurrence/locale/eu/LC_MESSAGES/django.po
+++++ b/recurrence/locale/eu/LC_MESSAGES/django.po
++@@ -8,7 +8,7 @@ msgstr ""
++ "Project-Id-Version: 1.3.0\n"
++ "Report-Msgid-Bugs-To: \n"
++ "POT-Creation-Date: 2016-05-14 17:08+0000\n"
++-"PO-Revision-Date: 2016-05-14 19:21+01:00\n"
+++"PO-Revision-Date: 2016-05-14 19:21+0100\n"
++ "Last-Translator: Unai Zalakain <unai at gisa-elkartea.org>\n"
++ "Language: eu\n"
++ "MIME-Version: 1.0\n"
diff --cc debian/patches/series
index 0000000,0000000..7be06d6
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Make-PO-Revision-Date-parseable-by-babel.patch

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