debian/changelog

@@ -1,10 +1,3 @@
-lxqt-qtplugin (2.1.0-0ubuntu1) UNRELEASED; urgency=medium
-
-  * New upstream release.
-    - Bump build dependencies.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 05 Nov 2024 13:39:00 -0600
-
 lxqt-qtplugin (2.0.0-0ubuntu3) plucky; urgency=medium
 
   * No-change rebuild against Qt 6.7.2 private-abi.
@@ -13,7 +6,7 @@ lxqt-qtplugin (2.0.0-0ubuntu3) plucky; urgency=medium
 
 lxqt-qtplugin (2.0.0-0ubuntu2) oracular; urgency=medium
 
-  * Temporary fix for FTBFS on arm64.
+  * Temporary fix for FTBFS on arm64. 
     - d/patches: Add set-qt-plugin-dir-via-configure.patch.
     - d/rules: Pass QT_PLUGINS_DIR to configure.
 

debian/control

@@ -1,6 +1,6 @@
 Source: lxqt-qtplugin
 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>,
            Andrew Lee (李健秋) <ajqlee@debian.org>,
            ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
@@ -10,27 +10,27 @@ Uploaders: Alf Gaida <agaida@siduction.org>,
 Section: x11
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
-               libdbusmenu-lxqt0-dev (>= 0.2.0),
+               libdbusmenu-lxqt0-dev,
-               libfm-qt6-dev (>= 2.1.0),
+               libfm-qt6-dev (>= 2.0.0),
                libkf6windowsystem-dev,
-               libqt6xdg-dev (>= 4.1.0),
+               libqt6xdg-dev (>= 4.0.0),
-               libqt6xdgiconloader-dev (>= 4.1.0),
+               libqt6xdgiconloader-dev (>= 4.0.0),
                libx11-dev,
-               lxqt-build-tools (>= 2.1.0),
+               lxqt-build-tools (>= 2.0.0),
-               qt6-base-private-dev (>= 6.6.0),
+               qt6-base-private-dev,
-               qt6-svg-dev (>= 6.6.0)
+               qt6-svg-dev
 Standards-Version: 4.7.0
 Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-qtplugin-packaging
 Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-qtplugin-packaging.git
-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-qtplugin
+XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-qtplugin
-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-qtplugin.git
+XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-qtplugin.git
 Homepage: https://github.com/lxqt/lxqt-qtplugin
 Rules-Requires-Root: no
 
 Package: lxqt-qtplugin
 Architecture: any
 Multi-Arch: same
-Depends: libfm-qt6-15, ${misc:Depends}, ${shlibs:Depends}
+Depends: libfm-qt6-14, ${misc:Depends}, ${shlibs:Depends}
 Recommends: lxqt-config, lxqt-session
 Suggests: lxqt | lxqt-core
 Description: LXQt system integration plugin for Qt

debian/patches/series

@@ -0,0 +1 @@
+set-qt-plugins-dir-via-configure.patch

debian/patches/set-qt-plugins-dir-via-configure.patch

@@ -0,0 +1,17 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -51,10 +51,10 @@
+ endif()
+ 
+ # execute the command "qmake -query QT_INSTALL_PLUGINS" to get the path of plugins dir.
+-execute_process(COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_INSTALL_PLUGINS
+-    OUTPUT_VARIABLE QT_PLUGINS_DIR
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-)
++#execute_process(COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_INSTALL_PLUGINS
++#    OUTPUT_VARIABLE QT_PLUGINS_DIR
++#    OUTPUT_STRIP_TRAILING_WHITESPACE
++#)
+ if(QT_PLUGINS_DIR)
+     message(STATUS "Qt6 plugin directory:" "${QT_PLUGINS_DIR}")
+ else()