[neon/forks/kaidan/Neon/unstable_jammy] debian: rebase

[Carlos De Maine]

Git commit ef049aee32d3aa3c2f1ab9e4775b71114effde5d by Carlos De Maine.
Committed on 08/09/2024 at 09:36.
Pushed by carlosdem into branch 'Neon/unstable_jammy'.

rebase

M  +2    -2    debian/changelog
M  +2    -3    debian/control
M  +7    -9    debian/patches/qt5_suffix.diff

https://invent.kde.org/neon/forks/kaidan/-/commit/ef049aee32d3aa3c2f1ab9e4775b71114effde5d

diff --cc debian/changelog
index 4a9784b,38aad7f..0156c65
--- a/debian/changelog
+++ b/debian/changelog
@@@ -106,4 -106,4 +106,4 @@@ kaidan (0.0.1-1) experimental; urgency=
  
    * Initial release of the debian package
  
-- -- JBBgameich <jbb.mail at gmx.de>  Mon, 13 Feb 2017 19:11:03 +0100
++ -- JBBgameich <jbb.mail at gmx.de>  Mon, 13 Feb 2017 19:11:03 +0100
diff --cc debian/patches/qt5_suffix.diff
index dfd25fa,db3f106..88831aa
--- a/debian/patches/qt5_suffix.diff
+++ b/debian/patches/qt5_suffix.diff
@@@ -1,13 -1,12 +1,11 @@@
- diff --git a/CMakeLists.txt b/CMakeLists.txt
- index 073e95bf..89ba5725 100644
  --- a/CMakeLists.txt
  +++ b/CMakeLists.txt
- @@ -86,7 +86,7 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Concurrent
-  find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS KIO CoreAddons Kirigami2)
-  find_package(KF5KirigamiAddons 0.10.0 REQUIRED)
+ @@ -78,7 +78,7 @@
+  find_package(KQuickImageEditor REQUIRED)
+  find_package(KF5KirigamiAddons 0.7.0 REQUIRED)
   find_package(ZXing REQUIRED)
- -find_package(QXmpp 1.6.0 REQUIRED COMPONENTS Omemo)
- +find_package(QXmppQt5 1.6.0 REQUIRED COMPONENTS Omemo)
+ -find_package(QXmpp 1.5.0 REQUIRED COMPONENTS Omemo)
+ +find_package(QXmppQt5 1.5.0 REQUIRED COMPONENTS Omemo)
   
-  find_package(ICU 61.0 COMPONENTS uc)
-  set_package_properties(ICU PROPERTIES
+  # Optional QtQuickCompiler
+  if(QUICK_COMPILER)
 -