debian/changelog

@@ -1,83 +1,3 @@
-lxqt-qtplugin (2.1.0-0ubuntu1) plucky; urgency=medium
-
-  * New upstream release.
-    - Bump build dependencies.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 15 Nov 2024 15:33:06 -0600
-
-lxqt-qtplugin (2.0.0-0ubuntu3) plucky; urgency=medium
-
-  * No-change rebuild against Qt 6.7.2 private-abi.
-
- -- Rik Mills <rikmills@kde.org>  Thu, 17 Oct 2024 17:53:25 +0100
-
-lxqt-qtplugin (2.0.0-0ubuntu2) oracular; urgency=medium
-
-  * Temporary fix for FTBFS on arm64.
-    - d/patches: Add set-qt-plugin-dir-via-configure.patch.
-    - d/rules: Pass QT_PLUGINS_DIR to configure.
-
- -- Rik Mills <rikmills@kde.org>  Wed, 28 Aug 2024 14:06:13 +0100
-
-lxqt-qtplugin (2.0.0-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:23:05 -0500
-
-lxqt-qtplugin (1.4.0-0ubuntu2) noble; urgency=medium
-
-  * Bump dependency for new upstream version.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 13 Nov 2023 12:52:43 -0600
-
-lxqt-qtplugin (1.4.0-0ubuntu1) noble; urgency=medium
-
-  * New upstream release.
-  * Fixed copyright file.
-  * Bumped and fixed build dependency versions.
-
- -- Aaron Rainbolt <arraybolt3@gmail.com>  Wed, 08 Nov 2023 16:52:40 -0600
-
-lxqt-qtplugin (1.3.0-0ubuntu1) mantic; urgency=medium
-
-  * New upstream release.
-  * Bump build dependencies.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 03 Aug 2023 10:43:09 -0500
-
-lxqt-qtplugin (1.2.0-0ubuntu4) lunar; urgency=medium
-
-  * Removed trailing whitespace from changelog.
-  * Updated copyright file.
-  * Bumped Standards-Version to 4.6.2, no changes necessary.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 09 Feb 2023 22:34:25 -0600
-
-lxqt-qtplugin (1.2.0-0ubuntu3) lunar; urgency=medium
-
-  * No-change rebuild against Qt 5.15.8.
-
- -- Dmitry Shachnev <mitya57@ubuntu.com>  Sat, 14 Jan 2023 13:10:25 +0300
-
-lxqt-qtplugin (1.2.0-0ubuntu2) lunar; urgency=medium
-
-  * No-change rebuild against Qt 5.15.7.
-
- -- Dmitry Shachnev <mitya57@ubuntu.com>  Sat, 10 Dec 2022 15:59:29 +0300
-
-lxqt-qtplugin (1.2.0-0ubuntu1) lunar; urgency=medium
-
-  * New upstream release.
-  * Fix the watch file, for real this time.
-  * Lubuntuify the package slightly, to make debhelper happy.
-  * Bump build and runtime dependencies in debian/control.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 17 Nov 2022 16:40:59 -0600
-
 lxqt-qtplugin (1.1.0-1) experimental; urgency=medium
 
   [ Aaron Rainbolt ]

debian/control

@@ -1,6 +1,5 @@
 Source: lxqt-qtplugin
-Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
-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 +9,26 @@ Uploaders: Alf Gaida <agaida@siduction.org>,
 Section: x11
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
-               libdbusmenu-lxqt0-dev (>= 0.2.0),
+               libdbusmenu-qt5-dev,
-               libfm-qt6-dev (>= 2.1.0),
+               libfm-qt-dev (>= 1.1.0),
-               libkf6windowsystem-dev,
+               libkf5windowsystem-dev,
-               libqt6xdg-dev (>= 4.1.0),
+               libqt5svg5-dev,
-               libqt6xdgiconloader-dev (>= 4.1.0),
+               libqt5x11extras5-dev,
+               libqt5xdg-dev,
+               libqt5xdgiconloader-dev (>= 3.9.1),
                libx11-dev,
-               lxqt-build-tools (>= 2.1.0),
+               lxqt-build-tools (>= 0.11.0),
-               qt6-base-private-dev (>= 6.6.0),
+               qtbase5-private-dev
-               qt6-svg-dev (>= 6.6.0)
+Standards-Version: 4.6.1
-Standards-Version: 4.7.0
+Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-qtplugin
-Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-qtplugin-packaging
+Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-qtplugin.git
-Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-qtplugin-packaging.git
-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-qtplugin
-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-qt11, ${misc:Depends}, ${shlibs:Depends}
 Recommends: lxqt-config, lxqt-session
 Suggests: lxqt | lxqt-core
 Description: LXQt system integration plugin for Qt

debian/copyright

@@ -3,20 +3,14 @@ Upstream-Name: lxqt-qtplugin
 Source: https://github.com/lxqt/lxqt-qtplugin
 
 Files: *
-Copyright: 2013-2024 LXQt team
+Copyright: 2014-2022 LXQt team
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2021-2024 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+Copyright: 2021-2022 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+           2014-2019 Alf Gaida <agaida@siduction.org>
            2015      ChangZhuo Chen (陳昌倬) <czchen@debian.org>
            2015      Yukiharu YABUKI <yyabuki@debian.org>
-           2014-2019 Alf Gaida <agaida@siduction.org>
-           2019      Rik Mills <rikmills@kubuntu.org>
-           2021      Raman Sarda <theloudspeaker@lubuntu.me>
-           2019-2021 apt-ghetto <apt-ghetto@protonmail.com>
-           2021      Dan Simmons <kc2bez@lubuntu.me>
-           2018-2023 Simon Quigley <tsimonq2@ubuntu.com>
-           2023      Aaron Rainbolt <arraybolt3@gmail.com>
 License: LGPL-2.1+
 
 License: LGPL-2.1+

debian/rules

@@ -9,5 +9,4 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 override_dh_auto_configure:
 	dh_auto_configure --\
-		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo
-		-DQT_PLUGINS_DIR=/usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins

debian/watch

@@ -1,5 +1,3 @@
 version=4
-opts="searchmode=plain, \
+opts="pgpsigurlmangle=s/$/.asc/" \
-pgpsigurlmangle=s/$/.asc/, \
+https://github.com/lxqt/lxqt-qtplugin/releases .*/lxqt-qtplugin-([\d\.]+).tar.xz
-uversionmangle=s/(\d+\.\d+\.\d+).*/$1/" \
-  https://api.github.com/repos/lxqt/@PACKAGE@/releases https:\/\/github.com\/lxqt\/@PACKAGE@\/releases\/download\/@ANY_VERSION@\/@PACKAGE@-@ANY_VERSION@.tar.xz