diff -pruN 3.0.5-5/debian/changelog 3.0.5-5ubuntu1/debian/changelog
--- 3.0.5-5/debian/changelog	2025-10-10 05:26:45.000000000 +0000
+++ 3.0.5-5ubuntu1/debian/changelog	2025-10-28 10:12:29.000000000 +0000
@@ -1,3 +1,12 @@
+libqapt (3.0.5-5ubuntu1) resolute; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - Continue building the utilities for now. In Ubuntu packages such as
+      the ubuntustudio-installer still require them.
+  * Add bump-cmake-minimim.patch to fix FTBFS with e-c-m 6.19.0.
+
+ -- Rik Mills <rikmills@kde.org>  Tue, 28 Oct 2025 10:12:29 +0000
+
 libqapt (3.0.5-5) unstable; urgency=medium
 
   * Drop Rules-Requires-Root: no, no more needed since Debian trixie.
@@ -7,6 +16,14 @@ libqapt (3.0.5-5) unstable; urgency=medi
 
  -- Pino Toscano <pino@debian.org>  Fri, 10 Oct 2025 07:26:45 +0200
 
+libqapt (3.0.5-4ubuntu1) questing; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - Continue building the utilities for now. In Ubuntu packages such as
+      the ubuntustudio-installer still require them.
+
+ -- Rik Mills <rikmills@kde.org>  Wed, 28 May 2025 10:20:11 +0100
+
 libqapt (3.0.5-4) unstable; urgency=medium
 
   * Disable the utilities based on KDE Frameworks 5, as they are either not
@@ -30,6 +47,24 @@ libqapt (3.0.5-4) unstable; urgency=medi
 
  -- Pino Toscano <pino@debian.org>  Sun, 06 Apr 2025 13:59:12 +0200
 
+libqapt (3.0.5-3ubuntu3) plucky; urgency=high
+
+  * No change rebuild against libapt-pkg7.0.
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Mon, 17 Feb 2025 22:47:03 +0100
+
+libqapt (3.0.5-3ubuntu2) plucky; urgency=high
+
+  * No change rebuild against apt 2.9.20 fixed symbol file.
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Sun, 29 Dec 2024 22:28:29 +0100
+
+libqapt (3.0.5-3ubuntu1) plucky; urgency=medium
+
+  * Disable qapt-deb-installer, it’s incompatible with new debconf-kde.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Sat, 28 Dec 2024 11:19:37 +0300
+
 libqapt (3.0.5-3) unstable; urgency=medium
 
   * Team upload.
diff -pruN 3.0.5-5/debian/control 3.0.5-5ubuntu1/debian/control
--- 3.0.5-5/debian/control	2025-10-10 04:59:57.000000000 +0000
+++ 3.0.5-5ubuntu1/debian/control	2025-10-28 10:12:29.000000000 +0000
@@ -1,14 +1,27 @@
 Source: libqapt
 Section: kde
 Priority: optional
-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Pino Toscano <pino@debian.org>,
 Build-Depends: cmake,
                debhelper-compat (= 13),
                extra-cmake-modules,
                gettext,
                libapt-pkg-dev,
+               libglib2.0-dev,
+               libgstreamer-plugins-base1.0-dev,
+               libgstreamer1.0-dev,
                libkf5auth-dev,
+               libkf5coreaddons-dev,
+               libkf5i18n-dev,
+               libkf5iconthemes-dev,
+               libkf5kio-dev,
+               libkf5plasma-dev,
+               libkf5runner-dev,
+               libkf5textwidgets-dev,
+               libkf5widgetsaddons-dev,
+               libkf5windowsystem-dev,
                libpolkit-qt5-1-dev,
                libxapian-dev,
                pkgconf,
@@ -64,3 +77,70 @@ Description: Runtime components for the
  .
  This package contains the runtime components necessary for applications using
  the QApt library to run.
