Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kitinerary for openSUSE:Factory checked in at 2021-02-07 15:15:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kitinerary (Old) and /work/SRC/openSUSE:Factory/.kitinerary.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kitinerary" Sun Feb 7 15:15:18 2021 rev:32 rq:869340 version:20.12.2 Changes: -------- --- /work/SRC/openSUSE:Factory/kitinerary/kitinerary.changes 2021-01-08 17:36:36.084850314 +0100 +++ /work/SRC/openSUSE:Factory/.kitinerary.new.28504/kitinerary.changes 2021-02-07 15:15:43.725496129 +0100 @@ -1,0 +2,10 @@ +Wed Feb 3 08:28:50 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 20.12.2 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/releases/2021-02-apps-update +- Changes since 20.12.1: + * Handle Accor reservation without a hotel phone number + +------------------------------------------------------------------- Old: ---- kitinerary-20.12.1.tar.xz kitinerary-20.12.1.tar.xz.sig New: ---- kitinerary-20.12.2.tar.xz kitinerary-20.12.2.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kitinerary.spec ++++++ --- /var/tmp/diff_new_pack.TmWfE0/_old 2021-02-07 15:15:44.485496942 +0100 +++ /var/tmp/diff_new_pack.TmWfE0/_new 2021-02-07 15:15:44.489496946 +0100 @@ -18,7 +18,7 @@ %bcond_without lang Name: kitinerary -Version: 20.12.1 +Version: 20.12.2 Release: 0 Summary: Data model and extraction system for travel reservations License: LGPL-2.1-or-later ++++++ applications.keyring ++++++ Binary files /var/tmp/diff_new_pack.TmWfE0/_old and /var/tmp/diff_new_pack.TmWfE0/_new differ ++++++ kitinerary-20.12.1.tar.xz -> kitinerary-20.12.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-20.12.1/CMakeLists.txt new/kitinerary-20.12.2/CMakeLists.txt --- old/kitinerary-20.12.1/CMakeLists.txt 2021-01-02 15:34:24.000000000 +0100 +++ new/kitinerary-20.12.2/CMakeLists.txt 2021-01-29 21:28:05.000000000 +0100 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.16.1") +set(PIM_VERSION "5.16.2") project(KItinerary VERSION ${PIM_VERSION}) set(CMAKE_CXX_STANDARD 17) @@ -36,8 +36,8 @@ find_package(SharedMimeInfo 1.3 REQUIRED) endif() -set(KMIME_VERSION "5.16.1") -set(PIM_PKPASS "5.16.1") +set(KMIME_VERSION "5.16.2") +set(PIM_PKPASS "5.16.2") find_package(KF5Mime ${KMIME_VERSION} CONFIG REQUIRED) find_package(KF5CalendarCore ${KF5_MIN_VERSION} CONFIG) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-20.12.1/po/ru/kitinerary.po new/kitinerary-20.12.2/po/ru/kitinerary.po --- old/kitinerary-20.12.1/po/ru/kitinerary.po 2021-01-05 02:26:43.000000000 +0100 +++ new/kitinerary-20.12.2/po/ru/kitinerary.po 2021-02-02 01:55:06.000000000 +0100 @@ -2,13 +2,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Alexander Potashev <[email protected]>, 2018. +# Alexander Yavorsky <[email protected]>, 2021. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-07-01 02:16+0200\n" -"PO-Revision-Date: 2018-07-05 18:01+0300\n" -"Last-Translator: Alexander Potashev <[email protected]>\n" +"PO-Revision-Date: 2021-01-17 13:41+0300\n" +"Last-Translator: Alexander Yavorsky <[email protected]>\n" "Language-Team: Russian <[email protected]>\n" "Language: ru\n" "MIME-Version: 1.0\n" @@ -16,14 +17,13 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n" "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 20.12.1\n" #: calendarhandler.cpp:187 -#, fuzzy, kde-format -#| msgid "Coach: %1" +#, kde-format msgctxt "canceled train/flight/loding reservation" msgid "Canceled: %1" -msgstr "??????????: %1" +msgstr "????????????????: %1" #: calendarhandler.cpp:217 #, kde-format @@ -99,28 +99,27 @@ #: calendarhandler.cpp:347 #, kde-format msgid "Check-in: %1" -msgstr "" +msgstr "?????????????????????? ????????????: %1" #: calendarhandler.cpp:350 #, kde-format msgid "Check-out: %1" -msgstr "" +msgstr "?????????????????????? ??????????????: %1" #: calendarhandler.cpp:353 #, kde-format msgid "Phone: %1" -msgstr "" +msgstr "??????????????: %1" #: calendarhandler.cpp:356 #, kde-format msgid "Email: %1" -msgstr "" +msgstr "?????????? ????. ??????????: %1" #: calendarhandler.cpp:359 -#, fuzzy, kde-format -#| msgid "Seat: %1" +#, kde-format msgid "Website: %1" -msgstr "??????????: %1" +msgstr "??????-????????: %1" #: calendarhandler.cpp:402 #, kde-format @@ -128,38 +127,34 @@ msgstr "" #: calendarhandler.cpp:448 -#, fuzzy, kde-format -#| msgid "Hotel reservation: %1" +#, kde-format msgid "Restaurant reservation: %1" -msgstr "???????????????????????? ??????????????????: %1" +msgstr "???????????????????????? ??????????????????: %1" #: calendarhandler.cpp:462 #, kde-format msgid "Number Of People: %1" -msgstr "" +msgstr "???????????????????? ??????????????????????: %1" #: calendarhandler.cpp:465 -#, fuzzy, kde-format -#| msgid "Booking reference: %1" +#, kde-format msgid "Reservation reference: %1" msgstr "?????? ????????????????????????: %1" #: calendarhandler.cpp:469 #, kde-format msgid "Under name: %1" -msgstr "" +msgstr "?????? ?????? ????????????????????????????: %1" #: calendarhandler.cpp:479 -#, fuzzy, kde-format -#| msgid "Hotel reservation: %1" +#, kde-format msgid "Rental Car reservation: %1" -msgstr "???????????????????????? ??????????????????: %1" +msgstr "???????????????????????? ???????????????????? ?? ????????????: %1" #: calendarhandler.cpp:487 -#, fuzzy, kde-format -#| msgid "Hotel reservation: %1" +#, kde-format msgid "Rent car reservation: %1" -msgstr "???????????????????????? ??????????????????: %1" +msgstr "???????????????????????? ???????????????????? ?? ????????????: %1" #: calendarhandler.cpp:494 #, kde-format @@ -171,6 +166,12 @@ "\n" "Dropoff Location: %4" msgstr "" +"?????? ????????????????????????: %1\n" +"?????? ?????? ???????????????????????? %2\n" +"\n" +"?????????? ??????????????????: %3\n" +"\n" +"?????????? ????????????????: %4" #: calendarhandler.cpp:519 #, kde-format @@ -179,6 +180,9 @@ "Under name: %2\n" "PickUp location: %3" msgstr "" +"?????? ????????????????????????: %1\n" +"?????? ?????? ????????????????????????: %2\n" +"?????????? ??????????????????: %3" #~ msgid "" #~ "Check-in: %1\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-20.12.1/po/zh_CN/kitinerary.po new/kitinerary-20.12.2/po/zh_CN/kitinerary.po --- old/kitinerary-20.12.1/po/zh_CN/kitinerary.po 2021-01-05 02:26:43.000000000 +0100 +++ new/kitinerary-20.12.2/po/zh_CN/kitinerary.po 2021-02-02 01:55:06.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-07-01 02:16+0200\n" -"PO-Revision-Date: 2021-01-03 09:06\n" +"PO-Revision-Date: 2021-01-28 05:08\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-20.12.1/src/cli/org.kde.kitinerary-extractor.appdata.xml new/kitinerary-20.12.2/src/cli/org.kde.kitinerary-extractor.appdata.xml --- old/kitinerary-20.12.1/src/cli/org.kde.kitinerary-extractor.appdata.xml 2021-01-02 15:34:24.000000000 +0100 +++ new/kitinerary-20.12.2/src/cli/org.kde.kitinerary-extractor.appdata.xml 2021-01-29 21:28:05.000000000 +0100 @@ -92,9 +92,9 @@ <binary>kitinerary-extractor</binary> </provides> <releases> + <release version="5.16.2" date="2021-02-04"/> <release version="5.16.1" date="2021-01-07"/> <release version="5.16.0" date="2020-12-10"/> <release version="5.15.3" date="2020-11-05"/> - <release version="5.15.2" date="2020-10-08"/> </releases> </component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-20.12.1/src/extractors/accor.js new/kitinerary-20.12.2/src/extractors/accor.js --- old/kitinerary-20.12.1/src/extractors/accor.js 2021-01-02 15:34:24.000000000 +0100 +++ new/kitinerary-20.12.2/src/extractors/accor.js 2021-01-29 21:28:05.000000000 +0100 @@ -30,9 +30,15 @@ hotelContent = hotelContent.replace(/\s+\n/, "\n"); var hotel = hotelContent.match(/^(.*)\n+(.*\n.*)\n(?:.|\n)*Tel\s*:\s*([\d \/\+\(\)]+)\n(.+@.+?)[\s\n]/); + if (hotel) { + res.reservationFor.telephone = hotel[3]; + res.reservationFor.email = hotel[4]; + } else { + // no contact information present + hotel = hotelContent.match(/^(.*)\n+(.*\n.*)\n(?:.|\n)*/); + } res.reservationFor.name = hotel[1]; - res.reservationFor.telephone = hotel[3]; - res.reservationFor.email = hotel[4]; + var addr = hotel[2].match(/(.*)(?: - |\n)(.*) - (.*)/); res.reservationFor.address.streetAddress = addr[1];
