Skip to content
This repository was archived by the owner on Jul 22, 2021. It is now read-only.

Commit 10fb637

Browse files
Merge pull request #4 from iRail/upgrade-1.2
Upgrade 1.2
2 parents 170ae8e + 9076638 commit 10fb637

File tree

8 files changed

+25
-814
lines changed

8 files changed

+25
-814
lines changed

harbour-berail.pro

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ CONFIG += sailfishapp_i18n
3434
# planning to localize your app, remember to comment out the
3535
# following TRANSLATIONS line. And also do not forget to
3636
# modify the localized app name in the the .desktop file.
37-
TRANSLATIONS += translations/harbour-berail-de.ts
37+
TRANSLATIONS += translations/harbour-berail-de.ts \
38+
translations/harbour-berail-nl.ts
3839

3940
DISTFILES += \
4041
qml/pages/AboutPage.qml \

harbour-berail.pro.user

Lines changed: 0 additions & 803 deletions
This file was deleted.

qml/pages/StationListPage.qml

Lines changed: 4 additions & 4 deletions
Large diffs are not rendered by default.

rpm/harbour-berail.changes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
# * date Author's Name <author's email> version-release
99
# - Summary of changes
1010

11+
* Mon Jun 12 2017 Dylan Van Assche <dylan.van.assche@protonmail.com.com> 1.2-1
12+
- [MINOR BUGFIX] Fixed NL translation
13+
- [IMPROVEMENT] Updated to the latest station list
14+
- [STORE] Fix harbour issues
15+
1116
* Mon Jun 06 2017 Dylan Van Assche <dylan.van.assche@protonmail.com.com> 1.1-2
1217
- [MINOR BUGFIX] Remove disturbances duplicates in Liveboard
1318

rpm/harbour-berail.spec

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,16 @@ Name: harbour-berail
1313
%{!?qtc_make:%define qtc_make make}
1414
%{?qtc_builddir:%define _builddir %qtc_builddir}
1515
Summary: BeRail
16-
Version: 1.1
17-
Release: 2
16+
Version: 1.2
17+
Release: 1
1818
Group: Qt/Qt
1919
License: LICENSE
2020
URL: http://example.org/
2121
Source0: %{name}-%{version}.tar.bz2
2222
Source100: harbour-berail.yaml
2323
Requires: sailfishsilica-qt5 >= 0.10.9
24+
Requires: pyotherside-qml-plugin-python3-qt5 >= 1.2.0
25+
Requires: nemo-qml-plugin-configuration-qt5 >= 0.0.1
2426
BuildRequires: pkgconfig(sailfishapp) >= 1.0.2
2527
BuildRequires: pkgconfig(Qt5Core)
2628
BuildRequires: pkgconfig(Qt5Qml)

rpm/harbour-berail.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Name: harbour-berail
22
Summary: BeRail
3-
Version: 1.1
4-
Release: 2
3+
Version: 1.2
4+
Release: 1
55
# The contents of the Group field should be one of the groups listed here:
66
# http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS
77
Group: Qt/Qt
@@ -32,6 +32,8 @@ PkgConfigBR:
3232
# Runtime dependencies which are not automatically detected
3333
Requires:
3434
- sailfishsilica-qt5 >= 0.10.9
35+
- pyotherside-qml-plugin-python3-qt5 >= 1.2.0
36+
- nemo-qml-plugin-configuration-qt5 >= 0.0.1 #Jolla Harbour only 2.1.0.X and higher
3537

3638
# All installed files
3739
Files:

translations/harbour-berail-de.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<?xml version="1.0" ?><!DOCTYPE TS><TS language="de" version="2.1">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!DOCTYPE TS>
3+
<TS version="2.1" language="de">
24
<context>
35
<name>AboutPage</name>
46
<message>

translations/harbour-berail-nl.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl" version="2.1">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!DOCTYPE TS>
3+
<TS version="2.1" language="nl">
24
<context>
35
<name>AboutPage</name>
46
<message>

0 commit comments

Comments
 (0)