[Python-modules-commits] [django-sitetree] 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-sitetree.

commit ede2ecb98df15395d68e43f94cffd174c76a58e5
Merge: 2c20b2c b7e1630
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Thu Jul 13 14:56:54 2017 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...ue-of-Language-fields-for-django.po-files.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 sitetree/locale/en/LC_MESSAGES/django.po           |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 4a74599,0000000..452289d
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
- d2459a9b3307ba081db6e460a9a6f0973b53e9ee
- d2459a9b3307ba081db6e460a9a6f0973b53e9ee
++b7e1630719f02d2d938d15442af96e933bbec6d1
++b7e1630719f02d2d938d15442af96e933bbec6d1
 +d2459a9b3307ba081db6e460a9a6f0973b53e9ee
 +d2459a9b3307ba081db6e460a9a6f0973b53e9ee
 +django-sitetree_1.8.0+dfsg.orig.tar.gz
 +b03f6b98613dbc46825f41195a019f0ce1b424cb
 +77062
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Fix-value-of-Language-fields-for-django.po-files.patch
index 0000000,0000000..a061708
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Fix-value-of-Language-fields-for-django.po-files.patch
@@@ -1,0 -1,0 +1,22 @@@
++From b7e1630719f02d2d938d15442af96e933bbec6d1 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Thu, 13 Jul 2017 14:56:51 +0200
++Subject: Fix value of Language fields for django.po files.
++
++---
++ sitetree/locale/en/LC_MESSAGES/django.po | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/sitetree/locale/en/LC_MESSAGES/django.po b/sitetree/locale/en/LC_MESSAGES/django.po
++index 91410dd..a9c7302 100644
++--- a/sitetree/locale/en/LC_MESSAGES/django.po
+++++ b/sitetree/locale/en/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: en\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 0000000,0000000..46884be
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Fix-value-of-Language-fields-for-django.po-files.patch

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