From 412eeaf91bbc5e1029796bb34c1875ed6266597d Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Wed, 16 Nov 2022 17:21:47 -0600 Subject: [PATCH] Sync with Debian version 3.9.1-2. --- debian/changelog | 11 ++++++ debian/control | 35 ++++++++--------- debian/libqt5xdg-dev.install | 2 - debian/libqt5xdg3.install | 3 +- debian/libqt5xdgiconloader-dev.install | 5 +-- debian/libqt5xdgiconloader3.install | 1 - debian/libqt5xdgiconloader3.symbols | 49 +++++++++++------------- debian/qtxdg-dev-tools.install | 3 +- debian/qtxdg-dev-tools.lintian-overrides | 5 +-- debian/watch | 2 +- 10 files changed, 57 insertions(+), 59 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0dcd01b..3509c14 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +libqtxdg (3.9.1-2) experimental; urgency=medium + + * Bumped Standards-Version to 4.6.1, no change required. + * Upstreamed symbols file for libqt5xdgiconloader3 from Ubuntu. + * Changed "binary-without-manpage" to "no-manual-page" in + qtxdg-dev-tools.lintian-overrides. + * Upstreamed watch file from Ubuntu. + * Ran wrap-and-sort. + + -- Aaron Rainbolt Tue, 28 Jun 2022 23:10:20 -0500 + libqtxdg (3.9.1-1) experimental; urgency=medium * New upstream release (Closes: #1013334). diff --git a/debian/control b/debian/control index 432b6ab..e1d29ae 100644 --- a/debian/control +++ b/debian/control @@ -6,8 +6,8 @@ Uploaders: Alf Gaida , Simon Quigley Section: libs Priority: optional -Build-Depends: debhelper-compat (= 13), - cmake, +Build-Depends: cmake, + debhelper-compat (= 13), libmagic-dev, libqt5svg5-dev, lxqt-build-tools (>= 0.10.0), @@ -15,7 +15,7 @@ Build-Depends: debhelper-compat (= 13), qtbase5-private-dev, qttools5-dev, qttools5-dev-tools -Standards-Version: 4.6.0 +Standards-Version: 4.6.1 Rules-Requires-Root: no Vcs-Browser: https://salsa.debian.org/lxqt-team/libqtxdg Vcs-Git: https://salsa.debian.org/lxqt-team/libqtxdg.git @@ -24,12 +24,12 @@ Homepage: https://github.com/lxqt/libqtxdg Package: libqt5xdg3 Architecture: any Multi-Arch: same -Depends: ${shlibs:Depends}, - ${misc:Depends}, - file, +Depends: file, libfile-mimeinfo-perl, libglib2.0-bin, - shared-mime-info + shared-mime-info, + ${misc:Depends}, + ${shlibs:Depends} Recommends: qttranslations5-l10n Pre-Depends: ${misc:Pre-Depends} Provides: libqt5xdg @@ -42,8 +42,7 @@ Description: Implementation of the XDG Specifications for Qt (shared lib) Package: libqt5xdgiconloader3 Architecture: any Multi-Arch: same -Depends: ${shlibs:Depends}, - ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: gtk-update-icon-cache Pre-Depends: ${misc:Pre-Depends} Provides: libqt5xdgiconloader @@ -56,10 +55,10 @@ Description: Implementation of the XDG Iconloader for Qt (shared lib) Package: libqt5xdg-dev Architecture: any Section: libdevel -Depends: ${misc:Depends}, - libmagic-dev, +Depends: libmagic-dev, libqt5xdg3 (= ${binary:Version}), - libqt5xdgiconloader-dev (= ${binary:Version}) + libqt5xdgiconloader-dev (= ${binary:Version}), + ${misc:Depends} Recommends: qtxdg-dev-tools (= ${source:Version}) Description: Development files for libqtxdg This library implements functions of the XDG Specifications in Qt. It is part @@ -70,10 +69,10 @@ Description: Development files for libqtxdg Package: libqt5xdgiconloader-dev Architecture: any Section: libdevel -Depends: ${shlibs:Depends}, +Depends: libqt5svg5-dev, + libqt5xdgiconloader3 (= ${binary:Version}), ${misc:Depends}, - libqt5svg5-dev, - libqt5xdgiconloader3 (= ${binary:Version}) + ${shlibs:Depends} Description: Development files for libqtxdgiconloader This library implements the backend to load icons which are handled according to the XDG Icon Theme Specification in Qt. It is part of LXQt. @@ -83,10 +82,10 @@ Description: Development files for libqtxdgiconloader Package: qtxdg-dev-tools Architecture: any Section: devel -Depends: ${shlibs:Depends}, +Depends: libqt5xdg3 (= ${binary:Version}), + libqt5xdgiconloader3 (= ${binary:Version}), ${misc:Depends}, - libqt5xdg3 (= ${binary:Version}), - libqt5xdgiconloader3 (= ${binary:Version}) + ${shlibs:Depends} Description: Tools for QtXdg This package provide some tools for qtxdg: . diff --git a/debian/libqt5xdg-dev.install b/debian/libqt5xdg-dev.install index fedc8c9..6438658 100644 --- a/debian/libqt5xdg-dev.install +++ b/debian/libqt5xdg-dev.install @@ -1,6 +1,4 @@ usr/include/qt5xdg - usr/lib/*/libQt5Xdg.so usr/lib/*/pkgconfig/Qt5Xdg.pc - usr/share/cmake/qt5xdg/ diff --git a/debian/libqt5xdg3.install b/debian/libqt5xdg3.install index b6920c2..9e9fba7 100644 --- a/debian/libqt5xdg3.install +++ b/debian/libqt5xdg3.install @@ -1,4 +1,3 @@ -usr/lib/*/libQt5Xdg.so.* - etc/xdg/lxqt-qtxdg.conf etc/xdg/qtxdg.conf +usr/lib/*/libQt5Xdg.so.* diff --git a/debian/libqt5xdgiconloader-dev.install b/debian/libqt5xdgiconloader-dev.install index 1889cc9..5f005cd 100644 --- a/debian/libqt5xdgiconloader-dev.install +++ b/debian/libqt5xdgiconloader-dev.install @@ -1,11 +1,8 @@ usr/include/qt5xdgiconloader - usr/lib/*/libQt5XdgIconLoader.so usr/lib/*/pkgconfig/Qt5XdgIconLoader.pc - usr/lib/*/qt5/plugins/iconengines/libQt5XdgIconPlugin.so - usr/share/cmake/qt5xdgiconloader/qt5xdgiconloader-config-version.cmake usr/share/cmake/qt5xdgiconloader/qt5xdgiconloader-config.cmake -usr/share/cmake/qt5xdgiconloader/qt5xdgiconloader-targets.cmake usr/share/cmake/qt5xdgiconloader/qt5xdgiconloader-targets-relwithdebinfo.cmake +usr/share/cmake/qt5xdgiconloader/qt5xdgiconloader-targets.cmake diff --git a/debian/libqt5xdgiconloader3.install b/debian/libqt5xdgiconloader3.install index 11fd40c..9cf311d 100644 --- a/debian/libqt5xdgiconloader3.install +++ b/debian/libqt5xdgiconloader3.install @@ -1,2 +1 @@ usr/lib/*/libQt5XdgIconLoader.so.* - diff --git a/debian/libqt5xdgiconloader3.symbols b/debian/libqt5xdgiconloader3.symbols index 8070483..83266fb 100644 --- a/debian/libqt5xdgiconloader3.symbols +++ b/debian/libqt5xdgiconloader3.symbols @@ -1,27 +1,24 @@ libQt5XdgIconLoader.so.3 libqt5xdgiconloader3 #MINVER# - _ZN13XdgIconLoader20setFollowColorSchemeEb@Base 3.8.0 - _ZN13XdgIconLoader8instanceEv@Base 3.8.0 - _ZN19XdgIconLoaderEngine10actualSizeERK5QSizeN5QIcon4ModeENS3_5StateE@Base 3.8.0 - _ZN19XdgIconLoaderEngine12ensureLoadedEv@Base 3.8.0 - _ZN19XdgIconLoaderEngine12entryForSizeERK5QSizei@Base 3.8.0 - _ZN19XdgIconLoaderEngine12virtual_hookEiPv@Base 3.8.0 - _ZN19XdgIconLoaderEngine4readER11QDataStream@Base 3.8.0 - _ZN19XdgIconLoaderEngine5paintEP8QPainterRK5QRectN5QIcon4ModeENS5_5StateE@Base 3.8.0 - _ZN19XdgIconLoaderEngine6pixmapERK5QSizeN5QIcon4ModeENS3_5StateE@Base 3.8.0 - _ZN19XdgIconLoaderEngineC1ERK7QString@Base 3.8.0 - _ZN19XdgIconLoaderEngineC1ERKS_@Base 3.8.0 - _ZN19XdgIconLoaderEngineC2ERK7QString@Base 3.8.0 - _ZN19XdgIconLoaderEngineC2ERKS_@Base 3.8.0 - _ZN19XdgIconLoaderEngineD0Ev@Base 3.8.0 - _ZN19XdgIconLoaderEngineD1Ev@Base 3.8.0 - _ZN19XdgIconLoaderEngineD2Ev@Base 3.8.0 - _ZNK13XdgIconLoader14findIconHelperERK7QStringS2_R11QStringListb@Base 3.8.0 - _ZNK13XdgIconLoader16unthemedFallbackERK7QStringRK11QStringList@Base 3.8.0 - _ZNK13XdgIconLoader8loadIconERK7QString@Base 3.8.0 - _ZNK19XdgIconLoaderEngine3keyEv@Base 3.8.0 - _ZNK19XdgIconLoaderEngine5cloneEv@Base 3.8.0 - _ZNK19XdgIconLoaderEngine5writeER11QDataStream@Base 3.8.0 - _ZNK19XdgIconLoaderEngine7hasIconEv@Base 3.8.0 - _ZTI19XdgIconLoaderEngine@Base 3.8.0 - _ZTS19XdgIconLoaderEngine@Base 3.8.0 - _ZTV19XdgIconLoaderEngine@Base 3.8.0 +* Build-Depends-Package: libqt4xdgiconloader3-dev + (c++)"XdgIconLoader::findIconHelper(QString const&, QString const&, QStringList&, bool) const@Base" 3.0.0 + (c++)"XdgIconLoader::instance()@Base" 2.0.0 + (c++)"XdgIconLoader::loadIcon(QString const&) const@Base" 2.0.0 + (c++)"XdgIconLoader::setFollowColorScheme(bool)@Base" 3.0.0 + (c++)"XdgIconLoader::unthemedFallback(QString const&, QStringList const&) const@Base" 3.0.0 + (c++)"XdgIconLoaderEngine::XdgIconLoaderEngine(QString const&)@Base" 2.0.0 + (c++)"XdgIconLoaderEngine::XdgIconLoaderEngine(XdgIconLoaderEngine const&)@Base" 2.0.0 + (c++)"XdgIconLoaderEngine::actualSize(QSize const&, QIcon::Mode, QIcon::State)@Base" 2.0.0 + (c++)"XdgIconLoaderEngine::clone() const@Base" 2.0.0 + (c++)"XdgIconLoaderEngine::ensureLoaded()@Base" 2.0.0 + (c++)"XdgIconLoaderEngine::entryForSize(QSize const&, int)@Base" 3.0.0 + (c++)"XdgIconLoaderEngine::hasIcon() const@Base" 2.0.0 + (c++)"XdgIconLoaderEngine::key() const@Base" 2.0.0 + (c++)"XdgIconLoaderEngine::paint(QPainter*, QRect const&, QIcon::Mode, QIcon::State)@Base" 2.0.0 + (c++)"XdgIconLoaderEngine::pixmap(QSize const&, QIcon::Mode, QIcon::State)@Base" 2.0.0 + (c++)"XdgIconLoaderEngine::read(QDataStream&)@Base" 2.0.0 + (c++)"XdgIconLoaderEngine::virtual_hook(int, void*)@Base" 2.0.0 + (c++)"XdgIconLoaderEngine::write(QDataStream&) const@Base" 2.0.0 + (c++)"XdgIconLoaderEngine::~XdgIconLoaderEngine()@Base" 2.0.0 + (c++)"typeinfo for XdgIconLoaderEngine@Base" 2.0.0 + (c++)"typeinfo name for XdgIconLoaderEngine@Base" 2.0.0 + (c++)"vtable for XdgIconLoaderEngine@Base" 2.0.0 diff --git a/debian/qtxdg-dev-tools.install b/debian/qtxdg-dev-tools.install index 7470bb0..f759d67 100644 --- a/debian/qtxdg-dev-tools.install +++ b/debian/qtxdg-dev-tools.install @@ -1,3 +1,2 @@ -usr/bin/qtxdg-iconfinder usr/bin/qtxdg-desktop-file-start - +usr/bin/qtxdg-iconfinder diff --git a/debian/qtxdg-dev-tools.lintian-overrides b/debian/qtxdg-dev-tools.lintian-overrides index b432dec..f5eec7f 100644 --- a/debian/qtxdg-dev-tools.lintian-overrides +++ b/debian/qtxdg-dev-tools.lintian-overrides @@ -1,5 +1,4 @@ # Yeah, we know -qtxdg-dev-tools: binary-without-manpage usr/bin/qtxdg-desktop-file-start -qtxdg-dev-tools: binary-without-manpage usr/bin/qtxdg-iconfinder - +qtxdg-dev-tools: no-manual-page [usr/bin/qtxdg-desktop-file-start] +qtxdg-dev-tools: no-manual-page [usr/bin/qtxdg-iconfinder] diff --git a/debian/watch b/debian/watch index 5fd337b..716aeff 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=4 opts="pgpsigurlmangle=s/$/.asc/" \ -https://github.com/lxqt/libqtxdg/releases .*/libqtxdg-([\d\.]+)\.tar\.xz + https://github.com/lxqt/libqtxdg/releases .*/libqtxdg-([\d\.]+)\.tar\.xz