[Python-modules-commits] [django-reversion] 08/09: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Thu Jun 22 08:20:01 UTC 2017
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository django-reversion.
commit 6c2060233ce64ccfbc80541f0812f997c4f4b640
Merge: 49360d8 ec9955a
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Thu Jun 22 10:06:36 2017 +0200
merge patched into master
debian/.git-dpm | 4 +-
...Set-missing-Language-property-on-catalogs.patch | 185 +++++++++++++++++++++
debian/patches/series | 1 +
reversion/locale/ar/LC_MESSAGES/django.po | 2 +-
reversion/locale/cs/LC_MESSAGES/django.po | 1 +
reversion/locale/da/LC_MESSAGES/django.po | 2 +-
reversion/locale/de/LC_MESSAGES/django.po | 1 +
reversion/locale/he/LC_MESSAGES/django.po | 1 +
reversion/locale/it/LC_MESSAGES/django.po | 1 +
reversion/locale/nb/LC_MESSAGES/django.po | 2 +-
reversion/locale/pt_BR/LC_MESSAGES/django.po | 1 +
reversion/locale/ru/LC_MESSAGES/django.po | 1 +
reversion/locale/sk/LC_MESSAGES/django.po | 2 +-
reversion/locale/sv/LC_MESSAGES/django.po | 2 +-
reversion/locale/zh_CN/LC_MESSAGES/django.po | 2 +-
reversion/locale/zh_Hans/LC_MESSAGES/django.po | 2 +-
16 files changed, 201 insertions(+), 9 deletions(-)
diff --cc debian/.git-dpm
index 6fabc3a,0000000..647549d
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- b96c3c6a76080533f574a54325130e5b9c2f6b5e
- b96c3c6a76080533f574a54325130e5b9c2f6b5e
++ec9955ac0791b9810921d6be99a39a6f73f165d6
++ec9955ac0791b9810921d6be99a39a6f73f165d6
+181bad9c2b1870ecb6d5cffdb213051ff145bc19
+181bad9c2b1870ecb6d5cffdb213051ff145bc19
+django-reversion_2.0.9.orig.tar.gz
+e4b064d8d17e340eff261667b2cf87a813e3042a
+63357
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Set-missing-Language-property-on-catalogs.patch
index 0000000,0000000..95b1f76
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Set-missing-Language-property-on-catalogs.patch
@@@ -1,0 -1,0 +1,185 @@@
++From ec9955ac0791b9810921d6be99a39a6f73f165d6 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Thu, 22 Jun 2017 10:06:02 +0200
++Subject: Set missing Language property on catalogs.
++
++This prevents babel from failing to compile during build.
++---
++ reversion/locale/ar/LC_MESSAGES/django.po | 2 +-
++ reversion/locale/cs/LC_MESSAGES/django.po | 1 +
++ reversion/locale/da/LC_MESSAGES/django.po | 2 +-
++ reversion/locale/de/LC_MESSAGES/django.po | 1 +
++ reversion/locale/he/LC_MESSAGES/django.po | 1 +
++ reversion/locale/it/LC_MESSAGES/django.po | 1 +
++ reversion/locale/nb/LC_MESSAGES/django.po | 2 +-
++ reversion/locale/pt_BR/LC_MESSAGES/django.po | 1 +
++ reversion/locale/ru/LC_MESSAGES/django.po | 1 +
++ reversion/locale/sk/LC_MESSAGES/django.po | 2 +-
++ reversion/locale/sv/LC_MESSAGES/django.po | 2 +-
++ reversion/locale/zh_CN/LC_MESSAGES/django.po | 2 +-
++ reversion/locale/zh_Hans/LC_MESSAGES/django.po | 2 +-
++ 13 files changed, 13 insertions(+), 7 deletions(-)
++
++diff --git a/reversion/locale/ar/LC_MESSAGES/django.po b/reversion/locale/ar/LC_MESSAGES/django.po
++index 07ebf72..7213596 100644
++--- a/reversion/locale/ar/LC_MESSAGES/django.po
+++++ b/reversion/locale/ar/LC_MESSAGES/django.po
++@@ -11,7 +11,7 @@ msgstr ""
++ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
++ "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
++ "Language-Team: LANGUAGE <LL at li.org>\n"
++-"Language: \n"
+++"Language: ar\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++ "Content-Transfer-Encoding: 8bit\n"
++diff --git a/reversion/locale/cs/LC_MESSAGES/django.po b/reversion/locale/cs/LC_MESSAGES/django.po
++index 94bc354..95497d5 100644
++--- a/reversion/locale/cs/LC_MESSAGES/django.po
+++++ b/reversion/locale/cs/LC_MESSAGES/django.po
++@@ -11,6 +11,7 @@ msgstr ""
++ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
++ "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
++ "Language-Team: LANGUAGE <LL at li.org>\n"
+++"Language: cs\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++ "Content-Transfer-Encoding: 8bit\n"
++diff --git a/reversion/locale/da/LC_MESSAGES/django.po b/reversion/locale/da/LC_MESSAGES/django.po
++index 074b908..bcae256 100644
++--- a/reversion/locale/da/LC_MESSAGES/django.po
+++++ b/reversion/locale/da/LC_MESSAGES/django.po
++@@ -12,7 +12,7 @@ msgstr ""
++ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
++ "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
++ "Language-Team: LANGUAGE <LL at li.org>\n"
++-"Language: \n"
+++"Language: da\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++ "Content-Transfer-Encoding: 8bit\n"
++diff --git a/reversion/locale/de/LC_MESSAGES/django.po b/reversion/locale/de/LC_MESSAGES/django.po
++index dee2e8f..adaed4e 100644
++--- a/reversion/locale/de/LC_MESSAGES/django.po
+++++ b/reversion/locale/de/LC_MESSAGES/django.po
++@@ -11,6 +11,7 @@ msgstr ""
++ "PO-Revision-Date: 2009-02-03 08:41+0100\n"
++ "Last-Translator: Jannis Leidel <jannis at leidel.info>\n"
++ "Language-Team: LANGUAGE <LL at li.org>\n"
+++"Language: de\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++ "Content-Transfer-Encoding: 8bit\n"
++diff --git a/reversion/locale/he/LC_MESSAGES/django.po b/reversion/locale/he/LC_MESSAGES/django.po
++index 3624f02..a346736 100644
++--- a/reversion/locale/he/LC_MESSAGES/django.po
+++++ b/reversion/locale/he/LC_MESSAGES/django.po
++@@ -11,6 +11,7 @@ msgstr ""
++ "PO-Revision-Date: 2009-12-10 10:45+0200\n"
++ "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
++ "Language-Team: LANGUAGE <LL at li.org>\n"
+++"Language: he\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++ "Content-Transfer-Encoding: 8bit\n"
++diff --git a/reversion/locale/it/LC_MESSAGES/django.po b/reversion/locale/it/LC_MESSAGES/django.po
++index 13a1526..545ee5f 100644
++--- a/reversion/locale/it/LC_MESSAGES/django.po
+++++ b/reversion/locale/it/LC_MESSAGES/django.po
++@@ -11,6 +11,7 @@ msgstr ""
++ "PO-Revision-Date: 2009-08-29 13:44+0100\n"
++ "Last-Translator: Marco Beri <marcoberi at gmail.com>\n"
++ "Language-Team: LANGUAGE <LL at li.org>\n"
+++"Language: it\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++ "Content-Transfer-Encoding: 8bit\n"
++diff --git a/reversion/locale/nb/LC_MESSAGES/django.po b/reversion/locale/nb/LC_MESSAGES/django.po
++index 5de5ded..16a6aae 100644
++--- a/reversion/locale/nb/LC_MESSAGES/django.po
+++++ b/reversion/locale/nb/LC_MESSAGES/django.po
++@@ -10,7 +10,7 @@ msgstr ""
++ "PO-Revision-Date: 2011-10-17 10:17+0100\n"
++ "Last-Translator: Sindre Sorhus <sindresorhus at gmail.com>\n"
++ "Language-Team: \n"
++-"Language: \n"
+++"Language: nb\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++ "Content-Transfer-Encoding: 8bit\n"
++diff --git a/reversion/locale/pt_BR/LC_MESSAGES/django.po b/reversion/locale/pt_BR/LC_MESSAGES/django.po
++index 76c4679..f5319d2 100644
++--- a/reversion/locale/pt_BR/LC_MESSAGES/django.po
+++++ b/reversion/locale/pt_BR/LC_MESSAGES/django.po
++@@ -11,6 +11,7 @@ msgstr ""
++ "PO-Revision-Date: 2009-08-29 13:44+0100\n"
++ "Last-Translator: Partec <beto at tangerinalab.com>\n"
++ "Language-Team: Tangerina Lab <beto at tangerinalab.com>\n"
+++"Language: pt_BR\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++ "Content-Transfer-Encoding: 8bit\n"
++diff --git a/reversion/locale/ru/LC_MESSAGES/django.po b/reversion/locale/ru/LC_MESSAGES/django.po
++index 68f15ca..8757d28 100644
++--- a/reversion/locale/ru/LC_MESSAGES/django.po
+++++ b/reversion/locale/ru/LC_MESSAGES/django.po
++@@ -11,6 +11,7 @@ msgstr ""
++ "PO-Revision-Date: 2009-10-14 22:21+0300\n"
++ "Last-Translator: Alexander Yakovlev <ayakovlev at rambler.ru>\n"
++ "Language-Team: Russian <ru at li.org>\n"
+++"Language: ru\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++ "Content-Transfer-Encoding: 8bit\n"
++diff --git a/reversion/locale/sk/LC_MESSAGES/django.po b/reversion/locale/sk/LC_MESSAGES/django.po
++index f6750fb..a1b7d28 100644
++--- a/reversion/locale/sk/LC_MESSAGES/django.po
+++++ b/reversion/locale/sk/LC_MESSAGES/django.po
++@@ -12,7 +12,7 @@ msgstr ""
++ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
++ "Last-Translator: Juraj Bubniak <translations at jbub.eu>\n"
++ "Language-Team: Slovak <LL at li.org>\n"
++-"Language: \n"
+++"Language: sk\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++ "Content-Transfer-Encoding: 8bit\n"
++diff --git a/reversion/locale/sv/LC_MESSAGES/django.po b/reversion/locale/sv/LC_MESSAGES/django.po
++index 9e696fe..44d7955 100644
++--- a/reversion/locale/sv/LC_MESSAGES/django.po
+++++ b/reversion/locale/sv/LC_MESSAGES/django.po
++@@ -12,7 +12,7 @@ msgstr ""
++ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
++ "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
++ "Language-Team: LANGUAGE <LL at li.org>\n"
++-"Language: \n"
+++"Language: sv\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++ "Content-Transfer-Encoding: 8bit\n"
++diff --git a/reversion/locale/zh_CN/LC_MESSAGES/django.po b/reversion/locale/zh_CN/LC_MESSAGES/django.po
++index 75e7231..567e0b8 100644
++--- a/reversion/locale/zh_CN/LC_MESSAGES/django.po
+++++ b/reversion/locale/zh_CN/LC_MESSAGES/django.po
++@@ -12,7 +12,7 @@ msgstr ""
++ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
++ "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
++ "Language-Team: LANGUAGE <LL at li.org>\n"
++-"Language: \n"
+++"Language: zh_CN\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++ "Content-Transfer-Encoding: 8bit\n"
++diff --git a/reversion/locale/zh_Hans/LC_MESSAGES/django.po b/reversion/locale/zh_Hans/LC_MESSAGES/django.po
++index 75e7231..284f980 100644
++--- a/reversion/locale/zh_Hans/LC_MESSAGES/django.po
+++++ b/reversion/locale/zh_Hans/LC_MESSAGES/django.po
++@@ -12,7 +12,7 @@ msgstr ""
++ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
++ "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
++ "Language-Team: LANGUAGE <LL at li.org>\n"
++-"Language: \n"
+++"Language: zh_Hans\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++ "Content-Transfer-Encoding: 8bit\n"
diff --cc debian/patches/series
index 2d30ab2,0000000..a472353
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
+0001-Skip-postgresql-and-mysql-tests.patch
++0002-Set-missing-Language-property-on-catalogs.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-reversion.git
More information about the Python-modules-commits
mailing list