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

Bug#1110065: unblock: kteatime/4:25.04.3-1



Package: release.debian.org
Severity: normal
X-Debbugs-Cc: kteatime@packages.debian.org, Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Control: affects -1 + src:kteatime
User: release.debian.org@packages.debian.org
Usertags: unblock

Dear Release Team,

please unblock package kteatime.

[ Reason ]
It contains the following changes:
* New upstream release (25.04.3).
  - Fix tea remove button in settings. (kde#504726)

[ Tests ]
- Tested the fix for the tea removal.
- Tested triggering timers.

[ Risks ]
Only contains the latest upstream point release for the 25.04 Gear
branch. Further fixes can easily be backported or the change 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 kteatime/4:25.04.3-1
diff -Nru kteatime-25.04.0/CMakeLists.txt kteatime-25.04.3/CMakeLists.txt
--- kteatime-25.04.0/CMakeLists.txt	2025-04-07 23:36:54.000000000 +0200
+++ kteatime-25.04.3/CMakeLists.txt	2025-06-30 18:38:08.000000000 +0200
@@ -3,7 +3,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 "3")
 set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
 project(kteatime VERSION ${RELEASE_SERVICE_VERSION})
diff -Nru kteatime-25.04.0/debian/changelog kteatime-25.04.3/debian/changelog
--- kteatime-25.04.0/debian/changelog	2025-04-17 21:46:03.000000000 +0200
+++ kteatime-25.04.3/debian/changelog	2025-07-25 00:43:07.000000000 +0200
@@ -1,9 +1,17 @@
+kteatime (4:25.04.3-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (25.04.3).
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Fri, 25 Jul 2025 00:43:07 +0200
+
 kteatime (4:25.04.0-1) unstable; urgency=medium
 
   [ Aurélien COUDERC ]
   * New upstream release (25.04.0).
   * Bump Standards-Version to 4.7.2, no change required.
   * Update project homepage.
+  * Remove inactive uploaders.
 
  -- Aurélien COUDERC <coucouf@debian.org>  Thu, 17 Apr 2025 21:46:03 +0200
 
diff -Nru kteatime-25.04.0/debian/control kteatime-25.04.3/debian/control
--- kteatime-25.04.0/debian/control	2025-04-17 21:46:03.000000000 +0200
+++ kteatime-25.04.3/debian/control	2025-07-25 00:43:07.000000000 +0200
@@ -3,7 +3,6 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Aurélien COUDERC <coucouf@debian.org>,
-           Norbert Preining <norbert@preining.info>,
            Sune Vuorela <sune@debian.org>,
 Build-Depends: debhelper-compat (= 13),
                cmake (>= 3.16~),
diff -Nru kteatime-25.04.0/org.kde.kteatime.appdata.xml kteatime-25.04.3/org.kde.kteatime.appdata.xml
--- kteatime-25.04.0/org.kde.kteatime.appdata.xml	2025-04-07 23:36:54.000000000 +0200
+++ kteatime-25.04.3/org.kde.kteatime.appdata.xml	2025-06-30 18:38:08.000000000 +0200
@@ -165,6 +165,9 @@
   </provides>
   <launchable type="desktop-id">org.kde.kteatime.desktop</launchable>
   <releases>
+    <release version="25.04.3" date="2025-07-03"/>
+    <release version="25.04.2" date="2025-06-05"/>
+    <release version="25.04.1" date="2025-05-08"/>
     <release version="25.04.0" date="2025-04-17"/>
     <release version="24.12.3" date="2025-03-06"/>
     <release version="24.12.2" date="2025-02-06"/>
diff -Nru kteatime-25.04.0/po/es/docs/kteatime/index.docbook kteatime-25.04.3/po/es/docs/kteatime/index.docbook
--- kteatime-25.04.0/po/es/docs/kteatime/index.docbook	2025-04-07 23:36:54.000000000 +0200
+++ kteatime-25.04.3/po/es/docs/kteatime/index.docbook	2025-06-30 18:38:08.000000000 +0200
@@ -140,12 +140,12 @@
 > y <guimenuitem
 >Té verde</guimenuitem
 >. Estos tés están preconfigurados con un tiempo predeterminado. Mucha gente se ha quejado diciendo que esos tiempos no son correctos. Recuerde que la cantidad de tiempo que toma preparar una taza de té se basa principalmente en el gusto personal. Los tiempos elegidos son aproximados. Si sigue leyendo, sabrá como cambiar o borrar los tiempos predefinidos y como definir su propio plazo de tiempo. Una forma fácil y rápida de establecer un tiempo personalizado es eligiendo <guimenuitem
->Personalizado...</guimenuitem
+>Personalizado…</guimenuitem
 > en el menú.</para>
 
 <para
 >Al pulsar <guimenuitem
->Configurar notificaciones...</guimenuitem
+>Configurar notificaciones…</guimenuitem
 > se muestran las preferencias de las notificaciones de &kde; para &kteatime;.</para>
 
 </sect1>
diff -Nru kteatime-25.04.0/po/es/kteatime.po kteatime-25.04.3/po/es/kteatime.po
--- kteatime-25.04.0/po/es/kteatime.po	2025-04-07 23:36:54.000000000 +0200
+++ kteatime-25.04.3/po/es/kteatime.po	2025-06-30 18:38:08.000000000 +0200
@@ -1,21 +1,22 @@
-# translation of kteatime.po to Spanish
-# traducción de kteatime.po a Español
-# translation of kteatime.po to
-# Eduardo Sanchez <kde@sombragris.org>, 2003, 2005, 2007, 2008.
-# Jaime Robles <jaime@kde.org>, 2004, 2008, 2009.
-# Eduardo Sanchez <ibvm@cbvm.edu.py>, 2004.
-# Eduardo Sanchez <lists@sombragris.org>, 2005.
-# Santiago Fernandez Sancho <santi@kde-es.org>, 2006.
-# Pablo de Vicente <pablo.devicente@gmail.com>, 2006.
-# Cristina Yenyxe Gonzalez Garcia <the.blue.valkyrie@gmail.com>, 2009.
-# Eloy Cuadra <ecuadra@eloihr.net>, 2010, 2018, 2019, 2021.
-# Javier Vinal <fjvinal@gmail.com>, 2014.
+# Spanish translations for kteatime.po package.
+# Copyright (C) 2003-2025 This file is copyright:
+# This file is distributed under the same license as the kteatime package.
+#
+# SPDX-FileCopyrightText: 2003, 2005, 2007, 2008 Eduardo Sanchez <kde@sombragris.org>
+# SPDX-FileCopyrightText: 2004, 2008, 2009 Jaime Robles <jaime@kde.org>
+# SPDX-FileCopyrightText: 2004 Eduardo Sanchez <ibvm@cbvm.edu.py>
+# SPDX-FileCopyrightText: 2005 Eduardo Sanchez <lists@sombragris.org>
+# SPDX-FileCopyrightText: 2006 Santiago Fernandez Sancho <santi@kde-es.org>
+# SPDX-FileCopyrightText: 2006 Pablo de Vicente <pablo.devicente@gmail.com>
+# SPDX-FileCopyrightText: 2009 Cristina Yenyxe Gonzalez Garcia <the.blue.valkyrie@gmail.com>
+# SPDX-FileCopyrightText: 2010, 2018, 2019, 2021, 2025 Eloy Cuadra <ecuadra@eloihr.net>
+# SPDX-FileCopyrightText: 2014 Javier Vinal <fjvinal@gmail.com>
 msgid ""
 msgstr ""
 "Project-Id-Version: kteatime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n";
 "POT-Creation-Date: 2024-04-20 00:40+0000\n"
-"PO-Revision-Date: 2021-01-18 00:32+0100\n"
+"PO-Revision-Date: 2025-05-18 15:14+0100\n"
 "Last-Translator: Eloy Cuadra <ecuadra@eloihr.net>\n"
 "Language-Team: Spanish <kde-l10n-es@kde.org>\n"
 "Language: es\n"
@@ -376,12 +377,12 @@
 #: src/toplevel.cpp:90
 #, kde-format
 msgid "&Configure..."
-msgstr "&Configurar..."
+msgstr "&Configurar…"
 
 #: src/toplevel.cpp:98
 #, kde-format
 msgid "&Custom..."
-msgstr "&Personalizado..."
+msgstr "&Personalizado…"
 
 #: src/toplevel.cpp:154
 #, kde-format
@@ -414,9 +415,3 @@
 msgctxt "%1 is the time, %2 is the name of the tea"
 msgid "%1 left for %2."
 msgstr "faltan %1 para %2."
-
-#~ msgid "Anonymous Tea"
-#~ msgstr "Té anónimo"
-
-#~ msgid "&Anonymous..."
-#~ msgstr "&Anónimo..."
diff -Nru kteatime-25.04.0/snapcraft.yaml kteatime-25.04.3/snapcraft.yaml
--- kteatime-25.04.0/snapcraft.yaml	2025-04-07 23:36:54.000000000 +0200
+++ kteatime-25.04.3/snapcraft.yaml	2025-06-30 18:38:08.000000000 +0200
@@ -1,11 +1,11 @@
-# SPDX-FileCopyrightText: 2024 Scarlett Moore <sgmoore@kde.org>
+# SPDX-FileCopyrightText: 2024-2025 Scarlett Moore <sgmoore@kde.org>
 #
 # SPDX-License-Identifier: CC0-1.0
 ---
 name: kteatime
 confinement: strict
 grade: stable
-base: core22
+base: core24
 adopt-info: kteatime
 apps:
   kteatime:
@@ -15,21 +15,12 @@
     desktop: usr/share/applications/org.kde.kteatime.desktop
     command: usr/bin/kteatime
     plugs:
-      - audio-record
+      - audio-playback
 slots:
   session-dbus-interface:
     interface: dbus
     name: org.kde.kteatime
     bus: session
-package-repositories:
-  - type: apt
-    components:
-      - main
-    suites:
-      - jammy
-    key-id: 444DABCF3667D0283F894EDDE6D4736255751E5D
-    url: http://origin.archive.neon.kde.org/user
-    key-server: keyserver.ubuntu.com
 parts:
   kteatime:
     parse-info:
@@ -58,6 +49,9 @@
       - -DCMAKE_INSTALL_LIBDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
       - --log-level=STATUS
       - -DCMAKE_LIBRARY_PATH=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
+    build-environment: &build-environment
+      - LD_LIBRARY_PATH: >
+          "/snap/mesa-2404/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/kde-qt6-core24-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libproxy:$LD_LIBRARY_PATH"
     prime:
       - -usr/lib/*/cmake/*
       - -usr/include/*
@@ -67,17 +61,25 @@
       - -usr/lib/gcc/$CRAFT_ARCH_TRIPLET_BUILD_FOR/6.0.0
       - -usr/lib/aspell/*
       - -usr/share/lintian
+  gpu-2404:
+    after: [kteatime]
+    source: https://github.com/canonical/gpu-snap.git
+    plugin: dump
+    override-prime: |
+      craftctl default
+      ${CRAFT_PART_SRC}/bin/gpu-2404-cleanup mesa-2404
+    prime:
+      - bin/gpu-2404-wrapper
   cleanup:
     after:
       - kteatime
     plugin: nil
     build-snaps:
-      - core22
-      - kf6-core22
-      - qt-common-themes
+      - core24
+      - kf6-core24
     override-prime: |
       set -eux
-      for snap in "core22" "kf6-core22" "qt-common-themes"; do
+      for snap in "core24" "kf6-core24"; do
           cd "/snap/$snap/current" && find . -type f,l -exec rm -rf "${CRAFT_PRIME}/{}" \;
       done
 
diff -Nru kteatime-25.04.0/src/settings.cpp kteatime-25.04.3/src/settings.cpp
--- kteatime-25.04.0/src/settings.cpp	2025-04-07 23:36:54.000000000 +0200
+++ kteatime-25.04.3/src/settings.cpp	2025-06-30 18:38:08.000000000 +0200
@@ -217,6 +217,9 @@
 
     bool state = !items.isEmpty();
 
+    if (m_model->rowCount() > 1 && !state)
+        return;
+
     mUi->teaPropertiesGroup->setEnabled(state);
     mUi->teaNameEdit->setEnabled(state);
     mUi->minutesSpin->setEnabled(state);

Reply to: