[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1107911: marked as done (unblock: kopeninghours/25.04.2-1)

Your message dated Tue, 17 Jun 2025 11:27:16 +0000
with message-id <E1uRUTE-004AGf-2V@respighi.debian.org>
and subject line unblock kopeninghours
has caused the Debian Bug report #1107911,
regarding unblock: kopeninghours/25.04.2-1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1107911: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1107911
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
X-Debbugs-Cc: kopeninghours@packages.debian.org, Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Control: affects -1 + src:kopeninghours
User: release.debian.org@packages.debian.org
Usertags: unblock

Dear Release Team,

please unblock package kopeninghours.

[ Reason ]
It contains the following changes:
[ Aurélien COUDERC ]
* New upstream release (25.04.1).
  - Fix behaviour change in Qt 6.10 regarding QCalendar::daysInMonth.
* New upstream release (25.04.2).
  - Adapt tests to KF::Holidays sunrise computation changes.

[ Tests ]
- Upstream test suite passes in sbuild.

[ Risks ]
Upstream point releases only contain targetted commits. Further fixes
can easily be backported or the changes reverted.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing


Thanks!


unblock kopeninghours/25.04.2-1

diff -Nru kopeninghours-25.04.0/autotests/data/sunrise.intervals kopeninghours-25.04.2/autotests/data/sunrise.intervals
--- kopeninghours-25.04.0/autotests/data/sunrise.intervals	2025-04-07 22:47:14.000000000 +0200
+++ kopeninghours-25.04.2/autotests/data/sunrise.intervals	2025-06-02 22:01:45.000000000 +0200
@@ -7,23 +7,23 @@
 Mon 2020-11-09 07:20 - Mon 2020-11-09 16:24: open
 Mon 2020-11-09 16:24 - Tue 2020-11-10 07:22: closed
 Tue 2020-11-10 07:22 - Tue 2020-11-10 16:22: open
-Tue 2020-11-10 16:22 - Wed 2020-11-11 07:24: closed
-Wed 2020-11-11 07:24 - Wed 2020-11-11 16:21: open
+Tue 2020-11-10 16:22 - Wed 2020-11-11 07:23: closed
+Wed 2020-11-11 07:23 - Wed 2020-11-11 16:21: open
 Wed 2020-11-11 16:21 - Thu 2020-11-12 07:25: closed
 Thu 2020-11-12 07:25 - Thu 2020-11-12 16:19: open
 Thu 2020-11-12 16:19 - Fri 2020-11-13 07:27: closed
-Fri 2020-11-13 07:27 - Fri 2020-11-13 16:17: open
-Fri 2020-11-13 16:17 - Sat 2020-11-14 07:29: closed
+Fri 2020-11-13 07:27 - Fri 2020-11-13 16:18: open
+Fri 2020-11-13 16:18 - Sat 2020-11-14 07:29: closed
 Sat 2020-11-14 07:29 - Sat 2020-11-14 16:16: open
 Sat 2020-11-14 16:16 - Sun 2020-11-15 07:31: closed
 Sun 2020-11-15 07:31 - Sun 2020-11-15 16:15: open
-Sun 2020-11-15 16:15 - Mon 2020-11-16 07:33: closed
-Mon 2020-11-16 07:33 - Mon 2020-11-16 16:13: open
+Sun 2020-11-15 16:15 - Mon 2020-11-16 07:32: closed
+Mon 2020-11-16 07:32 - Mon 2020-11-16 16:13: open
 Mon 2020-11-16 16:13 - Tue 2020-11-17 07:34: closed
 Tue 2020-11-17 07:34 - Tue 2020-11-17 16:12: open
 Tue 2020-11-17 16:12 - Wed 2020-11-18 07:36: closed
-Wed 2020-11-18 07:36 - Wed 2020-11-18 16:10: open
-Wed 2020-11-18 16:10 - Thu 2020-11-19 07:38: closed
+Wed 2020-11-18 07:36 - Wed 2020-11-18 16:11: open
+Wed 2020-11-18 16:11 - Thu 2020-11-19 07:38: closed
 Thu 2020-11-19 07:38 - Thu 2020-11-19 16:09: open
 Thu 2020-11-19 16:09 - Fri 2020-11-20 07:39: closed
 Fri 2020-11-20 07:39 - Fri 2020-11-20 16:08: open
diff -Nru kopeninghours-25.04.0/autotests/iterationtest.cpp kopeninghours-25.04.2/autotests/iterationtest.cpp
--- kopeninghours-25.04.0/autotests/iterationtest.cpp	2025-04-07 22:47:14.000000000 +0200
+++ kopeninghours-25.04.2/autotests/iterationtest.cpp	2025-06-02 22:01:45.000000000 +0200
@@ -126,6 +126,9 @@
             QVERIFY(proc.waitForFinished());
         }
 
