7 changed files with 178 additions and 116 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,118 +1,106 @@
-lxqt-qtplugin (2.1.0-0ubuntu1) plucky; urgency=medium
+lxqt-qtplugin (0.16.0-1ubuntu2) hirsute; 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
+  * New upstream version.
+  * Bumped debhelper-compat to 13.

-  * Temporary fix for FTBFS on arm64.
-    - d/patches: Add set-qt-plugin-dir-via-configure.patch.
-    - d/rules: Pass QT_PLUGINS_DIR to configure.
+ -- Raman Sarda <theloudspeaker@lubuntu.me>  Thu, 18 Feb 2021 23:55:14 +0530

- -- Rik Mills <rikmills@kde.org>  Wed, 28 Aug 2024 14:06:13 +0100
+lxqt-qtplugin (0.16.0-1) unstable; urgency=medium

-lxqt-qtplugin (2.0.0-0ubuntu1) oracular; urgency=medium
+  [ Alf Gaida ]
+  * Switched to gbp
+  * Bumped Standards-Version to 4.4.0, no changes needed
+  * Removed no longer needed patches, applied upstream

-  * New upstream release.
-  * Update copyright file.
-  * Bump Standards-Version to 4.7.0, no changes necessary.
-  * Adjust build dependencies.
+  [ Andrew Lee (李健秋) ]
+  * New upstream release. (Closes: #977329)

- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 15 Aug 2024 16:23:05 -0500
+ -- Andrew Lee (李健秋) <ajqlee@debian.org>  Thu, 07 Jan 2021 17:53:47 +0800

-lxqt-qtplugin (1.4.0-0ubuntu2) noble; urgency=medium
+lxqt-qtplugin (0.15.0-0ubuntu3) hirsute; urgency=medium

-  * Bump dependency for new upstream version.
+  * No-change rebuild against qtbase-abi-5-15-2.

- -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 13 Nov 2023 12:52:43 -0600
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Fri, 27 Nov 2020 22:54:27 +0300

-lxqt-qtplugin (1.4.0-0ubuntu1) noble; urgency=medium
+lxqt-qtplugin (0.15.0-0ubuntu2) hirsute; urgency=medium

-  * New upstream release.
-  * Fixed copyright file.
-  * Bumped and fixed build dependency versions.
+  * No-change rebuild against qtbase-abi-5-15-1.

- -- Aaron Rainbolt <arraybolt3@gmail.com>  Wed, 08 Nov 2023 16:52:40 -0600
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Fri, 30 Oct 2020 20:11:14 +0300

-lxqt-qtplugin (1.3.0-0ubuntu1) mantic; urgency=medium
+lxqt-qtplugin (0.15.0-0ubuntu1) groovy; urgency=medium

-  * New upstream release.
-  * Bump build dependencies.
+  [ apt-ghetto ]
+  * Removed load-versioned-libfm-qt.patch
+  * Added libfm-qt-dev as build dependency
+  * Added libfm-qt6 as dependency

- -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 03 Aug 2023 10:43:09 -0500
+  [ Simon Quigley ]
+  * New upstream version.
+    - Update upstream signing key.
+    - Update LXQt build dependencies.
+  * Bump Standards-version to 4.5.0, no changes needed.
+  * Run wrap-and-sort.
+  * Bump libfm-qt{6,7}.

-lxqt-qtplugin (1.2.0-0ubuntu4) lunar; urgency=medium
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 03 Jun 2020 23:37:36 -0500

-  * Removed trailing whitespace from changelog.
-  * Updated copyright file.
-  * Bumped Standards-Version to 4.6.2, no changes necessary.
+lxqt-qtplugin (0.14.0-3ubuntu3) focal; urgency=medium

- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 09 Feb 2023 22:34:25 -0600
+  * No-change rebuild against qtbase-abi-5-12-5.

-lxqt-qtplugin (1.2.0-0ubuntu3) lunar; urgency=medium
+ -- Rik Mills <rikmills@kde.org>  Sun, 27 Oct 2019 06:30:03 +0000

-  * No-change rebuild against Qt 5.15.8.
+lxqt-qtplugin (0.14.0-3ubuntu2) eoan; urgency=medium

- -- Dmitry Shachnev <mitya57@ubuntu.com>  Sat, 14 Jan 2023 13:10:25 +0300
+  * No-change rebuild against qtbase-abi-5-12-4.

-lxqt-qtplugin (1.2.0-0ubuntu2) lunar; urgency=medium
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Sat, 13 Jul 2019 17:11:05 +0300

-  * No-change rebuild against Qt 5.15.7.
+lxqt-qtplugin (0.14.0-3ubuntu1) eoan; urgency=medium

- -- Dmitry Shachnev <mitya57@ubuntu.com>  Sat, 10 Dec 2022 15:59:29 +0300
+  * Merge from Debian Sid. Remaining changes:
+    - Explicitly depend on libqt5xdg-dev.
+    - Bump the ABI package to libfm-qt6.
+    - Remove unneeded ~s from versions.

-lxqt-qtplugin (1.2.0-0ubuntu1) lunar; urgency=medium
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 03 May 2019 08:45:05 -0500

-  * 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.
+lxqt-qtplugin (0.14.0-3) unstable; urgency=medium

- -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 17 Nov 2022 16:40:59 -0600
+  * Try to load the versioned libfm-qt.so.6 instead of libfm-qt.so
+    (Closes: #927905) 

-lxqt-qtplugin (1.1.0-1) experimental; urgency=medium
+ -- Alf Gaida <agaida@siduction.org>  Wed, 24 Apr 2019 23:05:04 +0200

-  [ Aaron Rainbolt ]
-  * New upstream release 1.1.0.
-  * Removed obsolete debian/compat file.
-  * Switched to GBP.
-  * Upstreamed non-Ubuntu-specific packaging changes from Ubuntu, modifying
-    the following files:
-    - control
-    - copyright
-    - upstream/*
+lxqt-qtplugin (0.14.0-2) unstable; urgency=medium

-  [ Simon Quigley ]
-  * Re-add the existing uploaders to debian/control.
+  * Added missed direct dependency libqt5xdgiconloader-dev, the new
+    build-tools don't depend on it any longer to prevent circular
+    dependencies with libqtxdg (Closes: #924474).

- -- Aaron Rainbolt <arraybolt3@gmail.com>  Sun, 10 Jul 2022 00:29:24 -0500
+ -- Alf Gaida <agaida@siduction.org>  Wed, 13 Mar 2019 17:59:00 +0100

-lxqt-qtplugin (0.16.0-1) unstable; urgency=medium
+lxqt-qtplugin (0.14.0-1) unstable; urgency=medium

-  [ Alf Gaida ]
-  * Switched to gbp
-  * Bumped Standards-Version to 4.4.0, no changes needed
-  * Removed no longer needed patches, applied upstream
+  * Cherry-picking upstream release 0.14.0.
+  * Bumped Standards to 4.3.0, no changes needed
+  * Dropped d/compat, use debhelper-compat = 12, no changes needed
+  * Fixed years in d/copyright
+  * Bumped minimum version liblxqt0-dev (>= 0.14.0~)
+  * Removed build dependency libfm-qt-dev
+  * Recommend libfm-qt6
+  * Added d/upstream/metadata

-  [ Andrew Lee (李健秋) ]
-  * New upstream release. (Closes: #977329)
+ -- Alf Gaida <agaida@siduction.org>  Sun, 27 Jan 2019 18:08:59 +0100

- -- Andrew Lee (李健秋) <ajqlee@debian.org>  Thu, 07 Jan 2021 17:53:47 +0800
+lxqt-qtplugin (0.14.0-0ubuntu3) disco; urgency=medium

-lxqt-qtplugin (0.14.0-3) unstable; urgency=medium
+  * Rebuild against qtbase-abi-5-12-2.
+  * Explicity build depend on libqt5xdg-dev.

-  * Try to load the versioned libfm-qt.so.6 instead of libfm-qt.so
-    (Closes: #927905)
-
- -- Alf Gaida <agaida@siduction.org>  Wed, 24 Apr 2019 23:05:04 +0200
+ -- Rik Mills <rikmills@kubuntu.org>  Sun, 31 Mar 2019 10:34:46 +0100

 lxqt-qtplugin (0.14.0-2) unstable; urgency=medium

@ -122,6 +110,12 @@ lxqt-qtplugin (0.14.0-2) unstable; urgency=medium

 -- Alf Gaida <agaida@siduction.org>  Wed, 13 Mar 2019 17:59:00 +0100

+lxqt-qtplugin (0.14.0-0ubuntu2) disco; urgency=medium
+
+  * Recommend libfm-qt6 instead.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sun, 27 Jan 2019 21:01:22 -0600
+
 lxqt-qtplugin (0.14.0-1) unstable; urgency=medium

  * Cherry-picking upstream release 0.14.0.
@ -135,6 +129,54 @@ lxqt-qtplugin (0.14.0-1) unstable; urgency=medium

 -- Alf Gaida <agaida@siduction.org>  Sun, 27 Jan 2019 18:08:59 +0100

+lxqt-qtplugin (0.14.0-0ubuntu1) disco; urgency=medium
+
+  * New upstream release.
+    - Bump build dependencies.
+    - Remove reverse-applicable patches.
+  * Bump Standards-version to 4.3.0, no changes needed.
+  * Bump debhelper compat to 12, no changes needed.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 26 Jan 2019 00:44:38 -0600
+
+lxqt-qtplugin (0.13.0-2) unstable; urgency=medium
+
+  * Switched to unstable
+  * Bumped build dependency libfm-qt-dev to >= 0.13.1~
+  * Bumped Standards to 4.1.5, no changes needed
+
+ -- Alf Gaida <agaida@siduction.org>  Sat, 07 Jul 2018 14:13:08 +0200
+
+lxqt-qtplugin (0.13.0-1) experimental; urgency=medium
+
+  * Cherry-picking upstream release 0.13.0.
+  * Switched to experimental
+  * Bumped build dependency libfm-qt-dev to >= 0.13.0~
+  * Bumped build dependency lxqt-build-tools to >= 0.5.0~
+  * Removed the ported back upstream patches
+
+ -- Alf Gaida <agaida@siduction.org>  Sat, 26 May 2018 01:13:13 +0200
+
+lxqt-qtplugin (0.13.0-0ubuntu4) cosmic; urgency=medium
+
+  * Bump Standards-version to 4.1.5, no changes needed.
+  * Lubuntuify the package.
+  * Dynamically load libfm-qt on runtime instead of on build time.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 30 Jul 2018 19:34:33 -0500
+
+lxqt-qtplugin (0.13.0-0ubuntu3) cosmic; urgency=medium
+
+  * No-change rebuild against qtbase-abi-5-11-0.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 18 Jul 2018 03:18:15 -0500
+
+lxqt-qtplugin (0.13.0-0ubuntu2) cosmic; urgency=medium
+
+  * No-change rebuild against libfm-qt.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 14 Jul 2018 01:34:06 -0500
+
 lxqt-qtplugin (0.13.0-2) unstable; urgency=medium

  * Switched to unstable
@ -153,6 +195,15 @@ lxqt-qtplugin (0.13.0-1) experimental; urgency=medium

 -- Alf Gaida <agaida@siduction.org>  Sat, 26 May 2018 01:13:13 +0200

+lxqt-qtplugin (0.13.0-0ubuntu1) cosmic; urgency=medium
+
+  * New upstream release.
+  * Update build dependencies.
+  * Bump Standards-version to 4.1.4, no changes needed.
+  * Remove patches applied upstream.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 23 May 2018 22:40:20 -0500
+
 lxqt-qtplugin (0.12.0-7) unstable; urgency=medium

  * Relax debhelper minimum version to >= 11~
@ -162,6 +213,17 @@ lxqt-qtplugin (0.12.0-7) unstable; urgency=medium

 -- Alf Gaida <agaida@siduction.org>  Sat, 28 Apr 2018 16:10:41 +0200

+lxqt-qtplugin (0.12.0-6ubuntu1) bionic; urgency=medium
+
+  * Merge from Debian Sid. Remaining changes:
+    - Cherry-pick an upstream commit because the upstream release cycle is too
+      slow:
+      + Remember the view mode.
+        * remember-view-mode.patch
+        * Upstream commit dfa18ac.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sun, 18 Feb 2018 22:48:24 -0600
+
 lxqt-qtplugin (0.12.0-6) unstable; urgency=medium

  * Backported lxqtplatformtheme-follow-color-scheme.patch
@ -181,6 +243,16 @@ lxqt-qtplugin (0.12.0-5) unstable; urgency=medium

 -- Alf Gaida <agaida@siduction.org>  Mon, 12 Feb 2018 19:52:16 +0100

+lxqt-qtplugin (0.12.0-4ubuntu1) bionic; urgency=medium
+
+  * Cherry-pick an upstream commit because the upstream release cycle is too
+    slow:
+    - Remember the view mode.
+      + remember-view-mode.patch
+      + Upstream commit dfa18ac.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 05 Feb 2018 21:33:02 -0600
+
 lxqt-qtplugin (0.12.0-4) unstable; urgency=medium

  * Bumped Standards to 4.1.2, no changes needed
@ -309,3 +381,4 @@ lxqt-qtplugin (0.9.0+20150819-1) unstable; urgency=medium
  * Added README.Debian.

 -- Yukiharu YABUKI <yyabuki@debian.org>  Thu, 20 Aug 2015 05:49:28 +0900
+
--- a/debian/control
+++ b/debian/control
@ -1,36 +1,31 @@
 Source: lxqt-qtplugin
 Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-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>,
-           Yukiharu YABUKI <yyabuki@debian.org>,
-           Simon Quigley <tsimonq2@debian.org>,
-           Aaron Rainbolt <arraybolt3@gmail.com>
+XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
 Section: x11
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
-               libdbusmenu-lxqt0-dev (>= 0.2.0),
-               libfm-qt6-dev (>= 2.1.0),
-               libkf6windowsystem-dev,
-               libqt6xdg-dev (>= 4.1.0),
-               libqt6xdgiconloader-dev (>= 4.1.0),
+               libdbusmenu-qt5-dev,
+               libfm-qt-dev (>= 0.16.0~),
+               libkf5windowsystem-dev,
+               libqt5svg5-dev,
+               libqt5x11extras5-dev,
+               libqt5xdg-dev,
+               libqt5xdgiconloader-dev (>= 3.5.0),
               libx11-dev,
-               lxqt-build-tools (>= 2.1.0),
-               qt6-base-private-dev (>= 6.6.0),
-               qt6-svg-dev (>= 6.6.0)
-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
-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-qtplugin.git
-Homepage: https://github.com/lxqt/lxqt-qtplugin
-Rules-Requires-Root: no
+               lxqt-build-tools (>= 0.8.0~),
+               qtbase5-private-dev
+Standards-Version: 4.5.0
+Vcs-Browser: https://phab.lubuntu.me/source/lxqt-qtplugin/
+Vcs-Git: https://phab.lubuntu.me/source/lxqt-qtplugin.git
+XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-qtplugin
+XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-qtplugin
+Homepage: https://github.com/lxde/lxqt-qtplugin

 Package: lxqt-qtplugin
 Architecture: any
 Multi-Arch: same
-Depends: libfm-qt6-15, ${misc:Depends}, ${shlibs:Depends}
+Depends: libfm-qt8, ${misc:Depends}, ${shlibs:Depends}
 Recommends: lxqt-config, lxqt-session
 Suggests: lxqt | lxqt-core
 Description: LXQt system integration plugin for Qt
--- a/debian/copyright
+++ b/debian/copyright
@ -3,20 +3,14 @@ Upstream-Name: lxqt-qtplugin
 Source: https://github.com/lxqt/lxqt-qtplugin

 Files: *
-Copyright: 2013-2024 LXQt team
+Copyright: 2013-2019 LXQt team
+           2010-2012 Razor team
 License: LGPL-2.1+

 Files: debian/*
-Copyright: 2021-2024 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+Copyright: 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+
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@ -3,3 +3,4 @@ debian-branch = debian/sid
 upstream-branch = upstream/latest
 pristine-tar = True
 compression = xz
+
--- a/debian/rules
+++ b/debian/rules
@ -2,6 +2,7 @@
 # export DH_VERBOSE=1

 export LC_ALL=C.UTF-8
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all

 %:
@ -9,5 +10,4 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all

 override_dh_auto_configure:
 	dh_auto_configure --\
-		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-		-DQT_PLUGINS_DIR=/usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@ -3,3 +3,4 @@ Bug-Database: https://github.com/lxqt/lxqt-qtplugin/issues
 Bug-Submit: https://github.com/lxqt/lxqt-qtplugin/issues/new
 Changelog: https://github.com/lxqt/lxqt-qtplugin/blob/master/CHANGELOG
 Repository: https://github.com/lxqt/lxqt-qtplugin
+Repository-Browser: https://github.com/lxqt/lxqt-qtplugin
--- a/debian/watch
+++ b/debian/watch
@ -1,5 +1,3 @@
 version=4
-opts="searchmode=plain, \
-pgpsigurlmangle=s/$/.asc/, \
-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
+opts="pgpsigurlmangle=s/$/.asc/" \
+https://github.com/lxqt/lxqt-qtplugin/releases .*/lxqt-qtplugin-([\d\.]+).tar.xz