From d2b550e22bd5f08f62c41b0a39b6ce05a715e1b6 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Thu, 25 Apr 2019 16:11:08 -0500 Subject: [PATCH] Merge from Debian. --- debian/changelog | 64 ++++++++++++++++++++ debian/compat | 1 - debian/control | 3 +- debian/copyright | 6 +- debian/patches/load-versioned-libfm-qt.patch | 20 ++++++ debian/patches/series | 1 + debian/source/options | 1 - debian/upstream/metadata | 6 ++ debian/watch | 2 +- 9 files changed, 97 insertions(+), 7 deletions(-) delete mode 100644 debian/compat create mode 100644 debian/patches/load-versioned-libfm-qt.patch create mode 100644 debian/patches/series create mode 100644 debian/upstream/metadata diff --git a/debian/changelog b/debian/changelog index 941e065..64a758c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +lxqt-qtplugin (0.14.0-3ubuntu1) UNRELEASED; urgency=medium + + * Merge from Debian Sid. Remaining changes: + - Explicitly depend on libqt5xdg-dev. + - Bump the ABI package to libfm-qt6. + - Remove unneeded ~s from versions. + + -- Simon Quigley Thu, 25 Apr 2019 16:07:02 -0500 + +lxqt-qtplugin (0.14.0-3) unstable; urgency=medium + + * Try to load the versioned libfm-qt.so.6 instead of libfm-qt.so + (Closes: #927905) + + -- Alf Gaida Wed, 24 Apr 2019 23:05:04 +0200 + lxqt-qtplugin (0.14.0-0ubuntu3) disco; urgency=medium * Rebuild against qtbase-abi-5-12-2. @@ -5,12 +21,33 @@ lxqt-qtplugin (0.14.0-0ubuntu3) disco; urgency=medium -- Rik Mills Sun, 31 Mar 2019 10:34:46 +0100 +lxqt-qtplugin (0.14.0-2) unstable; urgency=medium + + * 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). + + -- Alf Gaida Wed, 13 Mar 2019 17:59:00 +0100 + lxqt-qtplugin (0.14.0-0ubuntu2) disco; urgency=medium * Recommend libfm-qt6 instead. -- Simon Quigley Sun, 27 Jan 2019 21:01:22 -0600 +lxqt-qtplugin (0.14.0-1) unstable; urgency=medium + + * 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 + + -- Alf Gaida Sun, 27 Jan 2019 18:08:59 +0100 + lxqt-qtplugin (0.14.0-0ubuntu1) disco; urgency=medium * New upstream release. @@ -41,6 +78,24 @@ lxqt-qtplugin (0.13.0-0ubuntu2) cosmic; urgency=medium -- Simon Quigley Sat, 14 Jul 2018 01:34:06 -0500 +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 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 Sat, 26 May 2018 01:13:13 +0200 + lxqt-qtplugin (0.13.0-0ubuntu1) cosmic; urgency=medium * New upstream release. @@ -50,6 +105,15 @@ lxqt-qtplugin (0.13.0-0ubuntu1) cosmic; urgency=medium -- Simon Quigley Wed, 23 May 2018 22:40:20 -0500 +lxqt-qtplugin (0.12.0-7) unstable; urgency=medium + + * Relax debhelper minimum version to >= 11~ + * Bumped Standard to 4.1.4, no changes needed + * Fixde glitches in VCS fields + * Changed Homepage, Source and watch for lxqt + + -- Alf Gaida Sat, 28 Apr 2018 16:10:41 +0200 + lxqt-qtplugin (0.12.0-6ubuntu1) bionic; urgency=medium * Merge from Debian Sid. Remaining changes: diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 48082f7..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -12 diff --git a/debian/control b/debian/control index b3aa58e..e2d48a3 100644 --- a/debian/control +++ b/debian/control @@ -4,12 +4,13 @@ XSBC-Original-Maintainer: LXQt Packaging Team Section: x11 Priority: optional -Build-Depends: debhelper (>= 12), +Build-Depends: debhelper-compat (= 12), libdbusmenu-qt5-dev, libkf5windowsystem-dev, libqt5svg5-dev, libqt5xdg-dev, libqt5x11extras5-dev, + libqt5xdgiconloader-dev (>= 3.3.1), libx11-dev, lxqt-build-tools (>= 0.6.0), qtbase5-private-dev diff --git a/debian/copyright b/debian/copyright index 1662b20..56e318d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,14 +1,14 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: lxqt-qtplugin -Source: https://github.com/lxde/lxqt-qtplugin +Source: https://github.com/lxqt/lxqt-qtplugin Files: * -Copyright: 2013-2018 LXQt team +Copyright: 2013-2019 LXQt team 2010-2012 Razor team License: LGPL-2.1+ Files: debian/* -Copyright: 2014-2018 Alf Gaida +Copyright: 2014-2019 Alf Gaida 2015 ChangZhuo Chen (陳昌倬) 2015 Yukiharu YABUKI License: LGPL-2.1+ diff --git a/debian/patches/load-versioned-libfm-qt.patch b/debian/patches/load-versioned-libfm-qt.patch new file mode 100644 index 0000000..c83378d --- /dev/null +++ b/debian/patches/load-versioned-libfm-qt.patch @@ -0,0 +1,20 @@ +Description: Load the versioned library + Loading libfm-qt.so would not be wise, it would introduce a dependency + to libfm-qt-dev. So hard patching to libfm-qt.so.6 will be fine for + Buster - we will find a better solution upstream for the next release. +Author: Alf Gaida + +--- +Bug-Debian: https://bugs.debian.org/927905 + +--- lxqt-qtplugin-0.14.0.orig/src/lxqtplatformtheme.cpp ++++ lxqt-qtplugin-0.14.0/src/lxqtplatformtheme.cpp +@@ -239,7 +239,7 @@ QPlatformDialogHelper *LXQtPlatformTheme + // The createFileDialogHelper() method is dynamically loaded from libfm-qt on demand + if(createFileDialogHelper == nullptr) { + // try to dynamically load libfm-qt.so +- QLibrary libfmQtLibrary{QLatin1String("libfm-qt")}; ++ QLibrary libfmQtLibrary{QLatin1String("libfm-qt.so.6")}; + libfmQtLibrary.load(); + if(!libfmQtLibrary.isLoaded()) { + return nullptr; diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..231d243 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +load-versioned-libfm-qt.patch diff --git a/debian/source/options b/debian/source/options index be5dabe..112dfc8 100644 --- a/debian/source/options +++ b/debian/source/options @@ -1,2 +1 @@ tar-ignore=.gitignore - diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 0000000..0bb92c1 --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,6 @@ +Name: lxqt-qtplugin +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 diff --git a/debian/watch b/debian/watch index a45c7ba..90eacdb 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=4 opts="pgpsigurlmangle=s/$/.asc/" \ - https://github.com/lxde/lxqt-qtplugin/releases .*/lxqt-qtplugin-([\d\.]+).tar.xz +https://github.com/lxqt/lxqt-qtplugin/releases .*/lxqt-qtplugin-([\d\.]+).tar.xz