Backport to Jammy.

debian/changelog

@@ -1,24 +1,8 @@
-lxqt-notificationd (2.1.1-0ubuntu1) plucky; urgency=medium
+lxqt-notificationd (1.4.0-0ubuntu1~ppa1) jammy; urgency=medium
 
-  * New upstream release.
+  * Backport to Jammy.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 10 Dec 2024 17:44:52 -0600
-
-lxqt-notificationd (2.1.0-0ubuntu1) plucky; urgency=medium
-
-  * New upstream release.
-    - Bump build dependencies.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 15 Nov 2024 15:32:43 -0600
-
-lxqt-notificationd (2.0.1-0ubuntu1) oracular; urgency=medium
-
-  * New upstream release.
-  * Update copyright file.
-  * Bump Standards-Version to 4.7.0, no changes necessary.
-  * Adjust build dependencies.
 
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 15 Aug 2024 16:38:59 -0500
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sun, 12 Nov 2023 18:30:44 -0600
 
 lxqt-notificationd (1.4.0-0ubuntu1) noble; urgency=medium
 

debian/control

@@ -1,25 +1,23 @@
 Source: lxqt-notificationd
 Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
 Uploaders: Alf Gaida <agaida@siduction.org>,
            ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
            Andrew Lee (李健秋) <ajqlee@debian.org>
 Section: x11
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
-               layer-shell-qt,
+               libkf5windowsystem-dev,
-               libkf6windowsystem-dev (>= 6.0.0),
+               liblxqt1-dev (>= 1.4.0),
-               liblayershellqtinterface-dev (>= 6.0.0),
+               libqt5svg5-dev,
-               liblxqt2-dev (>= 2.1.0),
+               libqt5x11extras5-dev,
                libx11-dev,
-               qt6-base-private-dev (>= 6.6.0),
+               qtbase5-private-dev
-               qt6-svg-dev (>= 6.6.0),
+Standards-Version: 4.6.2
-               qt6-wayland-dev (>= 6.6.0)
-Standards-Version: 4.7.0
 Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-notificationd-packaging
 Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-notificationd-packaging.git
-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-notificationd
+XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-notificationd
-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-notificationd.git
+XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-notificationd.git
 Rules-Requires-Root: no
 Homepage: https://github.com/lxqt/lxqt-notificationd
 
@@ -37,7 +35,7 @@ Package: lxqt-notificationd-l10n
 Architecture: all
 Multi-Arch: foreign
 Section: localization
-Depends: qt6-translations-l10n, ${misc:Depends}
+Depends: qttranslations5-l10n, ${misc:Depends}
 Description: Language package for lxqt-notificationd
  The l10n files for lxqt-notificationd.
  .

debian/copyright

@@ -3,7 +3,7 @@ Upstream-Name: lxqt-notificationd
 Source: https://github.com/lxqt/lxqt-notificationd
 
 Files: *
-Copyright: 2012-2024 LXQt team
+Copyright: 2012-2023 LXQt team
            2010-2012 Razor team
 License: LGPL-2.1+
 
@@ -14,7 +14,7 @@ Copyright: 2012, Alec Moskvin <alecm@gmx.com>
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2021-2024, Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+Copyright: 2021-2023, Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
            2014-2018, Alf Gaida <agaida@siduction.org>
            2015,      Andrew Lee (李健秋) <ajqlee@debian.org>
 License: LGPL-2.1+

debian/lxqt-notificationd.lintian-overrides

@@ -1,4 +0,0 @@
-# This is expected
-lxqt-notificationd: desktop-entry-lacks-keywords-entry [usr/share/applications/*.desktop]
-lxqt-notificationd: desktop-entry-invalid-category LXQt [usr/share/applications/*.desktop]
-lxqt-notificationd: no-manual-page [usr/bin/*]

debian/patches/revert-kwindowsystem-port.patch

@@ -0,0 +1,30 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,7 +16,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+ option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
+ option(LXQT_NOTIFICATION_BUILD_TESTS "Build LXQt Notification tests" OFF)
+ 
+-set(KF5_MINIMUM_VERSION "5.101.0")
++set(KF5_MINIMUM_VERSION "5.36.0")
+ set(LXQT_MINIMUM_VERSION "1.4.0")
+ set(QT_MINIMUM_VERSION "5.15.0")
+ 
+--- a/src/notification.cpp
++++ b/src/notification.cpp
+@@ -33,7 +33,6 @@
+ #include <QDebug>
+ #include <XdgIcon>
+ #include <KWindowSystem/KWindowSystem>
+-#include <KWindowSystem/KX11Extras>
+ #include <QMouseEvent>
+ #include <QPushButton>
+ #include <QStyle>
+@@ -327,7 +326,7 @@ void Notification::mouseReleaseEvent(QMo
+         return;
+     }
+ 
+-    const auto ids = KX11Extras::stackingOrder();
++    const auto ids = KWindowSystem::stackingOrder();
+     for (const WId &i : ids)
+     {
+         KWindowInfo info = KWindowInfo(i, NET::WMName | NET::WMVisibleName);

debian/patches/series

@@ -0,0 +1 @@
+revert-kwindowsystem-port.patch

debian/source/lintian-overrides

@@ -1,2 +0,0 @@
-# This is expected
-lxqt-notificationd source: very-long-line-length-in-source-file * > 512 [test/lxqt-notification-test.sh:*]