[neon/multimedia/kaffeine/Neon/stable_noble] debian: Revert "sync to salsa for qt5 based"

Carlos De Maine null at kde.org
Wed Jul 29 12:11:13 BST 2026 

Git commit 47708e609a09605488e1f72a982ea383f011a198 by Carlos De Maine.
Committed on 29/07/2026 at 11:11.
Pushed by carlosdem into branch 'Neon/stable_noble'.

Revert "sync to salsa for qt5 based"

This reverts commit 8ddb1e015e62617c2adbd15a4de53a4b9ba60393.

M  +262  -15   debian/changelog
M  +30   -27   debian/control
M  +0    -15   debian/copyright
M  +3    -3    debian/rules
D  +0    -6    debian/salsa-ci.yml
M  +4    -2    debian/watch

https://invent.kde.org/neon/multimedia/kaffeine/-/commit/47708e609a09605488e1f72a982ea383f011a198

diff --git a/debian/changelog b/debian/changelog
index 47d537d..70c8ae6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,19 +1,266 @@
-kaffeine (2.0.19-1) unstable; urgency=medium
+kaffeine (2.0.18+git20250923.9f7aa80-0neon) noble; urgency=medium
 
-  [ Pino Toscano ]
-  * New upstream release.
-  * Switch to use the upstream tags: it looks like there are new releases,
-    however no release tarballs.
-  * Update the build dependencies according to the upstream build system:
-    - bump cmake to 3.16
-  * Switch the transitional pkg-config build dependency to pkgconf.
-  * Bump Standards-Version to 4.7.2, no changes required.
-
-  [ Aurélien COUDERC ]
-  * Fix license of app metadata.
-  * Update email of KDE Extras Team.
-
- -- Pino Toscano <pino at debian.org>  Thu, 10 Apr 2025 04:50:36 +0200
+  * New release
+
+ -- Neon CI <neon at kde.org>  Wed, 24 Sep 2025 06:55:22 +0000
+
+kaffeine (2.0.18+git20250921.279411f-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Mon, 22 Sep 2025 06:55:13 +0000
+
+kaffeine (2.0.18+git20250920.3bb6b71-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Sat, 20 Sep 2025 06:55:14 +0000
+
+kaffeine (2.0.18+git20250919.d2774cb-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Fri, 19 Sep 2025 11:37:45 +0000
+
+kaffeine (2.0.18+git20250916.1989c44-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Tue, 16 Sep 2025 06:55:16 +0000
+
+kaffeine (2.0.18+git20250909.680800a-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Thu, 11 Sep 2025 07:36:14 +0000
+
+kaffeine (2.0.18+git20250908.98e37ca-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Mon, 08 Sep 2025 06:55:09 +0000
+
+kaffeine (2.0.18+git20250902.9041727-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Tue, 02 Sep 2025 06:55:10 +0000
+
+kaffeine (2.0.18+git20250821.2e2e3f9-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Thu, 21 Aug 2025 06:55:17 +0000
+
+kaffeine (2.0.18+git20250815.0a36369-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Fri, 15 Aug 2025 06:57:14 +0000
+
+kaffeine (2.0.18+git20250807.5adb671-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Thu, 07 Aug 2025 06:55:55 +0000
+
+kaffeine (2.0.18+git20250805.7028f91-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Tue, 05 Aug 2025 06:55:14 +0000
+
+kaffeine (2.0.18+git20250716.36f8889-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Wed, 16 Jul 2025 06:55:10 +0000
+
+kaffeine (2.0.18+git20250714.b1fc272-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Mon, 14 Jul 2025 06:59:47 +0000
+
+kaffeine (2.0.18+git20250525.3cfefe5-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Sun, 25 May 2025 06:55:15 +0000
+
+kaffeine (2.0.18+git20250514.9f96e11-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Wed, 14 May 2025 06:55:12 +0000
+
+kaffeine (2.0.18+git20250401.79ded89-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Sun, 27 Apr 2025 06:55:10 +0000
+
+kaffeine (2.0.18+git20250316.afc3f87-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Sun, 16 Mar 2025 06:55:10 +0000
+
+kaffeine (2.0.18+git20250315.2a44f07-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Sat, 15 Mar 2025 06:55:11 +0000
+
+kaffeine (2.0.18+git20250308.3487d39-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Sat, 08 Mar 2025 06:56:13 +0000
+
+kaffeine (2.0.18+git20250222.effadaf-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Sat, 22 Feb 2025 07:09:36 +0000
+
+kaffeine (2.0.18+git20250201.e0aea04-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Sat, 01 Feb 2025 06:55:09 +0000
+
+kaffeine (2.0.18+git20250130.4042f3a-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Thu, 30 Jan 2025 06:55:11 +0000
+
+kaffeine (2.0.18+git20250128.a75f7f1-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Tue, 28 Jan 2025 06:55:10 +0000
+
+kaffeine (2.0.18+git20250126.51edbc2-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Sun, 26 Jan 2025 06:55:11 +0000
+
+kaffeine (2.0.18+git20250125.bcb66bf-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Sat, 25 Jan 2025 06:55:10 +0000
+
+kaffeine (2.0.18+git20250124.ec7d472-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Fri, 24 Jan 2025 06:55:09 +0000
+
+kaffeine (2.0.18+git20250123.260f6c4-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Thu, 23 Jan 2025 06:55:10 +0000
+
+kaffeine (2.0.18+git20250122.6c44dbc-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Wed, 22 Jan 2025 06:55:10 +0000
+
+kaffeine (2.0.18+git20250121.9b3f5a4-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Tue, 21 Jan 2025 06:55:11 +0000
+
+kaffeine (2.0.18+git20250113.a60a972-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Mon, 13 Jan 2025 06:55:19 +0000
+
+kaffeine (2.0.18+git20250110.7a4c4da-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Sat, 11 Jan 2025 06:55:20 +0000
+
+kaffeine (2.0.18+git20241226.6a0f15c-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Thu, 26 Dec 2024 06:55:10 +0000
+
+kaffeine (2.0.18+git20241225.ca8fb22-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Wed, 25 Dec 2024 02:27:32 +0000
+
+kaffeine (2.0.18+git20241221.56d6964-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Sat, 21 Dec 2024 06:55:10 +0000
+
+kaffeine (2.0.18+git20241217.f62ab95-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Tue, 17 Dec 2024 06:55:10 +0000
+
+kaffeine (2.0.18+git20241214.971b4fc-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Sat, 14 Dec 2024 06:55:12 +0000
+
+kaffeine (2.0.18+git20241202.4b275f3-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Mon, 02 Dec 2024 06:55:10 +0000
+
+kaffeine (2.0.18+git20241125.45fd362-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Thu, 28 Nov 2024 06:55:09 +0000
+
+kaffeine (2.0.18+git20241107.316db59-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Thu, 07 Nov 2024 06:55:09 +0000
+
+kaffeine (2.0.18+git20241106.db368fc-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Wed, 06 Nov 2024 06:55:10 +0000
+
+kaffeine (2.0.18+git20241105.a44b078-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Tue, 05 Nov 2024 06:55:09 +0000
+
+kaffeine (2.0.18+git20240924.84b17bc-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Tue, 24 Sep 2024 06:55:14 +0000
+
+kaffeine (2.0.18+git20240826.25881ef-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Thu, 05 Sep 2024 06:55:10 +0000
 
 kaffeine (2.0.18+git20230226.439cd0d-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 567c9ea..43540a9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,29 +1,31 @@
 Source: kaffeine
 Section: video
 Priority: optional
-Maintainer: Debian KDE Extras Team <pkg-kde-extras at alioth-lists.debian.net>
+Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Pino Toscano <pino at debian.org>,
-Build-Depends: debhelper-compat (= 13),
- cmake (>= 3.16~),
- pkg-kde-tools (>= 0.15.16),
- pkgconf,
- extra-cmake-modules (>= 1.0.0),
- qtbase5-dev (>= 5.4.0),
- libqt5x11extras5-dev (>= 5.4.0),
- libkf5coreaddons-dev (>= 5.11.0),
- libkf5doctools-dev (>= 5.41.0~),
- libkf5dbusaddons-dev (>= 5.11.0),
- libkf5i18n-dev (>= 5.11.0),
- libkf5kio-dev (>= 5.11.0),
- libkf5solid-dev (>= 5.11.0),
- libkf5widgetsaddons-dev (>= 5.11.0),
- libkf5windowsystem-dev (>= 5.11.0),
- libkf5xmlgui-dev (>= 5.11.0),
- libvlc-dev,
- libx11-dev, libxss-dev,
- libdvbv5-dev [linux-any], libudev-dev [linux-any],
- gettext,
-Standards-Version: 4.7.2
+Build-Depends: cmake,
+               debhelper-compat (= 13),
+               gettext,
+               kf6-extra-cmake-modules,
+               kf6-kcoreaddons-dev,
+               kf6-kdoctools-dev,
+               kf6-kdbusaddons-dev,
+               kf6-ki18n-dev,
+               kf6-kio-dev,
+               kf6-kwidgetsaddons-dev,
+               kf6-kwindowsystem-dev,
+               kf6-kxmlgui-dev,
+               kf6-solid-dev,
+               libdvbv5-dev [linux-any],
+               libudev-dev [linux-any],
+               libvlc-dev,
+               libx11-dev, 
+               libxss-dev,
+               pkg-kde-tools-neon,
+               pkgconf,
+               qt6-5compat-dev,
+               qt6-base-dev,
+Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Homepage: https://apps.kde.org/kaffeine/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/kaffeine
@@ -31,11 +33,12 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/kaffeine.git
 
 Package: kaffeine
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- kinit,
- iso-codes,
- libqt5sql5-sqlite,
- vlc-plugin-base, vlc-plugin-video-output
+Depends: iso-codes,
+         libqt5sql5-sqlite,
+         vlc-plugin-base, 
+         vlc-plugin-video-output,
+         ${shlibs:Depends},
+         ${misc:Depends}, 
 Suggests: libdvdcss2
 Description: versatile media player for KDE
  Kaffeine is a media player for KDE based on VLC, which gives it a wide variety
diff --git a/debian/copyright b/debian/copyright
index c292ef0..2fc79f9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -35,21 +35,6 @@ License: BSD-3-clause
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Files: src/org.kde.kaffeine.appdata.xml
-Copyright: none
-License: CC0-1.0
- To the extent possible under law, the author(s) have dedicated all
- copyright and related and neighboring rights to this software to the
- public domain worldwide. This software is distributed without any
- warranty.
- .
- You should have received a copy of the CC0 Public Domain Dedication
- along with this software. If not, see
- <https://creativecommons.org/publicdomain/zero/1.0/>.
- .
- On Debian systems, the complete text of the CC0 Public Domain
- Dedication can be found in `/usr/share/common-licenses/CC0-1.0’.
-
 Files: include/*
 Copyright: 2000, Marcus Metzler <marcus at convergence.de>
            2000, Ralph  Metzler <ralph at convergence.de>
diff --git a/debian/rules b/debian/rules
index 6e83671..d3ec6c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,9 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --with kf5
-
-.PHONY: override_dh_auto_test
+	dh $@ --with kf6 --buildsystem kf6
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
deleted file mode 100644
index 31e31c9..0000000
--- a/debian/salsa-ci.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-include:
-  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
-  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
-variables:
-  SALSA_CI_DISABLE_MISSING_BREAKS: 'no'
-  SALSA_CI_DISABLE_RC_BUGS: 'no'
diff --git a/debian/watch b/debian/watch
index 4e26bfe..b2bdd6d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,7 @@
 version=4
 
-opts="mode=git, gitmode=full, pgpmode=none" \
+# disabled until a version after 2.0.18 is released
+# https://download.kde.org/stable/kaffeine/kaffeine-([\d.]+)\.tar\.xz
+opts="mode=git, pgpmode=none, pretty=2.0.18+git%cd.%h" \
 https://invent.kde.org/multimedia/kaffeine.git \
-refs/tags/v at ANY_VERSION@
+HEAD

More information about the Neon-commits mailing list