Update Standards-Version to 4.7.1, no changes needed.

This reverts commit f0df77303ea7f1f0e5df78446a6780b060fe1bcd.

debian/changelog

@@ -1,22 +1,145 @@
-libfm-qt (1.1.0-3) unstable; urgency=medium
+libfm-qt (2.1.0-0ubuntu7) plucky; 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
+  * Update Standards-Version to 4.7.1, no changes needed.
 
- -- Yao Wei (魏銘廷) <mwei@debian.org>  Sat, 08 Oct 2022 18:01:29 +0800
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 21 Feb 2025 16:22:38 -0600
+
+libfm-qt (2.1.0-0ubuntu6) plucky; urgency=medium
+
+  * Add a Provides: libfm-qt6 line, to make it easier to track and use in
+    reverse dependencies.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sun, 16 Feb 2025 18:59:48 -0600
+
+libfm-qt (2.1.0-0ubuntu5) plucky; urgency=medium
+
+  * No-change rebuild for Qt 6.8.2.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 03 Feb 2025 11:33:27 -0600
+
+libfm-qt (2.1.0-0ubuntu4) plucky; urgency=medium
+
+  * No-change rebuild for lxqt-build-tools C++17 -> C++20.
+  * Update symbols from build logs.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 03 Jan 2025 03:53:09 -0600
+
+libfm-qt (2.1.0-0ubuntu3) plucky; urgency=medium
+
+  * No-change rebuild for Qt 6.8.1.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 04 Dec 2024 14:32:17 -0600
+
+libfm-qt (2.1.0-0ubuntu2) plucky; urgency=medium
+
+  * No-change rebuild for Qt 6.8.0.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 04 Dec 2024 14:32:17 -0600
+
+libfm-qt (2.1.0-0ubuntu1) plucky; urgency=medium
+
+  * New upstream release.
+    - Bump build dependencies.
+    - Update symbols from amd64 build logs.
+  * Add new build dependencies from the CMake output.
+  * Make the package Lintian-clean.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 15 Nov 2024 15:31:59 -0600
+
+libfm-qt (2.0.2-0ubuntu3) plucky; urgency=medium
+
+  * No-change rebuild against Qt 6.7.2 private-abi.
+
+ -- Rik Mills <rikmills@kde.org>  Thu, 17 Oct 2024 17:52:48 +0100
+
+libfm-qt (2.0.2-0ubuntu2) oracular; urgency=medium
+
+  * Fix symbols file.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Sun, 25 Aug 2024 22:22:47 -0500
+
+libfm-qt (2.0.2-0ubuntu1) oracular; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 4.7.0, no changes necessary.
+  * Update copyright file.
+  * Bump build deps.
+  * Change binary package name to libfm-qt6.
+  * Update symbols file.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 15 Aug 2024 16:06:46 -0500
+
+libfm-qt (1.4.0-0ubuntu1) noble; urgency=medium
+
+  * New upstream release.
+  * Reorganized and fixed copyright file.
+  * Added lxqt-menu-data as a build dependency.
+  * Bumped soname to libfm-qt14.
+  * Updated symbols file.
+
+ -- Aaron Rainbolt <arraybolt3@gmail.com>  Sun, 05 Nov 2023 17:15:40 -0600
+
+libfm-qt (1.3.0-0ubuntu2) mantic; urgency=medium
+
+  * Update symbols from build logs.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 11 Aug 2023 10:16:27 -0500
+
+libfm-qt (1.3.0-0ubuntu1) mantic; urgency=medium
+
+  * New upstream release.
+    - Bump build dependency accordingly.
+  * Rename binary package for SONAME change, update symbols accordingly.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 26 Jul 2023 16:25:53 -0500
+
+libfm-qt (1.2.1-0ubuntu1) lunar; urgency=medium
+
+  * New upstream release.
+  * Updated copyright file.
+  * Bumped Standards-Version to 4.6.2, no changes necessary.
+  * Updated symbols file.
+  * Ran wrap-and-sort.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 26 Jan 2023 20:18:59 -0600
+
+libfm-qt (1.2.0-0ubuntu3) lunar; urgency=medium
+
+  * No-change rebuild against Qt 5.15.8.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Sat, 14 Jan 2023 10:19:25 +0300
+
+libfm-qt (1.2.0-0ubuntu2) lunar; urgency=medium
+
+  * No-change rebuild against Qt 5.15.7.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Sat, 10 Dec 2022 12:50:58 +0300
+
+libfm-qt (1.2.0-0ubuntu1) lunar; urgency=medium
+
+  * New upstream release.
+  * Fix the watch file, for real this time.
+  * Lubuntuify the package slightly, to make debhelper happy.
+  * Remove reverse-applicable upstream patches.
+  * Bump build dependencies to the latest upstream LXQt versions.
+  * Rename libfm-qt11 -> libfm-qt12 and add necessary Breaks/Replaces.
+  * Update symbols from amd64 build logs.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 16 Nov 2022 19:21:46 -0600
+
+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
 

