[Python-modules-commits] [python-django-ordered-model] 03/06: 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 python-django-ordered-model.

commit 554da6d4c4e163fc59f27aa450b2f50ebfdd9563
Merge: 52dc83f c184261
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Thu Jul 13 13:48:07 2017 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...f-Language-fields-for-django.po-files-and.patch | 52 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 ordered_model/locale/de/LC_MESSAGES/django.po      |  3 +-
 ordered_model/locale/pl/LC_MESSAGES/django.po      |  3 +-
 5 files changed, 57 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index 0518eac,0000000..f27150f
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
- 4f03b50549e46412ea5b3b4092f405212465df20
- 4f03b50549e46412ea5b3b4092f405212465df20
++c1842610b629b09e6eed5ebe0fcac5a408a732d0
++c1842610b629b09e6eed5ebe0fcac5a408a732d0
 +6b0ddf8f574e46df5579a4a67d78d6e8c9bf6117
 +6b0ddf8f574e46df5579a4a67d78d6e8c9bf6117
 +python-django-ordered-model_1.4.1.orig.tar.gz
 +be69676c90336df1fca79a7800037b1a74e10021
 +14998
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Fix-value-of-Language-fields-for-django.po-files-and.patch
index 0000000,0000000..09b5d98
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Fix-value-of-Language-fields-for-django.po-files-and.patch
@@@ -1,0 -1,0 +1,52 @@@
++From c1842610b629b09e6eed5ebe0fcac5a408a732d0 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Thu, 13 Jul 2017 13:48:00 +0200
++Subject: Fix value of Language fields for django.po files and unfuzzy them.
++
++---
++ ordered_model/locale/de/LC_MESSAGES/django.po | 3 +--
++ ordered_model/locale/pl/LC_MESSAGES/django.po | 3 +--
++ 2 files changed, 2 insertions(+), 4 deletions(-)
++
++diff --git a/ordered_model/locale/de/LC_MESSAGES/django.po b/ordered_model/locale/de/LC_MESSAGES/django.po
++index 570cac0..769fee5 100644
++--- a/ordered_model/locale/de/LC_MESSAGES/django.po
+++++ b/ordered_model/locale/de/LC_MESSAGES/django.po
++@@ -3,7 +3,6 @@
++ # This file is distributed under the same license as the PACKAGE package.
++ # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
++ #
++-#, fuzzy
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: PACKAGE VERSION\n"
++@@ -12,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: de\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++ "Content-Transfer-Encoding: 8bit\n"
++diff --git a/ordered_model/locale/pl/LC_MESSAGES/django.po b/ordered_model/locale/pl/LC_MESSAGES/django.po
++index 1c8f4f9..1828655 100644
++--- a/ordered_model/locale/pl/LC_MESSAGES/django.po
+++++ b/ordered_model/locale/pl/LC_MESSAGES/django.po
++@@ -3,7 +3,6 @@
++ # This file is distributed under the same license as the PACKAGE package.
++ # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
++ #
++-#, fuzzy
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: PACKAGE VERSION\n"
++@@ -12,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: pl\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 25a7eb6,0000000..6e8521b
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Use-io.open-for-Python3-support.patch
++0002-Fix-value-of-Language-fields-for-django.po-files-and.patch

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