+
+Package: qapt-utils
+Architecture: all
+Depends: kde-thumbnailer-deb (>= ${source:Version}),
+         plasma-runner-installer (>= ${source:Version}),
+         qapt-batch (>= ${source:Version}),
+         ${misc:Depends}
+Recommends: gstreamer-qapt
+Description: complete collection of QApt package management utilities
+ QApt is a collection of tools and a library providing a wrapper around
+ APT. The intention is to ease the use of APT in Qt-based programs.
+ .
+ This is a metapackage depending on all of QApt's extra package management
+ utilities.
+
+Package: qapt-batch
+Architecture: any
+Depends: libqapt3-runtime (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: Batch package manager for KDE
+ QApt is a collection of tools and a library providing a wrapper around
+ APT. The intention is to ease the use of APT in Qt-based programs.
+ .
+ QApt Batch is a simple GUI for doing batch package management operations.
+ It can install and remove packages, as well as update the package cache via a
+ command line interface. It also has an attach function invokable via the
+ command line. QApt Batch is a drop-in replacement for the "install-package"
+ batch package management tool.
+
+Package: plasma-runner-installer
+Architecture: any
+Depends: qapt-batch (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Recommends: command-not-found
+Description: KRunner plugin for installing packages
+ QApt is a collection of tools and a library providing a wrapper around
+ APT. The intention is to ease the use of APT in Qt-based programs.
+ .
+ This KRunner plugin offers the option to install an application if its
+ command is typed in to KRunner and the application is not already
+ installed.
+
+Package: kde-thumbnailer-deb
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Enhances: dolphin, konqueror
+Multi-Arch: same
+Description: KDE plugin to show thumbnails of Debian package files
+ QApt is a collection of tools and a library providing a wrapper around
+ APT. The intention is to ease the use of APT in Qt-based programs.
+ .
+ A plugin for KDE file managers (Dolphin and Konqueror) to preview Debian
+ packages (.deb files) as thumbnails.
+
+Package: gstreamer-qapt
+Architecture: any
+Depends: libqapt3-runtime (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Replaces: gstreamer1.0-qapt (<< 3~)
+Breaks: gstreamer1.0-qapt (<< 3~)
+Description: GStreamer plugin to install codecs using QApt
+ QApt is a collection of tools and a library providing a wrapper around
+ APT. The intention is to ease the use of APT in Qt-based programs.
+ .
+ This package provides a plugin for the GStreamer multimedia framework
+ to search and to install audio and video codecs.
diff -pruN 3.0.5-5/debian/gstreamer-qapt.install 3.0.5-5ubuntu1/debian/gstreamer-qapt.install
--- 3.0.5-5/debian/gstreamer-qapt.install	1970-01-01 00:00:00.000000000 +0000
+++ 3.0.5-5ubuntu1/debian/gstreamer-qapt.install	2024-12-26 21:39:19.000000000 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/libexec/qapt-gst-helper
+usr/share/locale/*/LC_MESSAGES/qapt-gst-helper.qm
diff -pruN 3.0.5-5/debian/gstreamer-qapt.postinst 3.0.5-5ubuntu1/debian/gstreamer-qapt.postinst
--- 3.0.5-5/debian/gstreamer-qapt.postinst	1970-01-01 00:00:00.000000000 +0000
+++ 3.0.5-5ubuntu1/debian/gstreamer-qapt.postinst	2024-12-26 21:39:19.000000000 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+update-alternatives --install /usr/bin/gstreamer-codec-install \
+		    gstreamer-codec-install \
+		    /usr/lib/$DPKG_MAINTSCRIPT_ARCH/libexec/qapt-gst-helper 85 || true
+
+#DEBHELPER#
+
+exit 0
diff -pruN 3.0.5-5/debian/gstreamer-qapt.prerm 3.0.5-5ubuntu1/debian/gstreamer-qapt.prerm
--- 3.0.5-5/debian/gstreamer-qapt.prerm	1970-01-01 00:00:00.000000000 +0000
+++ 3.0.5-5ubuntu1/debian/gstreamer-qapt.prerm	2024-12-26 21:39:19.000000000 +0000
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
+	update-alternatives --remove gstreamer-codec-install \
+			    /usr/lib/$DPKG_MAINTSCRIPT_ARCH/libexec/qapt-gst-helper || true
+
+fi
+
+#DEBHELPER#
+
+exit 0
diff -pruN 3.0.5-5/debian/kde-thumbnailer-deb.install 3.0.5-5ubuntu1/debian/kde-thumbnailer-deb.install
--- 3.0.5-5/debian/kde-thumbnailer-deb.install	1970-01-01 00:00:00.000000000 +0000
+++ 3.0.5-5ubuntu1/debian/kde-thumbnailer-deb.install	2024-12-26 21:39:19.000000000 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/qt5/plugins/debthumbnailer.so
+usr/share/kservices5/debthumbnailer.desktop
diff -pruN 3.0.5-5/debian/not-installed 3.0.5-5ubuntu1/debian/not-installed
--- 3.0.5-5/debian/not-installed	1970-01-01 00:00:00.000000000 +0000
+++ 3.0.5-5ubuntu1/debian/not-installed	2024-12-28 08:19:37.000000000 +0000
@@ -0,0 +1 @@
+usr/share/locale/*/LC_MESSAGES/qapt-deb-installer.qm
diff -pruN 3.0.5-5/debian/patches/bump-cmake-minimim.patch 3.0.5-5ubuntu1/debian/patches/bump-cmake-minimim.patch
--- 3.0.5-5/debian/patches/bump-cmake-minimim.patch	1970-01-01 00:00:00.000000000 +0000
+++ 3.0.5-5ubuntu1/debian/patches/bump-cmake-minimim.patch	2025-10-28 10:12:29.000000000 +0000
@@ -0,0 +1,9 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ project(qapt)
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.5)
+ 
+ set(PROJECT_VERSION_MAJOR 3)
+ set(PROJECT_VERSION_MINOR 0)
diff -pruN 3.0.5-5/debian/patches/disable-qapt-deb-installer.patch 3.0.5-5ubuntu1/debian/patches/disable-qapt-deb-installer.patch
--- 3.0.5-5/debian/patches/disable-qapt-deb-installer.patch	1970-01-01 00:00:00.000000000 +0000
+++ 3.0.5-5ubuntu1/debian/patches/disable-qapt-deb-installer.patch	2024-12-28 08:19:37.000000000 +0000
@@ -0,0 +1,34 @@
+Description: disable qapt-deb-installer
+ It needs Qt5-based debconf-kde, which Ubuntu does not have anymore.
+Author: Dmitry Shachnev <mitya57@ubuntu.com>
+Forwarded: not-needed
+Last-Update: 2024-12-28
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -79,7 +79,6 @@ find_package(KF5WidgetsAddons ${KF5_DEP_
+ find_package(KF5WindowSystem ${KF5_DEP_VERSION})
+ find_package(KF5IconThemes ${KF5_DEP_VERSION})
+ 
+-find_package(DebconfKDE 1.0)
+ find_package(GStreamer 1.0)
+ find_package(GLIB2 2.0)
+ 
+@@ -90,8 +89,7 @@ if (KF5CoreAddons_FOUND
+         AND KF5TextWidgets_FOUND
+         AND KF5WidgetsAddons_FOUND
+         AND KF5WindowSystem_FOUND
+-        AND KF5IconThemes_FOUND
+-        AND DebconfKDE_FOUND)
++        AND KF5IconThemes_FOUND)
+     set(WITH_UTILS true)
+ endif()
+ 
+--- a/utils/CMakeLists.txt
++++ b/utils/CMakeLists.txt
+@@ -1,5 +1,4 @@
+ add_subdirectory(qapt-batch)
+-add_subdirectory(qapt-deb-installer)
+ add_subdirectory(qapt-deb-thumbnailer)
+ add_subdirectory(plasma-runner-installer)
+ 
diff -pruN 3.0.5-5/debian/patches/series 3.0.5-5ubuntu1/debian/patches/series
--- 3.0.5-5/debian/patches/series	2025-02-03 21:47:48.000000000 +0000
+++ 3.0.5-5ubuntu1/debian/patches/series	2025-10-28 10:12:29.000000000 +0000
@@ -1,2 +1,4 @@
 missing-includes.diff
 use-cxx-17.diff
+disable-qapt-deb-installer.patch
+bump-cmake-minimim.patch
diff -pruN 3.0.5-5/debian/plasma-runner-installer.install 3.0.5-5ubuntu1/debian/plasma-runner-installer.install
--- 3.0.5-5/debian/plasma-runner-installer.install	1970-01-01 00:00:00.000000000 +0000
+++ 3.0.5-5ubuntu1/debian/plasma-runner-installer.install	2024-12-26 21:39:19.000000000 +0000
@@ -0,0 +1,3 @@
+usr/lib/*/qt5/plugins/krunner_installer.so
+usr/share/kservices5/plasma-runner-installer.desktop
+usr/share/locale/*/LC_MESSAGES/plasma_runner_installer.qm
diff -pruN 3.0.5-5/debian/qapt-batch.install 3.0.5-5ubuntu1/debian/qapt-batch.install
--- 3.0.5-5/debian/qapt-batch.install	1970-01-01 00:00:00.000000000 +0000
+++ 3.0.5-5ubuntu1/debian/qapt-batch.install	2024-12-26 21:39:19.000000000 +0000
@@ -0,0 +1,2 @@
+usr/bin/qapt-batch
+usr/share/locale/*/LC_MESSAGES/qaptbatch.qm
diff -pruN 3.0.5-5/debian/qapt-batch.lintian-overrides 3.0.5-5ubuntu1/debian/qapt-batch.lintian-overrides
--- 3.0.5-5/debian/qapt-batch.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ 3.0.5-5ubuntu1/debian/qapt-batch.lintian-overrides	2024-12-26 21:39:19.000000000 +0000
@@ -0,0 +1,2 @@
+# doesn't need a manpage, only run from scripts or internally
+qapt-batch: no-manual-page [usr/bin/qapt-batch]
diff -pruN 3.0.5-5/debian/rules 3.0.5-5ubuntu1/debian/rules
--- 3.0.5-5/debian/rules	2025-10-10 05:01:28.000000000 +0000
+++ 3.0.5-5ubuntu1/debian/rules	2025-10-28 10:12:29.000000000 +0000
@@ -12,10 +12,3 @@ override_dh_auto_configure:
 override_dh_auto_test:
 	# Disable dh_auto_test
 	:
-
-execute_after_dh_auto_install:
-	# drop translations of not shipped components
-	rm debian/tmp/usr/share/locale/*/LC_MESSAGES/plasma_runner_installer.qm
-	rm debian/tmp/usr/share/locale/*/LC_MESSAGES/qapt-deb-installer.qm
-	rm debian/tmp/usr/share/locale/*/LC_MESSAGES/qapt-gst-helper.qm
-	rm debian/tmp/usr/share/locale/*/LC_MESSAGES/qaptbatch.qm