debian/control

@@ -1,51 +1,73 @@
 Source: libfm-qt
-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+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>,
            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),
                libexif-dev,
-               libkf5windowsystem-dev,
                libmenu-cache-dev,
-               libqt5svg5-dev,
-               libqt5x11extras5-dev,
                libx11-dev,
-               lxqt-build-tools (>= 0.11.0~),
-               qtbase5-private-dev
-Standards-Version: 4.6.1
-Vcs-Browser: https://salsa.debian.org/lxqt-team/libfm-qt
-Vcs-Git: https://salsa.debian.org/lxqt-team/libfm-qt.git
+               libxcb-composite0-dev,
+               libxcb-cursor-dev,
+               libxcb-damage0-dev,
+               libxcb-dpms0-dev,
+               libxcb-dri2-0-dev,
+               libxcb-dri3-dev,
+               libxcb-ewmh-dev,
+               libxcb-glx0-dev,
+               libxcb-icccm4-dev,
+               libxcb-image0-dev,
+               libxcb-keysyms1-dev,
+               libxcb-present-dev,
+               libxcb-randr0-dev,
+               libxcb-record0-dev,
+               libxcb-render-util0-dev,
+               libxcb-render0-dev,
+               libxcb-res0-dev,
+               libxcb-screensaver0-dev,
+               libxcb-shape0-dev,
+               libxcb-shm0-dev,
+               libxcb-sync-dev,
+               libxcb-util-dev,
+               libxcb-xf86dri0-dev,
+               libxcb-xfixes0-dev,
+               libxcb-xinerama0-dev,
+               libxcb-xinput-dev,
+               libxcb-xkb-dev,
+               libxcb-xtest0-dev,
+               libxcb-xv0-dev,
+               libxcb-xvmc0-dev,
+               lxqt-build-tools (>= 2.1.0),
+               lxqt-menu-data (>= 2.1.0),
+               qt6-base-private-dev (>= 6.6.0),
+               qt6-svg-dev (>= 6.6.0)
+Standards-Version: 4.7.1
+Vcs-Browser: https://git.lubuntu.me/Lubuntu/libfm-qt-packaging
+Vcs-Git: https://git.lubuntu.me/Lubuntu/libfm-qt-packaging.git
+Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/libfm-qt
+Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/libfm-qt.git
 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
+Package: libfm-qt6-15
+Provides: libfm-qt6 (= 15)
+Replaces: libfm-qt14, libfm-qt6-14
+Breaks: libfm-qt14, libfm-qt6-14
 Architecture: any
 Multi-Arch: same
 Section: libs
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
+Depends: libfm-qt6-common,
          libglib2.0-bin,
-         shared-mime-info
-Recommends: libfm-qt-l10n
+         shared-mime-info,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: libfm-qt6-l10n
 Pre-Depends: ${misc:Pre-Depends}
 Description: file management support for pcmanfm-qt
  Libfm-Qt is a companion library providing components to build desktop file
@@ -53,29 +75,37 @@ Description: file management support for pcmanfm-qt
  .
  This package contains helper library libfm-qt for pcmanfm-qt.
 
-Package: libfm-qt-dev
-Replaces: libfm-qt5-dev
-Breaks: libfm-qt5-dev
+Package: libfm-qt6-common
+Architecture: all
+Multi-Arch: foreign
+Section: libs
+Depends: ${misc:Depends}
+Breaks: libfm-qt14
+Replaces: libfm-qt14
+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-qt6-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends},
-         libexif-dev,
-         libfm-qt11 (= ${binary:Version}),
-         libmenu-cache-dev
+Depends: libexif-dev,
+         libfm-qt6-15 (= ${binary:Version}),
+         libmenu-cache-dev,
+         ${misc:Depends}
 Description: file management support library for pcmanfm-qt (development files)
  Libfm-Qt is a companion library providing components to build desktop file
  managers.
  .
  This package contains development files for helper library libfm-qt.
 
-Package: libfm-qt-l10n
+Package: libfm-qt6-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: qt6-translations-l10n, ${misc:Depends}
 Description: Language package for libfm-qt
  Libfm-Qt is a companion library providing components to build desktop file
  managers.

debian/copyright

@@ -3,10 +3,13 @@ Upstream-Name: libfm-qt
 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>
+Copyright: 2013-2024 LXQt team
+           2009      Juergen Hoetzel <juergen@archlinux.org>
+           2010      Shae Smittle <starfall87@gmail.com>
            2014      Kuzma Shapran <kuzma.shapran@gmail.com>
+           2016      Mamoru TASAKA <mtasaka@fedoraproject.org>
+           2012-2016 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
+           2009-2019 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
 License: LGPL-2.1+
 
 Files: cmake/fm-qt-config.cmake.in
@@ -14,10 +17,18 @@ 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: 2015      Andrew Lee (李健秋) <ajqlee@debian.org>
+           2014-2015 Wen Liao <wen.cf83@gmail.com>
            2014-2016 ChangZhuo Chen (陳昌倬) <czchen@debian.org>
+           2019      Rik Mills <rikmills@kubuntu.org>
            2013-2019 Alf Gaida <agaida@siduction.org>
-           2015      Andrew Lee (李健秋) <ajqlee@debian.org>
+           2018-2019 Walter Lapchynski <wxl@ubuntu.com>
+           2018-2019 Dan Simmons <monetaryabyss@protonmail.com>
+           2020      Gianfranco Costamagna <locutusofborg@debian.org>
+           2019-2021 Raman Sarda <ramansarda2000@gmail.com>
+           2019-2021 apt-ghetto <apt-ghetto@protonmail.com>
+           2018-2025 Simon Quigley <tsimonq2@ubuntu.com>
+           2022-2024 Aaron Rainbolt <arraybolt3@gmail.com>
 License: LGPL-2.1+
 
 License: BSD-3-Clause
@@ -59,4 +70,3 @@ License: LGPL-2.1+
  On Debian systems, the complete text of the GNU Lesser General
  Public License version 2.1 can be found in
  "/usr/share/common-licenses/LGPL-2.1".
-

debian/libfm-qt-dev.install

@@ -1,10 +0,0 @@
-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/lib/*/*.so
-usr/lib/*/pkgconfig/*
-
-usr/share/cmake/fm-qt/*.cmake

debian/libfm-qt-l10n.install

@@ -1 +0,0 @@
-usr/share/libfm-qt/translations

debian/libfm-qt11.install

@@ -1,4 +0,0 @@
-usr/lib/*/*.so.*
-usr/share/libfm-qt/terminals.list
-usr/share/libfm-qt/archivers.list
-usr/share/mime/packages/libfm-qt-mimetypes.xml

debian/libfm-qt11.shlibs

@@ -1,2 +0,0 @@
-libfm-qt 11 libfm-qt11 (>= 1.1.0)
-

