Sync with Ubuntu upload 1.1.0-3ubuntu1.

2 years ago · be07f15a59
parent 0a196e7e16
commit be07f15a59
13 changed files with 1809 additions and 161 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,22 +1,16 @@
-libfm-qt (1.1.0-3) unstable; urgency=medium
-
-  * Team upload
-  * Bump libfm-qt8 to libfm-qt11
-    - Restored Breaks+Replaces: libfm-qt8 (Closes: #1016514)
-  * debian/control:
-    - Bump Standards-Version to 4.6.1
-    - Bump debhelper to 13
-    - debian/control: Add Rules-Requires-Root: no
-  * debian/rules: Remove "-Wl,--as-needed" in linker options
-  * debian/patches:
-    - Fix crash with empty URI scheme of folder path
-    - Support adding of pattern lists to entries of search dialog
-  * debian/*.symbols, debian/libfm-qt11.shlibs: Remove all symbols files and
-    use shlibs file to declare linking dependencies
-  * debian/upstream/metadata: Change Repository-Browser field to
-    Repository-Browse
-
- -- Yao Wei (魏銘廷) <mwei@debian.org>  Sat, 08 Oct 2022 18:01:29 +0800
+libfm-qt (1.1.0-3ubuntu1) kinetic; urgency=medium
+
+  * Revert the previous upload.
+  * Make Breaks/Replaces stricter for libfm-qt11 on libfm-qt-common due to the
+    nature of the reverted upload.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 10 Oct 2022 11:06:03 -0500
+
+libfm-qt (1.1.0-2ubuntu1) kinetic; urgency=medium
+
+  * Update debian/libfm-qt11.symbols for GCC 12.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Sat, 13 Aug 2022 21:37:11 +0300

 libfm-qt (1.1.0-2) experimental; urgency=medium

--- a/debian/control
+++ b/debian/control
@ -1,9 +1,12 @@
 Source: libfm-qt
-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
 Uploaders: Alf Gaida <agaida@siduction.org>,
           ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
           Andrew Lee (李健秋) <ajqlee@debian.org>,
-           Shih-Yuan Lee (FourDollars) <fourdollars@gmail.com>
+           Shih-Yuan Lee (FourDollars) <fourdollars@gmail.com>,
+           Simon Quigley <tsimonq2@debian.org>,
+           Aaron Rainbolt <arraybolt3@gmail.com>
 Section: x11
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
@ -13,7 +16,7 @@ Build-Depends: debhelper-compat (= 13),
               libqt5svg5-dev,
               libqt5x11extras5-dev,
               libx11-dev,
-               lxqt-build-tools (>= 0.11.0~),
+               lxqt-build-tools (>= 0.11.0),
               qtbase5-private-dev
 Standards-Version: 4.6.1
 Vcs-Browser: https://salsa.debian.org/lxqt-team/libfm-qt
@ -22,26 +25,13 @@ Homepage: https://github.com/lxqt/libfm-qt
 Rules-Requires-Root: no

 Package: libfm-qt11
-Provides: libfm-qt
-Conflicts: libfm-qt
-Replaces: libfm-qt9,
-          libfm-qt8,
-          libfm-qt6,
-          libfm-qt5-2,
-          libfm-qt5,
-          libfm-qt3,
-          libfm-qt2
-Breaks: libfm-qt9,
-        libfm-qt8,
-        libfm-qt6,
-        libfm-qt5-2,
-        libfm-qt5,
-        libfm-qt3,
-        libfm-qt2
+Replaces: libfm-qt9
+Breaks: libfm-qt9
 Architecture: any
 Multi-Arch: same
 Section: libs
-Depends: ${misc:Depends},
+Depends: libfm-qt-common,
+         ${misc:Depends},
         ${shlibs:Depends},
         libglib2.0-bin,
         shared-mime-info
@ -53,9 +43,20 @@ Description: file management support for pcmanfm-qt
 .
 This package contains helper library libfm-qt for pcmanfm-qt.

+Package: libfm-qt-common
+Architecture: all
+Multi-Arch: foreign
+Section: libs
+Depends: ${misc:Depends}
+Breaks: libfm-qt11 (<< 1.1.0-3ubuntu1), libfm-qt9
+Replaces: libfm-qt11 (<< 1.1.0-3ubuntu1), libfm-qt9
+Description: Common files for libfm-qt
+ Libfm-Qt is a companion library providing components to build desktop file
+ managers.
+ .
+ This package contains common files for libfm-qt.
+
 Package: libfm-qt-dev
-Replaces: libfm-qt5-dev
-Breaks: libfm-qt5-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
@ -72,10 +73,7 @@ Package: libfm-qt-l10n
 Architecture: all
 Multi-Arch: foreign
 Section: localization
-Depends: ${misc:Depends},
-         qttranslations5-l10n
-Breaks: libfm-qt3 (<< 0.11.1)
-Replaces: libfm-qt3 (<< 0.11.1)
+Depends: ${misc:Depends}, qttranslations5-l10n
 Description: Language package for libfm-qt
 Libfm-Qt is a companion library providing components to build desktop file
 managers.
--- a/debian/copyright
+++ b/debian/copyright
@ -4,8 +4,11 @@ Source: https://github.com/lxqt/libfm-qt

 Files: *
 Copyright: 2013-2019 LXQt team
-           2013-2019 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
-           2012-2014 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
+           2009-2019 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
+           2009 Juergen Hoetzel <juergen@archlinux.org>
+           2010 Shae Smittle <starfall87@gmail.com>
+           2016 Mamoru TASAKA <mtasaka@fedoraproject.org>
+           2012-2016 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
           2014 Kuzma Shapran <kuzma.shapran@gmail.com>
 License: LGPL-2.1+

@ -14,7 +17,8 @@ Copyright: 2015      Luís Pereira <luis.artur.pereira@gmail.com>
 License: BSD-3-Clause

 Files: debian/*
-Copyright: 2014-2015 Wen Liao <wen.cf83@gmail.com>
+Copyright: 2021-2022, Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+           2014-2015 Wen Liao <wen.cf83@gmail.com>
           2014-2016 ChangZhuo Chen (陳昌倬) <czchen@debian.org>
           2013-2019 Alf Gaida <agaida@siduction.org>
           2015      Andrew Lee (李健秋) <ajqlee@debian.org>
--- a/debian/libfm-qt-common.install
+++ b/debian/libfm-qt-common.install
@ -0,0 +1,3 @@
+usr/share/libfm-qt/archivers.list
+usr/share/libfm-qt/terminals.list
+usr/share/mime/packages/libfm-qt-mimetypes.xml
--- a/debian/libfm-qt-dev.install
+++ b/debian/libfm-qt-dev.install
@ -1,10 +1,8 @@
 usr/include/libfm-qt/*.h
-usr/include/libfm-qt/customactions/*.h
 usr/include/libfm-qt/core/*.h
 usr/include/libfm-qt/core/legacy/*.h
 usr/include/libfm-qt/core/vfs/*.h
-
+usr/include/libfm-qt/customactions/*.h
 usr/lib/*/*.so
 usr/lib/*/pkgconfig/*
-
 usr/share/cmake/fm-qt/*.cmake
--- a/debian/libfm-qt11.install
+++ b/debian/libfm-qt11.install
@ -1,4 +1 @@
 usr/lib/*/*.so.*
-usr/share/libfm-qt/terminals.list
-usr/share/libfm-qt/archivers.list
-usr/share/mime/packages/libfm-qt-mimetypes.xml
--- a/debian/libfm-qt11.symbols
+++ b/debian/libfm-qt11.symbols
--- a/debian/patches/fix-metadata-for-trusting-executables.patch
+++ b/debian/patches/fix-metadata-for-trusting-executables.patch
@ -0,0 +1,16 @@
+Description: Fix metadata for trusting executables
+ To conform with the Ubuntu standard use metadata::trusted instead of metadata::trust. This patch must be applied after any upstream version changes since they refuse to conform.
+Author: Dan Simmons <monetaryabyss@protonmail.com>
+Bug: https://bugs.launchpad.net/bugs/1813687
+Last-Update: 2019-01-29
+--- a/src/core/fileinfo.cpp
+++ b/src/core/fileinfo.cpp
+@@ -2,7 +2,7 @@
+ #include "fileinfo_p.h"
+ #include <gio/gio.h>
+ 
+-#define METADATA_TRUST "metadata::trust"
+#define METADATA_TRUST "metadata::trusted"
+ 
+ namespace Fm {
+ 
--- a/debian/patches/fix-uri-scheme-crash.patch
+++ b/debian/patches/fix-uri-scheme-crash.patch
@ -2,8 +2,6 @@ From 472128c3bfc301f3258bd99501a88ef4097d0429 Mon Sep 17 00:00:00 2001
 From: tsujan <tsujan2000@gmail.com>
 Date: Thu, 9 Jun 2022 01:35:27 +0430
 Subject: [PATCH] Fixed crash with empty URI scheme of folder path (#808)
-Bug: https://github.com/lxqt/lxqt-session/issues/439
-Applied-Upstream: https://github.com/lxqt/libfm-qt/pull/808

 An empty URI scheme is possible when trying to open a folder with an empty path (like when the desktop path is empty and pcmanfm-qt's desktop module is started).

--- a/debian/patches/series
+++ b/debian/patches/series
@ -1,2 +1,3 @@
+fix-metadata-for-trusting-executables.patch
 fix-uri-scheme-crash.patch
 support-adding-pattern-lists.patch
--- a/debian/patches/support-adding-pattern-lists.patch
+++ b/debian/patches/support-adding-pattern-lists.patch
@ -3,8 +3,6 @@ From: tsujan <tsujan2000@gmail.com>
 Date: Sat, 14 May 2022 01:17:14 +0430
 Subject: [PATCH] Support adding of pattern lists to entries of search dialog
 (#806)
-Applied-Upstream: https://github.com/lxqt/libfm-qt/pull/806
-

 Such lists will be used later for adding search history to `pcmanfm-qt`.
 ---
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@ -3,4 +3,3 @@ Bug-Database: https://github.com/lxqt/libfm-qt/issues
 Bug-Submit: https://github.com/lxqt/libfm-qt/issues/new
 Changelog: https://github.com/lxqt/libfm-qt/blob/master/CHANGELOG
 Repository: https://github.com/lxqt/libfm-qt
-Repository-Browse: https://github.com/lxqt/libfm-qt
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@ -1,55 +1,5 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----

-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
-=h7ww
-----END PGP PUBLIC KEY BLOCK-----
-----BEGIN PGP PUBLIC KEY BLOCK-----
-
 mQINBF6cxrwBEADfl3ydxNfLBbWGPesXty2baQgixZ3D6aCxadI2kX+aikmT8rd0
 ttDKN18cXV52Ssxnj0qhgf4hwnu/b0be6BzqSEyGM+UQR3X2CYpxrMakfW32Q18K
 X5ec0RPR2ucBq9G0r9t6FYC8FkJ4uQUU3xxrLW3z302S0Makjgzm8BV9WrFQ7oFF