+#if KHOLIDAYS_VERSION < QT_VERSION_CHECK(6, 15, 0)
+        QEXPECT_FAIL("sunrise.intervals", "sunrise computation changed in KF::Holidays >= 6.15", Continue);
+#endif
         QCOMPARE(refData, b);
     }
 };
diff -Nru kopeninghours-25.04.0/CMakeLists.txt kopeninghours-25.04.2/CMakeLists.txt
--- kopeninghours-25.04.0/CMakeLists.txt	2025-04-07 22:47:14.000000000 +0200
+++ kopeninghours-25.04.2/CMakeLists.txt	2025-06-02 22:01:45.000000000 +0200
@@ -6,7 +6,7 @@
 # KDE Application Version, managed by release script
 set (RELEASE_SERVICE_VERSION_MAJOR "25")
 set (RELEASE_SERVICE_VERSION_MINOR "04")
-set (RELEASE_SERVICE_VERSION_MICRO "0")
+set (RELEASE_SERVICE_VERSION_MICRO "2")
 set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 project(KOpeningHours VERSION ${RELEASE_SERVICE_VERSION})
 
diff -Nru kopeninghours-25.04.0/debian/changelog kopeninghours-25.04.2/debian/changelog
--- kopeninghours-25.04.0/debian/changelog	2025-04-17 21:45:16.000000000 +0200
+++ kopeninghours-25.04.2/debian/changelog	2025-06-10 00:15:58.000000000 +0200
@@ -1,8 +1,17 @@
+kopeninghours (25.04.2-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (25.04.1).
+    - Fix behaviour change in Qt 6.10 regarding QCalendar::daysInMonth.
+  * New upstream release (25.04.2).
+    - Adapt tests to KF::Holidays sunrise computation changes.
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Tue, 10 Jun 2025 00:15:58 +0200
+
 kopeninghours (25.04.0-1) unstable; urgency=medium
 
   [ Aurélien COUDERC ]
   * New upstream release (25.04.0).
-  * Update build-deps and deps with the info from cmake.
   * Bump Standards-Version to 4.7.2, no change required.
 
  -- Aurélien COUDERC <coucouf@debian.org>  Thu, 17 Apr 2025 21:45:16 +0200
diff -Nru kopeninghours-25.04.0/debian/control kopeninghours-25.04.2/debian/control
--- kopeninghours-25.04.0/debian/control	2025-04-17 21:45:15.000000000 +0200
+++ kopeninghours-25.04.2/debian/control	2025-06-10 00:15:58.000000000 +0200
@@ -4,23 +4,20 @@
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Aurélien COUDERC <coucouf@debian.org>,
            Sandro Knauß <hefee@debian.org>,
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: bison,
+               cmake (>= 3.5~),
+               debhelper-compat (= 13),
                dh-sequence-kf6,
                dh-sequence-pkgkde-symbolshelper,
                dh-sequence-python3,
                dh-sequence-qmldeps,
-               bison,
-               cmake (>= 3.5~),
                extra-cmake-modules (>= 5.248~),
                flex,
                libboost-python-dev,
-               libkf5holidays-dev (>= 1:5.77~),
-               libkf5i18n-dev (>= 5.77~),
                libkf6holidays-dev (>= 5.248~),
                libkf6i18n-dev (>= 5.248~),
                libpython3-dev,
                qt6-base-dev (>= 6.4~),
-               qtbase5-dev (>= 5.14~),
 Homepage: https://invent.kde.org/libraries/kopeninghours/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kopeninghours
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kopeninghours.git
diff -Nru kopeninghours-25.04.0/po/ar/kopeninghours.po kopeninghours-25.04.2/po/ar/kopeninghours.po
--- kopeninghours-25.04.0/po/ar/kopeninghours.po	1970-01-01 01:00:00.000000000 +0100
+++ kopeninghours-25.04.2/po/ar/kopeninghours.po	2025-06-02 22:01:45.000000000 +0200
@@ -0,0 +1,191 @@
+# Copyright (C) 2025 This file is copyright:
+# This file is distributed under the same license as the kopeninghours package.
+# SPDX-FileCopyrightText: 2025 Zayed Al-Saidi <zayed.alsaidi@gmail.com>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kopeninghours\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
+"POT-Creation-Date: 2023-11-05 12:28+0000\n"
+"PO-Revision-Date: 2025-05-15 18:24+0400\n"
+"Last-Translator: Zayed Al-Saidi <zayed.alsaidi@gmail.com>\n"
+"Language-Team: ar\n"
+"Language: ar\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"X-Generator: Lokalize 23.08.5\n"
+
+#: lib/display.cpp:28
+#, kde-format
+msgid "Open"
+msgstr "مفتوح"
+
+#: lib/display.cpp:28
+#, kde-format
+msgid "Open (%1)"
+msgstr "مفتوح (%1)"
+
+#: lib/display.cpp:30
+#, kde-format
+msgid "Closed"
+msgstr "مغلق"
+
+#: lib/display.cpp:30
+#, kde-format
+msgid "Closed (%1)"
+msgstr "مغلق (%1)"
+
+#: lib/display.cpp:50
+#, kde-format
+msgid "Open for one more minute"
+msgid_plural "Open for %1 more minutes"
+msgstr[0] "مفتوح لدقيقة أخرى"
+msgstr[1] "مفتوح لدقيقة واحدة أخرى"
+msgstr[2] "مفتوح لدقيقتين أخرى"
+msgstr[3] "مفتوح لمدة %1 دقائق أخرى"
+msgstr[4] "مفتوح لمدة %1 دقيقة أخرى"
+msgstr[5] "مفتوح لمدة %1 دقيقة أخرى"
+
+#: lib/display.cpp:51
+#, kde-format
+msgid "Open for one more minute (%2)"
+msgid_plural "Open for %1 more minutes (%2)"
+msgstr[0] "مفتوح لدقيقة أخرى (%2)"
+msgstr[1] "مفتوح لدقيقة واحدة أخرى (%2)"
+msgstr[2] "مفتوح لدقيقتين أخرى (%2)"
+msgstr[3] "مفتوح لمدة %1 دقائق أخرى (%2)"
+msgstr[4] "مفتوح لمدة %1 دقيقة أخرى (%2)"
+msgstr[5] "مفتوح لمدة %1 دقيقة أخرى (%2)"
+
+#: lib/display.cpp:54
+#, kde-format
+msgid "Currently closed, opens in one minute"
+msgid_plural "Currently closed, opens in %1 minutes"
+msgstr[0] "حاليًا مغلق، سيفتح حالًا"
+msgstr[1] "حاليًا مغلق، سيفتح بعد دقيقة"
+msgstr[2] "حاليًا مغلق، سيفتح بعد دقيقتين"
+msgstr[3] "حاليًا مغلق، سيفتح بعد %1 دقائق"
+msgstr[4] "حاليًا مغلق، سيفتح بعد %1 دقيقة"
+msgstr[5] "حاليًا مغلق، سيفتح بعد %1 دقيقة"
+
+#: lib/display.cpp:55
+#, kde-format
+msgid "Currently closed (%2), opens in one minute"
+msgid_plural "Currently closed (%2), opens in %1 minutes"
+msgstr[0] "حاليًا مغلق (%2)، سيفتح حالًا"
+msgstr[1] "حاليًا مغلق (%2)، سيفتح بعد دقيقة"
+msgstr[2] "حاليًا مغلق (%2)، سيفتح بعد دقيقتين"
+msgstr[3] "حاليًا مغلق (%2)، سيفتح بعد %1 دقائق"
+msgstr[4] "حاليًا مغلق (%2)، سيفتح بعد %1 دقيقة"
+msgstr[5] "حاليًا مغلق (%2)، سيفتح بعد %1 دقيقة"
+
+#: lib/display.cpp:68
+#, kde-format
+msgid "Open for one more hour"
+msgid_plural "Open for %1 more hours"
+msgstr[0] "مفتوح لساعة أخرى"
+msgstr[1] "مفتوح لساعة أخرى"
+msgstr[2] "مفتوح لساعتين أخريين"
+msgstr[3] "مفتوح ل%1 ساعات أخرى"
+msgstr[4] "مفتوح ل%1 ساعة أخرى"
+msgstr[5] "مفتوح ل%1 ساعة أخرى"
+
+#: lib/display.cpp:69
+#, kde-format
+msgid "Open for one more hour (%2)"
+msgid_plural "Open for %1 more hours (%2)"
+msgstr[0] "مفتوح لساعة أخرى (%2)"
+msgstr[1] "مفتوح لساعة أخرى (%2)"
+msgstr[2] "مفتوح لساعتين أخريين (%2)"
+msgstr[3] "مفتوح ل%1 ساعات أخرى (%2)"
+msgstr[4] "مفتوح ل%1 ساعة أخرى (%2)"
+msgstr[5] "مفتوح ل%1 ساعة أخرى (%2)"
+
+#: lib/display.cpp:72
+#, kde-format
+msgid "Currently closed, opens in one hour"
+msgid_plural "Currently closed, opens in %1 hours"
+msgstr[0] "مغلق حالياً، يفتح بعد ساعة واحدة"
+msgstr[1] "مغلق حالياً، يفتح بعد ساعة واحدة"
+msgstr[2] "مغلق حالياً، يفتح بعد ساعتين"
+msgstr[3] "مغلق حالياً، يفتح بعد %1 ساعات"
+msgstr[4] "مغلق حالياً، يفتح بعد %1 ساعة"
+msgstr[5] "مغلق حالياً، يفتح بعد %1 ساعة"
+
+#: lib/display.cpp:73
+#, kde-format
+msgid "Currently closed (%2), opens in one hour"
+msgid_plural "Currently closed (%2), opens in %1 hours"
+msgstr[0] "مغلق حالياً (%2)، يفتح بعد ساعة واحدة"
+msgstr[1] "مغلق حالياً (%2)، يفتح بعد ساعة واحدة"
+msgstr[2] "مغلق حالياً (%2)، يفتح بعد ساعتين"
+msgstr[3] "مغلق حالياً (%2)، يفتح بعد %1 ساعات"
+msgstr[4] "مغلق حالياً (%2)، يفتح بعد %1 ساعة"
+msgstr[5] "مغلق حالياً (%2)، يفتح بعد %1 ساعة"
+
+#: lib/display.cpp:86
+#, kde-format
+msgid "Open for one more day"
+msgid_plural "Open for %1 more days"
+msgstr[0] "مفتوح ليوم واحد آخر"
+msgstr[1] "مفتوح ليوم واحد آخر"
+msgstr[2] "مفتوح ليومين آخرين"
+msgstr[3] "مفتوح %1 أيام أخرى"
+msgstr[4] "مفتوح %1 يومًا أخرا"
+msgstr[5] "مفتوح %1 يوم أخر"
+
+#: lib/display.cpp:87
+#, kde-format
+msgid "Open for one more day (%2)"
+msgid_plural "Open for %1 more days (%2)"
+msgstr[0] "مفتوح ليوم واحد آخر (%2)"
+msgstr[1] "مفتوح ليوم واحد آخر (%2)"
+msgstr[2] "مفتوح ليومين آخرين (%2)"
+msgstr[3] "مفتوح %1 أيام أخرى (%2)"
+msgstr[4] "مفتوح %1 يومًا أخرا (%2)"
+msgstr[5] "مفتوح %1 يوم أخر (%2)"
+
+#: lib/display.cpp:90
+#, kde-format
+msgid "Currently closed, opens in one day"
+msgid_plural "Currently closed, opens in %1 days"
+msgstr[0] "مغلق حالياً، يفتح بعد يوم واحدة"
+msgstr[1] "مغلق حالياً، يفتح بعد يوم واحدة"
+msgstr[2] "مغلق حالياً، يفتح بعد يومين"
+msgstr[3] "مغلق حالياً، يفتح بعد %1 أيام"
+msgstr[4] "مغلق حالياً، يفتح بعد %1 يومًا"
+msgstr[5] "مغلق حالياً، يفتح بعد %1 يوم"
+
+#: lib/display.cpp:91
+#, kde-format
+msgid "Currently closed (%2), opens in one day"
+msgid_plural "Currently closed (%2), opens in %1 days"
+msgstr[0] "مغلق حالياً (%2)، يفتح بعد يوم واحدة"
+msgstr[1] "مغلق حالياً (%2)، يفتح بعد يوم واحدة"
+msgstr[2] "مغلق حالياً (%2)، يفتح بعد يومين"
+msgstr[3] "مغلق حالياً (%2)، يفتح بعد %1 أيام"
+msgstr[4] "مغلق حالياً (%2)، يفتح بعد %1 يومًا"
+msgstr[5] "مغلق حالياً (%2)، يفتح بعد %1 يوم"
+
+#: lib/display.cpp:102
+#, kde-format
+msgid "Currently open"
+msgstr "حاليًا مفتوح"
+
+#: lib/display.cpp:102
+#, kde-format
+msgid "Currently open (%1)"
+msgstr "حاليًا مفتوح (%1)"
+
+#: lib/display.cpp:104
+#, kde-format
+msgid "Currently closed"
+msgstr "حاليًا مغلق"
+
+#: lib/display.cpp:104
+#, kde-format
+msgid "Currently closed (%1)"
+msgstr "حاليًا مغلق (%1)"
diff -Nru kopeninghours-25.04.0/src/lib/evaluator.cpp kopeninghours-25.04.2/src/lib/evaluator.cpp
--- kopeninghours-25.04.0/src/lib/evaluator.cpp	2025-04-07 22:47:14.000000000 +0200
+++ kopeninghours-25.04.2/src/lib/evaluator.cpp	2025-06-02 22:01:45.000000000 +0200
@@ -17,9 +17,9 @@
 
 using namespace KOpeningHours;
 
-static int daysInMonth(int month)
+static int daysInMonth(const QDate &date)
 {
-    return QCalendar(QCalendar::System::Gregorian).daysInMonth(month);
+    return date.daysInMonth(QCalendar(QCalendar::System::Gregorian));
 }
 
 static QDateTime resolveTime(Time t, QDate date, OpeningHoursPrivate *context)
@@ -97,7 +97,7 @@
         const auto day = firstOfMonth.addDays(7 * (n - 1) + delta);
         return day.month() == month.month() ? day : QDate();
     } else {
-        const auto lastOfMonth = QDate{month.year(), month.month(), daysInMonth(month.month())};
+        const auto lastOfMonth = QDate{month.year(), month.month(), daysInMonth(month)};
         const auto delta = (7 + lastOfMonth.dayOfWeek() - weekDay) % 7;
         const auto day = lastOfMonth.addDays(7 * (n + 1) - delta);
         return day.month() == month.month() ? day : QDate();
@@ -159,7 +159,7 @@
                 }
 
                 // skip to next month
-                return dt.secsTo(QDateTime(dt.date().addDays(dt.date().daysTo({dt.date().year(), dt.date().month(), daysInMonth(dt.date().month())}) + 1 + offset) , {0, 0}));
+                return dt.secsTo(QDateTime(dt.date().addDays(dt.date().daysTo({dt.date().year(), dt.date().month(), daysInMonth(dt.date())}) + 1 + offset) , {0, 0}));
             }
 
             if (beginDay <= endDay) {
@@ -274,7 +274,7 @@
         if (!d.day && !d.month) {
             return date.addYears(1);
         } else if (!d.day) {
-            return date.addDays(daysInMonth(d.month));
+            return date.addDays(daysInMonth(date));
         }
     }
     return date.addDays(1);

--- End Message ---
--- Begin Message --- 
Unblocked.

--- End Message ---
Reply to: