[Python-modules-commits] [python-django-ordered-model] 01/06: Convert from git-dpm to patches unapplied format

Michael Fladischer fladi at moszumanska.debian.org
Fri Sep 1 12:08:20 UTC 2017


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

fladi pushed a commit to branch debian/master
in repository python-django-ordered-model.

commit 041d1fd39e72c2e05f79fa57a78893448cca8664
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri Sep 1 13:34:43 2017 +0200

    Convert from git-dpm to patches unapplied format
---
 debian/.git-dpm                               | 11 -----------
 debian/gbp.conf                               |  2 ++
 ordered_model/locale/de/LC_MESSAGES/django.po |  3 ++-
 ordered_model/locale/pl/LC_MESSAGES/django.po |  3 ++-
 setup.py                                      |  3 +--
 5 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index f27150f..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,11 +0,0 @@
-# see git-dpm(1) from git-dpm package
-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 --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..3879982
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+debian-branch=debian/master
diff --git a/ordered_model/locale/de/LC_MESSAGES/django.po b/ordered_model/locale/de/LC_MESSAGES/django.po
index 769fee5..570cac0 100644
--- a/ordered_model/locale/de/LC_MESSAGES/django.po
+++ b/ordered_model/locale/de/LC_MESSAGES/django.po
@@ -3,6 +3,7 @@
 # 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"
@@ -11,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: de\n"
+"Language: \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 1828655..1c8f4f9 100644
--- a/ordered_model/locale/pl/LC_MESSAGES/django.po
+++ b/ordered_model/locale/pl/LC_MESSAGES/django.po
@@ -3,6 +3,7 @@
 # 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"
@@ -11,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: pl\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/setup.py b/setup.py
index debefa3..b99e2a0 100644
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-import io
 from setuptools import setup
 
-with io.open('requirements.txt', encoding='utf-8') as f:
+with open('requirements.txt') as f:
     requires = f.read().splitlines()
 
 setup(

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



More information about the Python-modules-commits mailing list