debian/libfm-qt6-15.install

@@ -0,0 +1 @@
+usr/lib/*/*.so.*

debian/libfm-qt6-common.install

@@ -0,0 +1,3 @@
+usr/share/libfm-qt6/archivers.list
+usr/share/libfm-qt6/terminals.list
+usr/share/mime/packages/libfm-qt6-mimetypes.xml

debian/libfm-qt6-dev.install

@@ -0,0 +1,8 @@
+usr/include/libfm-qt6/*.h
+usr/include/libfm-qt6/core/*.h
+usr/include/libfm-qt6/core/legacy/*.h
+usr/include/libfm-qt6/core/vfs/*.h
+usr/include/libfm-qt6/customactions/*.h
+usr/lib/*/*.so
+usr/lib/*/pkgconfig/*
+usr/share/cmake/fm-qt6/*.cmake

debian/libfm-qt6-l10n.install

@@ -0,0 +1 @@
+usr/share/libfm-qt6/translations

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 {
+ 

debian/patches/fix-uri-scheme-crash.patch

@@ -1,27 +0,0 @@
-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).
-
-Fixes https://github.com/lxqt/lxqt-session/issues/439
----
- src/core/folder.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/folder.cpp b/src/core/folder.cpp
-index 5bb40137..710a9132 100644
---- a/src/core/folder.cpp
-+++ b/src/core/folder.cpp
-@@ -532,7 +532,7 @@ void Folder::onDirListFinished() {
-     const auto& infos = job->files();
- 
-     // with "search://", there is no update for infos and all of them should be added
--    if(strcmp(dirPath_.uriScheme().get(), "search") == 0) {
-+    if(dirPath_.hasUriScheme("search")) {
-         files_to_add = infos;
-         for(auto& file: files_to_add) {
-             files_[file->path().baseName().get()] = file;

debian/patches/series

@@ -1,2 +1 @@
-fix-uri-scheme-crash.patch
-support-adding-pattern-lists.patch
+fix-metadata-for-trusting-executables.patch

debian/patches/support-adding-pattern-lists.patch

@@ -1,126 +0,0 @@
-From f66aa205c48a60378abcf0dac3d21b83d47aa2c5 Mon Sep 17 00:00:00 2001
-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`.
----
- src/filesearch.ui        | 13 ++++++++++---
- src/filesearchdialog.cpp | 28 ++++++++++++++++++++++++++--
- src/filesearchdialog.h   |  6 ++++++
- 3 files changed, 42 insertions(+), 5 deletions(-)
-
-diff --git a/src/filesearch.ui b/src/filesearch.ui
-index 85e57556..a90456a5 100644
---- a/src/filesearch.ui
-+++ b/src/filesearch.ui
-@@ -36,8 +36,11 @@
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout_3">
-           <item>
--           <widget class="QLineEdit" name="namePatterns">
--            <property name="text">
-+           <widget class="QComboBox" name="namePatterns">
-+            <property name="editable">
-+             <bool>true</bool>
-+            </property>
-+            <property name="currentText">
-              <string>*</string>
-             </property>
-            </widget>
-@@ -218,7 +221,11 @@
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout_8">
-           <item>
--           <widget class="QLineEdit" name="contentPattern"/>
-+           <widget class="QComboBox" name="contentPattern">
-+            <property name="editable">
-+             <bool>true</bool>
-+            </property>
-+           </widget>
-           </item>
-           <item>
-            <widget class="QCheckBox" name="contentCaseSensitive">
-diff --git a/src/filesearchdialog.cpp b/src/filesearchdialog.cpp
-index 0216687f..267cc4c7 100644
---- a/src/filesearchdialog.cpp
-+++ b/src/filesearchdialog.cpp
-@@ -23,6 +23,7 @@
- #include "ui_filesearch.h"
- #include <limits>
- #include <QFileDialog>
-+#include <QCompleter>
- #include <utility>
- 
- namespace Fm {
-@@ -43,6 +44,10 @@ FileSearchDialog::FileSearchDialog(QStringList paths, QWidget* parent, Qt::Windo
-     connect(ui->addPath, &QPushButton::clicked, this, &FileSearchDialog::onAddPath);
-     connect(ui->removePath, &QPushButton::clicked, this, &FileSearchDialog::onRemovePath);
- 
-+    // the default completer is case-insensitive
-+    ui->namePatterns->completer()->setCaseSensitivity(Qt::CaseSensitive);
-+    ui->contentPattern->completer()->setCaseSensitivity(Qt::CaseSensitive);
-+
-     ui->namePatterns->setFocus();
- }
- 
-@@ -50,6 +55,25 @@ FileSearchDialog::~FileSearchDialog() {
-     delete ui;
- }
- 
-+QString FileSearchDialog::namePattern() const {
-+    return ui->namePatterns->currentText();
-+}
-+
-+QString FileSearchDialog::contentPattern() const {
-+    return ui->contentPattern->currentText();
-+}
-+
-+void FileSearchDialog::addNamePatterns(const QStringList& patterns) {
-+    ui->namePatterns->addItems(patterns);
-+    ui->namePatterns->setCurrentIndex(-1);
-+    ui->namePatterns->setCurrentText(QLatin1String("*"));
-+}
-+
-+void FileSearchDialog::addContentPatterns(const QStringList& patterns) {
-+    ui->contentPattern->addItems(patterns);
-+    ui->contentPattern->setCurrentIndex(-1);
-+}
-+
- void FileSearchDialog::accept() {
-     // build the search:/// uri
-     int n = ui->listView->count();
-@@ -62,11 +86,11 @@ void FileSearchDialog::accept() {
- 
-         fm_search_set_recursive(search, ui->recursiveSearch->isChecked());
-         fm_search_set_show_hidden(search, ui->searchHidden->isChecked());
--        fm_search_set_name_patterns(search, ui->namePatterns->text().toUtf8().constData());
-+        fm_search_set_name_patterns(search, ui->namePatterns->currentText().toUtf8().constData());
-         fm_search_set_name_ci(search, !ui->nameCaseSensitive->isChecked());
-         fm_search_set_name_regex(search, ui->nameRegExp->isChecked());
- 
--        fm_search_set_content_pattern(search, ui->contentPattern->text().toUtf8().constData());
-+        fm_search_set_content_pattern(search, ui->contentPattern->currentText().toUtf8().constData());
-         fm_search_set_content_ci(search, !ui->contentCaseSensitive->isChecked());
-         fm_search_set_content_regex(search, ui->contentRegExp->isChecked());
- 
-diff --git a/src/filesearchdialog.h b/src/filesearchdialog.h
-index 504c1ed0..2aee1b57 100644
---- a/src/filesearchdialog.h
-+++ b/src/filesearchdialog.h
-@@ -59,6 +59,12 @@ class LIBFM_QT_API FileSearchDialog : public QDialog {
-     bool searchhHidden() const;
-     void setSearchhHidden(bool hidden);
- 
-+    QString namePattern() const;
-+    QString contentPattern() const;
-+
-+    void addNamePatterns(const QStringList& patterns);
-+    void addContentPatterns(const QStringList& patterns);
-+
- private Q_SLOTS:
-     void onAddPath();
-     void onRemovePath();

debian/source/lintian-overrides

@@ -0,0 +1,5 @@
+# This list will always be very long, it's okay
+libfm-qt source: very-long-line-length-in-source-file * > 512 [data/archivers.list:*]
+
+# Long lines in the upstream changelog are okay
+libfm-qt source: very-long-line-length-in-source-file * > 512 [CHANGELOG:*]

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

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

debian/watch

@@ -1,3 +1,5 @@
 version=4
-opts="pgpsigurlmangle=s/$/.asc/" \
-https://github.com/lxqt/libfm-qt/releases .*/libfm-qt-([\d\.]+).tar.xz
+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