Merge from Debian.
This commit is contained in:
Simon Quigley
parent
84d3a83403
commit
d2b550e22b
64
debian/changelog
vendored
64
debian/changelog
vendored
@ -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 <tsimonq2@ubuntu.com> 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 <agaida@siduction.org> 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 <rikmills@kubuntu.org> 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 <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.
|
||||
* 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 <agaida@siduction.org> 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 <tsimonq2@ubuntu.com> 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 <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-0ubuntu1) cosmic; urgency=medium
|
||||
|
||||
* New upstream release.
|
||||
@ -50,6 +105,15 @@ lxqt-qtplugin (0.13.0-0ubuntu1) cosmic; urgency=medium
|
||||
|
||||
-- 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~
|
||||
* Bumped Standard to 4.1.4, no changes needed
|
||||
* Fixde glitches in VCS fields
|
||||
* Changed Homepage, Source and watch for lxqt
|
||||
|
||||
-- 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:
|
||||
|
||||
1
debian/compat
vendored
1
debian/compat
vendored
@ -1 +0,0 @@
|
||||
12
|
||||
3
debian/control
vendored
3
debian/control
vendored
@ -4,12 +4,13 @@ XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debia
|
||||
Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
|
||||
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
|
||||
|
||||
6
debian/copyright
vendored
6
debian/copyright
vendored
@ -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 <agaida@siduction.org>
|
||||
Copyright: 2014-2019 Alf Gaida <agaida@siduction.org>
|
||||
2015 ChangZhuo Chen (陳昌倬) <czchen@debian.org>
|
||||
2015 Yukiharu YABUKI <yyabuki@debian.org>
|
||||
License: LGPL-2.1+
|
||||
|
||||
20
debian/patches/load-versioned-libfm-qt.patch
vendored
Normal file
20
debian/patches/load-versioned-libfm-qt.patch
vendored
Normal file
@ -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 <agaida@siduction.org>
|
||||
|
||||
---
|
||||
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;
|
||||
1
debian/patches/series
vendored
Normal file
1
debian/patches/series
vendored
Normal file
@ -0,0 +1 @@
|
||||
load-versioned-libfm-qt.patch
|
||||
1
debian/source/options
vendored
1
debian/source/options
vendored
@ -1,2 +1 @@
|
||||
tar-ignore=.gitignore
|
||||
|
||||
|
||||
6
debian/upstream/metadata
vendored
Normal file
6
debian/upstream/metadata
vendored
Normal file
@ -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
|
||||
2
debian/watch
vendored
2
debian/watch
vendored
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user