[neon/kde/frameworkintegration/Neon/release] debian: use stable appstream

[Jonathan Esk-Riddell]

Git commit 572e2f11caefac26ec74bf329845e2c32e6ccaff by Jonathan Esk-Riddell.
Committed on 03/10/2023 at 18:28.
Pushed by jriddell into branch 'Neon/release'.

use stable appstream

M  +1    -1    debian/control
D  +0    -47   debian/patches/0001_appstreamqt
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/kde/frameworkintegration/-/commit/572e2f11caefac26ec74bf329845e2c32e6ccaff

diff --git a/debian/control b/debian/control
index 5ba73c9..1d8a348 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: cmake (>= 3.0~),
                dbus-x11,
                debhelper (>= 11~),
                extra-cmake-modules (>= 5.51.0~),
-               libappstreamqt5-dev,
+               libappstreamqt-dev,
                libkf5config-dev (>= 5.51.0~),
                libkf5configwidgets-dev (>= 5.51.0~),
                libkf5i18n-dev (>= 5.51.0~),
diff --git a/debian/patches/0001_appstreamqt b/debian/patches/0001_appstreamqt
deleted file mode 100644
index 29afdaa..0000000
--- a/debian/patches/0001_appstreamqt
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7f4b6ae164b9dfa68238570c9a207fdc24637036..deead76e522da51742df0efc3b821be821010f04 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -47,7 +47,7 @@ if (BUILD_KPACKAGE_INSTALL_HANDLERS)
-    find_package(KF5I18n ${KF_DEP_VERSION} REQUIRED)
- 
-    find_package(packagekitqt${QT_MAJOR_VERSION})
--   find_package(AppStreamQt 0.10.4)
-+   find_package(AppStreamQt5)
- endif()
- 
- ecm_set_disabled_deprecation_versions(
-
-diff --git a/src/kpackage-install-handlers/CMakeLists.txt b/src/kpackage-install-handlers/CMakeLists.txt
-index d0bf7f0c1e3b49b6440dd1006032a66dd8c8e9fe..a7c126f73b892093b3079dd4bb89da4fd7e7ee7c 100644
---- a/src/kpackage-install-handlers/CMakeLists.txt
-+++ b/src/kpackage-install-handlers/CMakeLists.txt
-@@ -1,5 +1,5 @@
- add_subdirectory(kns)
- 
--if(AppStreamQt_FOUND AND packagekitqt5_FOUND)
-+if(AppStreamQt5_FOUND AND packagekitqt5_FOUND)
-     add_subdirectory(appstream)
- endif()
-diff --git a/src/kpackage-install-handlers/appstream/CMakeLists.txt b/src/kpackage-install-handlers/appstream/CMakeLists.txt
-index 8db1bdb76e16997280026745ae602ffcf60ee520..9552c5f6b89635f42feeb96aa2be35ceb1773a8f 100644
---- a/src/kpackage-install-handlers/appstream/CMakeLists.txt
-+++ b/src/kpackage-install-handlers/appstream/CMakeLists.txt
-@@ -1,3 +1,3 @@
- add_executable(appstreamhandler main.cpp)
--target_link_libraries(appstreamhandler PK::packagekitqt5 AppStreamQt)
-+target_link_libraries(appstreamhandler PK::packagekitqt5 AppStreamQt5)
- install(TARGETS appstreamhandler DESTINATION ${KDE_INSTALL_LIBEXECDIR_KF}/kpackagehandlers)
-diff --git a/src/kpackage-install-handlers/appstream/main.cpp b/src/kpackage-install-handlers/appstream/main.cpp
-index 82328f7068228b79f82e085352d3d78733dcd4b5..8bde139b243eb3f42ca10f1005018100e3121f79 100644
---- a/src/kpackage-install-handlers/appstream/main.cpp
-+++ b/src/kpackage-install-handlers/appstream/main.cpp
-@@ -5,7 +5,7 @@
-     SPDX-License-Identifier: LGPL-2.0-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
- */
- 
--#include <AppStreamQt/pool.h>
-+#include <AppStreamQt5/pool.h>
- #include <PackageKit/Daemon>
- #include <QCoreApplication>
- #include <QDebug>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 13a8193..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001_appstreamqt
\ No newline at end of file