Merge pull request #4 from iRail/upgrade-1.2

Upgrade 1.2
iRail · Aug 3, 2017 · 10fb637 · 10fb637
2 parents 170ae8e + 9076638
commit 10fb637
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 814 deletions.
diff --git a/harbour-berail.pro b/harbour-berail.pro
@@ -34,7 +34,8 @@ CONFIG += sailfishapp_i18n
 # planning to localize your app, remember to comment out the
 # following TRANSLATIONS line. And also do not forget to
 # modify the localized app name in the the .desktop file.
-TRANSLATIONS += translations/harbour-berail-de.ts
+TRANSLATIONS += translations/harbour-berail-de.ts \
+translations/harbour-berail-nl.ts
 
 DISTFILES += \
     qml/pages/AboutPage.qml \

diff --git a/harbour-berail.pro.user b/harbour-berail.pro.user
diff --git a/qml/pages/StationListPage.qml b/qml/pages/StationListPage.qml
diff --git a/rpm/harbour-berail.changes b/rpm/harbour-berail.changes
@@ -8,6 +8,11 @@
 # * date Author's Name <author's email> version-release
 # - Summary of changes
 
+* Mon Jun 12 2017 Dylan Van Assche <[email protected]> 1.2-1
+- [MINOR BUGFIX] Fixed NL translation
+- [IMPROVEMENT] Updated to the latest station list
+- [STORE] Fix harbour issues
+
 * Mon Jun 06 2017 Dylan Van Assche <[email protected]> 1.1-2
 - [MINOR BUGFIX] Remove disturbances duplicates in Liveboard
 

diff --git a/rpm/harbour-berail.spec b/rpm/harbour-berail.spec
@@ -13,14 +13,16 @@ Name:       harbour-berail
 %{!?qtc_make:%define qtc_make make}
 %{?qtc_builddir:%define _builddir %qtc_builddir}
 Summary:    BeRail
-Version:    1.1
-Release:    2
+Version:    1.2
+Release:    1
 Group:      Qt/Qt
 License:    LICENSE
 URL:        http://example.org/
 Source0:    %{name}-%{version}.tar.bz2
 Source100:  harbour-berail.yaml
 Requires:   sailfishsilica-qt5 >= 0.10.9
+Requires:   pyotherside-qml-plugin-python3-qt5 >= 1.2.0
+Requires:   nemo-qml-plugin-configuration-qt5 >= 0.0.1
 BuildRequires:  pkgconfig(sailfishapp) >= 1.0.2
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Qml)

diff --git a/rpm/harbour-berail.yaml b/rpm/harbour-berail.yaml
@@ -1,7 +1,7 @@
 Name: harbour-berail
 Summary: BeRail
-Version: 1.1
-Release: 2
+Version: 1.2
+Release: 1
 # The contents of the Group field should be one of the groups listed here:
 # http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS
 Group: Qt/Qt
@@ -32,6 +32,8 @@ PkgConfigBR:
 # Runtime dependencies which are not automatically detected
 Requires:
   - sailfishsilica-qt5 >= 0.10.9 
+  - pyotherside-qml-plugin-python3-qt5 >= 1.2.0
+  - nemo-qml-plugin-configuration-qt5 >= 0.0.1 #Jolla Harbour only 2.1.0.X and higher
 
 # All installed files
 Files:

diff --git a/translations/harbour-berail-de.ts b/translations/harbour-berail-de.ts
@@ -1,4 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="de" version="2.1">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="de">
 <context>
     <name>AboutPage</name>
     <message>

diff --git a/translations/harbour-berail-nl.ts b/translations/harbour-berail-nl.ts
@@ -1,4 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl" version="2.1">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="nl">
 <context>
     <name>AboutPage</name>
     <message>