Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kpublictransport for
openSUSE:Factory checked in at 2023-06-09 20:39:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kpublictransport (Old)
and /work/SRC/openSUSE:Factory/.kpublictransport.new.15902 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpublictransport"
Fri Jun 9 20:39:00 2023 rev:31 rq:1091612 version:23.04.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/kpublictransport/kpublictransport.changes
2023-05-12 20:38:35.214295924 +0200
+++
/work/SRC/openSUSE:Factory/.kpublictransport.new.15902/kpublictransport.changes
2023-06-09 20:41:40.480030538 +0200
@@ -1,0 +2,12 @@
+Tue Jun 6 20:01:27 UTC 2023 - Christophe Marin <[email protected]>
+
+- Update to 23.04.2
+ * New bugfix release
+ * For more details please see:
+ * https://kde.org/announcements/gear/23.04.2/
+- Changes since 23.04.1:
+ * Exclude test input files that don't pass the JSON validation CI step
+ * Drop substring notes during notes merging
+ * Fix typo in parsing expected arrival times in DB Zugportal journeys
+
+-------------------------------------------------------------------
Old:
----
kpublictransport-23.04.1.tar.xz
kpublictransport-23.04.1.tar.xz.sig
New:
----
kpublictransport-23.04.2.tar.xz
kpublictransport-23.04.2.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kpublictransport.spec ++++++
--- /var/tmp/diff_new_pack.EvOEYV/_old 2023-06-09 20:41:41.088034069 +0200
+++ /var/tmp/diff_new_pack.EvOEYV/_new 2023-06-09 20:41:41.092034092 +0200
@@ -20,7 +20,7 @@
%global lname libKPublicTransport%{sover}
%bcond_without released
Name: kpublictransport
-Version: 23.04.1
+Version: 23.04.2
Release: 0
Summary: QML imports for querying public transport data
License: LGPL-2.0-or-later
++++++ kpublictransport-23.04.1.tar.xz -> kpublictransport-23.04.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kpublictransport-23.04.1/.kde-ci.yml
new/kpublictransport-23.04.2/.kde-ci.yml
--- old/kpublictransport-23.04.1/.kde-ci.yml 2023-05-07 05:26:00.000000000
+0200
+++ new/kpublictransport-23.04.2/.kde-ci.yml 2023-06-02 20:35:14.000000000
+0200
@@ -18,3 +18,11 @@
- 'src/lib/knowledgedb/linemetadata_data.cpp'
- 'src/lib/knowledgedb/linemetadata.cpp'
require-passing-tests-on: [ 'Linux', 'FreeBSD', 'Windows' ]
+ json-validate-ignore:
+ - 'autotests/data/hafas/rem-I-JF-sbb-split-layout-train-formation-input.json'
+ - 'autotests/data/hafas/query-location-response-sbb-broken-json.json'
+ - 'autotests/data/navitia/journey-bss-path-no-instr-start-coord.json'
+ - 'autotests/data/ivvass/journey-vrs-input.json'
+ - 'autotests/data/ivvass/journey-long-distance-vrs-input.json'
+ - 'autotests/data/onboard-journey/db-ice.in.json'
+ - 'autotests/data/otp/de-stadtnavi-bike-parking-journey.in.json'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kpublictransport-23.04.1/CMakeLists.txt
new/kpublictransport-23.04.2/CMakeLists.txt
--- old/kpublictransport-23.04.1/CMakeLists.txt 2023-05-07 05:26:00.000000000
+0200
+++ new/kpublictransport-23.04.2/CMakeLists.txt 2023-06-02 20:35:14.000000000
+0200
@@ -6,7 +6,7 @@
# KDE Application Version, managed by release script
set (RELEASE_SERVICE_VERSION_MAJOR "23")
set (RELEASE_SERVICE_VERSION_MINOR "04")
-set (RELEASE_SERVICE_VERSION_MICRO "1")
+set (RELEASE_SERVICE_VERSION_MICRO "2")
set (RELEASE_SERVICE_VERSION
"${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
project(KPublicTransport VERSION ${RELEASE_SERVICE_VERSION})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kpublictransport-23.04.1/autotests/data/onboard-journey/db-zugportal.out.json
new/kpublictransport-23.04.2/autotests/data/onboard-journey/db-zugportal.out.json
---
old/kpublictransport-23.04.1/autotests/data/onboard-journey/db-zugportal.out.json
2023-05-07 05:26:00.000000000 +0200
+++
new/kpublictransport-23.04.2/autotests/data/onboard-journey/db-zugportal.out.json
2023-06-02 20:35:14.000000000 +0200
@@ -4,6 +4,7 @@
"disruptionEffect": "NormalService",
"distance": 0,
"expectedArrivalPlatform": "1",
+ "expectedArrivalTime": "2022-10-07T10:52:00Z",
"expectedDeparturePlatform": "2",
"expectedDepartureTime": "2022-10-07T10:02:00Z",
"from": {
@@ -16,6 +17,7 @@
"intermediateStops": [
{
"disruptionEffect": "NormalService",
+ "expectedArrivalTime": "2022-10-07T10:04:00Z",
"expectedDepartureTime": "2022-10-07T10:04:00Z",
"expectedPlatform": "2",
"scheduledArrivalTime": "2022-10-07T10:04:00Z",
@@ -31,6 +33,7 @@
},
{
"disruptionEffect": "NormalService",
+ "expectedArrivalTime": "2022-10-07T10:05:00Z",
"expectedDepartureTime": "2022-10-07T10:06:00Z",
"expectedPlatform": "2",
"scheduledArrivalTime": "2022-10-07T10:05:00Z",
@@ -46,6 +49,7 @@
},
{
"disruptionEffect": "NormalService",
+ "expectedArrivalTime": "2022-10-07T10:07:00Z",
"expectedDepartureTime": "2022-10-07T10:08:00Z",
"expectedPlatform": "102",
"scheduledArrivalTime": "2022-10-07T10:07:00Z",
@@ -61,6 +65,7 @@
},
{
"disruptionEffect": "NormalService",
+ "expectedArrivalTime": "2022-10-07T10:11:00Z",
"expectedDepartureTime": "2022-10-07T10:12:00Z",
"expectedPlatform": "3",
"scheduledArrivalTime": "2022-10-07T10:11:00Z",
@@ -76,6 +81,7 @@
},
{
"disruptionEffect": "NormalService",
+ "expectedArrivalTime": "2022-10-07T10:13:00Z",
"expectedDepartureTime": "2022-10-07T10:14:00Z",
"expectedPlatform": "2",
"scheduledArrivalTime": "2022-10-07T10:13:00Z",
@@ -91,6 +97,7 @@
},
{
"disruptionEffect": "NormalService",
+ "expectedArrivalTime": "2022-10-07T10:16:00Z",
"expectedDepartureTime": "2022-10-07T10:17:00Z",
"expectedPlatform": "4",
"scheduledArrivalTime": "2022-10-07T10:16:00Z",
@@ -106,6 +113,7 @@
},
{
"disruptionEffect": "NormalService",
+ "expectedArrivalTime": "2022-10-07T10:20:00Z",
"expectedDepartureTime": "2022-10-07T10:20:00Z",
"expectedPlatform": "4",
"scheduledArrivalTime": "2022-10-07T10:20:00Z",
@@ -121,6 +129,7 @@
},
{
"disruptionEffect": "NormalService",
+ "expectedArrivalTime": "2022-10-07T10:23:00Z",
"expectedDepartureTime": "2022-10-07T10:24:00Z",
"expectedPlatform": "2",
"scheduledArrivalTime": "2022-10-07T10:23:00Z",
@@ -136,6 +145,7 @@
},
{
"disruptionEffect": "NormalService",
+ "expectedArrivalTime": "2022-10-07T10:26:00Z",
"expectedDepartureTime": "2022-10-07T10:26:00Z",
"expectedPlatform": "1",
"scheduledArrivalTime": "2022-10-07T10:26:00Z",
@@ -151,6 +161,7 @@
},
{
"disruptionEffect": "NormalService",
+ "expectedArrivalTime": "2022-10-07T10:29:00Z",
"expectedDepartureTime": "2022-10-07T10:29:00Z",
"expectedPlatform": "3",
"scheduledArrivalTime": "2022-10-07T10:29:00Z",
@@ -166,6 +177,7 @@
},
{
"disruptionEffect": "NormalService",
+ "expectedArrivalTime": "2022-10-07T10:33:00Z",
"expectedDepartureTime": "2022-10-07T10:33:00Z",
"expectedPlatform": "1",
"scheduledArrivalTime": "2022-10-07T10:32:00Z",
@@ -181,6 +193,7 @@
},
{
"disruptionEffect": "NormalService",
+ "expectedArrivalTime": "2022-10-07T10:35:00Z",
"expectedDepartureTime": "2022-10-07T10:38:00Z",
"expectedPlatform": "1",
"scheduledArrivalTime": "2022-10-07T10:35:00Z",
@@ -196,6 +209,7 @@
},
{
"disruptionEffect": "NormalService",
+ "expectedArrivalTime": "2022-10-07T10:40:00Z",
"expectedDepartureTime": "2022-10-07T10:41:00Z",
"expectedPlatform": "1",
"scheduledArrivalTime": "2022-10-07T10:40:00Z",
@@ -211,6 +225,7 @@
},
{
"disruptionEffect": "NormalService",
+ "expectedArrivalTime": "2022-10-07T10:43:00Z",
"expectedDepartureTime": "2022-10-07T10:44:00Z",
"expectedPlatform": "2",
"scheduledArrivalTime": "2022-10-07T10:43:00Z",
@@ -226,6 +241,7 @@
},
{
"disruptionEffect": "NormalService",
+ "expectedArrivalTime": "2022-10-07T10:47:00Z",
"expectedDepartureTime": "2022-10-07T10:48:00Z",
"expectedPlatform": "1",
"scheduledArrivalTime": "2022-10-07T10:47:00Z",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kpublictransport-23.04.1/autotests/notestest.cpp
new/kpublictransport-23.04.2/autotests/notestest.cpp
--- old/kpublictransport-23.04.1/autotests/notestest.cpp 2023-05-07
05:26:00.000000000 +0200
+++ new/kpublictransport-23.04.2/autotests/notestest.cpp 2023-06-02
20:35:14.000000000 +0200
@@ -65,13 +65,25 @@
void testNotesMerge()
{
- Stopover dep1;
- Stopover dep2;
- dep1.addNote(s("line1"));
- dep2.addNotes({s("line2"), s("line1")});
+ {
+ Stopover dep1;
+ Stopover dep2;
+ dep1.addNote(s("line1"));
+ dep2.addNotes({s("line2"), s("line1")});
- const auto dep3 = Stopover::merge(dep1, dep2);
- QCOMPARE(dep3.notes(), QStringList({s("line1"), s("line2")}));
+ const auto dep3 = Stopover::merge(dep1, dep2);
+ QCOMPARE(dep3.notes(), QStringList({s("line1"), s("line2")}));
+ }
+
+ {
+ Stopover dep1;
+ Stopover dep2;
+ dep1.addNote(s("line1 - detail"));
+ dep2.addNotes({s("line2"), s("line1")});
+
+ const auto dep3 = Stopover::merge(dep1, dep2);
+ QCOMPARE(dep3.notes(), QStringList({s("line1 - detail"),
s("line2")}));
+ }
}
void testNormalize_data()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kpublictransport-23.04.1/src/lib/datatypes/notesutil.cpp
new/kpublictransport-23.04.2/src/lib/datatypes/notesutil.cpp
--- old/kpublictransport-23.04.1/src/lib/datatypes/notesutil.cpp
2023-05-07 05:26:00.000000000 +0200
+++ new/kpublictransport-23.04.2/src/lib/datatypes/notesutil.cpp
2023-06-02 20:35:14.000000000 +0200
@@ -94,8 +94,9 @@
auto res = lhs;
for (const auto &r : rhs) {
- if (!res.contains(r)) {
- res.push_back(r);
+ const auto idx = NotesUtil::needsAdding(res, r);
+ if (idx >= 0) {
+ NotesUtil::performAdd(res, r, idx);
}
}
return res;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kpublictransport-23.04.1/src/onboard/data/deutschebahn.js
new/kpublictransport-23.04.2/src/onboard/data/deutschebahn.js
--- old/kpublictransport-23.04.1/src/onboard/data/deutschebahn.js
2023-05-07 05:26:00.000000000 +0200
+++ new/kpublictransport-23.04.2/src/onboard/data/deutschebahn.js
2023-06-02 20:35:14.000000000 +0200
@@ -86,7 +86,7 @@
}
if (s.arrivalTime) {
stop.scheduledArrivalTime = s.arrivalTime.target;
- stop.expectedArrivalTime = s.arrivalTime.predicte;
+ stop.expectedArrivalTime = s.arrivalTime.predicted;
}
// TODO messages [] - no example whats in there yet, status !=
"Normal"?
section.intermediateStops.push(stop);
