Removed unneeded Lintian override

debian/changelog

@@ -1,8 +1,47 @@
-pcmanfm-qt (1.4.0-0ubuntu3~ppa23.10.1) mantic; urgency=medium
+pcmanfm-qt (2.2.0-0ubuntu1) questing; urgency=medium
 
-  * Backport to Mantic.
+  * New upstream release.
+    - Update build dependencies.
+    - Refresh Lubuntu Manual patch.
+    - Removed unneeded Lintian overrides.
+  * Update copyright file.
+  * Bump Standards-Version to 4.7.2, no changes needed.
 
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 01 Dec 2023 15:03:56 -0600
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Wed, 30 Jul 2025 15:14:44 -0500
+
+pcmanfm-qt (2.1.0-0ubuntu3) plucky; urgency=medium
+
+  * Update Standards-Version to 4.7.1, no changes needed.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 21 Feb 2025 16:35:29 -0600
+
+pcmanfm-qt (2.1.0-0ubuntu2) plucky; urgency=medium
+
+  * No-change rebuild for lxqt-build-tools C++17 -> C++20.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 03 Jan 2025 04:00:52 -0600
+
+pcmanfm-qt (2.1.0-0ubuntu1) plucky; urgency=medium
+
+  * New upstream release.
+    - Update build dependencies.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 15 Nov 2024 15:33:33 -0600
+
+pcmanfm-qt (2.0.0-0ubuntu1) oracular; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 4.7.0, no changes necessary.
+  * Adjust build dependencies.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 15 Aug 2024 16:27:12 -0500
+
+pcmanfm-qt (1.4.1-0ubuntu1) noble; urgency=medium
+
+  * New upstream release.
+  * Updated copyright file.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Sun, 18 Feb 2024 16:31:24 -0600
 
 pcmanfm-qt (1.4.0-0ubuntu3) noble; urgency=medium
 

debian/control

@@ -1,6 +1,6 @@
 Source: pcmanfm-qt
 Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+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>,
@@ -9,19 +9,48 @@ Uploaders: Alf Gaida <agaida@siduction.org>,
 Section: x11
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
+               layer-shell-qt,
                libexif-dev,
-               libfm-qt-dev (>= 1.4.0),
+               libfm-qt6-dev (>= 2.2.0),
-               libkf5windowsystem-dev,
+               libkf6windowsystem-dev,
+               liblayershellqtinterface-dev (>= 6.0.0),
                libmenu-cache-dev,
-               libqt5svg5-dev,
-               libqt5x11extras5-dev,
                libx11-dev,
-               lxqt-build-tools (>= 0.13.0)
+               libxcb-composite0-dev,
-Standards-Version: 4.6.2
+               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-keysyms1-dev,
+               libxcb-present-dev,
+               libxcb-record0-dev,
+               libxcb-render0-dev,
+               libxcb-res0-dev,
+               libxcb-screensaver0-dev,
+               libxcb-shape0-dev,
+               libxcb-shm0-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,
+               libxkbcommon-dev (>= 0.5.0),
+               lxqt-build-tools (>= 2.2.0),
+               qt6-svg-dev (>= 6.6.0),
+               qt6-wayland-dev (>= 6.6.0)
+Standards-Version: 4.7.2
 Vcs-Browser: https://git.lubuntu.me/Lubuntu/pcmanfm-qt-packaging
 Vcs-Git: https://git.lubuntu.me/Lubuntu/pcmanfm-qt-packaging.git
-XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/pcmanfm-qt
+Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/pcmanfm-qt
-XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/pcmanfm-qt.git
+Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/pcmanfm-qt.git
 Homepage: https://github.com/lxqt/pcmanfm-qt
 Rules-Requires-Root: no
 
@@ -29,7 +58,7 @@ Package: pcmanfm-qt
 Architecture: any
 Depends: default-dbus-session-bus | dbus-session-bus | dbus-x11,
          desktop-file-utils,
-         libfm-qt14,
+         libfm-qt6-15,
          lxqt-sudo,
          ${misc:Depends},
          ${shlibs:Depends}
@@ -53,7 +82,7 @@ Package: pcmanfm-qt-l10n
 Architecture: all
 Multi-Arch: foreign
 Section: localization
-Depends: qttranslations5-l10n, ${misc:Depends}
+Depends: qt6-translations-l10n, ${misc:Depends}
 Description: Language package for pcmanfm-qt
  PCManFM-Qt is the Qt port of the LXDE file manager PCManFM.
  .

debian/copyright

@@ -4,7 +4,7 @@ Source: https://github.com/lxqt/pcmanfm-qt
 
 Files: *
 Copyright: 2017,     Pedram Pourang (Tsu Jan) <tsujan2000@gmail.com>
-           2013-2023 LXQt team
+           2013-2025 LXQt team
            2009-2018 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
            2012-2013 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
            2014      Kuzma Shapran <kuzma.shapran@gmail.com>
@@ -15,11 +15,12 @@ Copyright: 2010-2018 Rafael Laguna <rafaellaguna@gmail.com>
 License: GPL-2.0+
 
 Files: debian/*
-Copyright: 2021-2023 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+Copyright: 2021-2025 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
            2014-2015 Wen Liao <wen.cf83@gmail.com>
            2014-2016 ChangZhuo Chen (陳昌倬) <czchen@debian.org>
            2013-2018 Alf Gaida <agaida@siduction.org>
            2015      Andrew Lee (李健秋) <ajqlee@debian.org>
+           2025      Aaron Rainbolt <arraybolt3@ubuntu.com>
 License: GPL-2.0+
 
 License: GPL-2.0+

debian/patches/add-manual.patch

@@ -5,15 +5,15 @@ Last-Update: 2023-12-01
 ---
 --- a/pcmanfm/desktoppreferencesdialog.cpp
 +++ b/pcmanfm/desktoppreferencesdialog.cpp
-@@ -120,6 +120,7 @@ DesktopPreferencesDialog::DesktopPrefere
+@@ -124,6 +124,7 @@ DesktopPreferencesDialog::DesktopPrefere
    ui.trashBox->setChecked(ds.contains(QLatin1String("Trash")));
    ui.computerBox->setChecked(ds.contains(QLatin1String("Computer")));
    ui.networkBox->setChecked(ds.contains(QLatin1String("Network")));
 +  ui.lubuntuManualBox->setChecked(ds.contains(QLatin1String("Lubuntu Manual")));
  
-   connect(ui.buttonBox->button(QDialogButtonBox::Apply), &QPushButton::clicked,
+   // set fallback icon here (cannot be done in .ui)
-           this, &DesktopPreferencesDialog::onApplyClicked);
+   ui.networkBox->setIcon(QIcon::fromTheme(QStringLiteral("network"), QIcon::fromTheme(QStringLiteral("folder-network"))));
-@@ -208,6 +209,9 @@ void DesktopPreferencesDialog::applySett
+@@ -215,6 +216,9 @@ void DesktopPreferencesDialog::applySett
    if(ui.networkBox->isChecked()) {
        ds << QLatin1String("Network");
    }
@@ -25,7 +25,7 @@ Last-Update: 2023-12-01
    settings.setDesktopCellMargins(QSize(ui.hMargin->value(), ui.vMargin->value()));
 --- a/pcmanfm/desktopwindow.cpp
 +++ b/pcmanfm/desktopwindow.cpp
-@@ -280,6 +280,16 @@ void DesktopWindow::updateShortcutsFromS
+@@ -310,6 +310,16 @@ void DesktopWindow::updateShortcutsFromS
              paths.push_back(Fm::FilePath::fromLocalPath(network.toStdString().c_str()));
          }
      }
@@ -42,7 +42,7 @@ Last-Update: 2023-12-01
  
      // WARNING: QFile::remove() is not compatible with libfm-qt and should not be used.
      if(!paths.empty()) {
-@@ -365,6 +375,20 @@ void DesktopWindow::createNetworkShortcu
+@@ -395,6 +405,20 @@ void DesktopWindow::createNetworkShortcu
      g_key_file_free(kf);
  }
  
@@ -63,7 +63,7 @@ Last-Update: 2023-12-01
  void DesktopWindow::createTrash() {
      if(trashMonitor_) {
          return;
-@@ -1005,7 +1029,8 @@ void DesktopWindow::onFileClicked(int ty
+@@ -1046,7 +1070,8 @@ void DesktopWindow::onFileClicked(int ty
                  if((fileName == QLatin1String("trash-can.desktop") && ds.contains(QLatin1String("Trash")))
                     || (fileName == QLatin1String("user-home.desktop") && ds.contains(QLatin1String("Home")))
                     || (fileName == QLatin1String("computer.desktop") && ds.contains(QLatin1String("Computer")))
@@ -73,7 +73,7 @@ Last-Update: 2023-12-01
                      QMenu* menu = new QMenu(this);
                      // "Open" action for all
                      QAction* action = menu->addAction(tr("Open"));
-@@ -1314,7 +1339,8 @@ void DesktopWindow::trustOurDesktopShort
+@@ -1380,7 +1405,8 @@ void DesktopWindow::trustOurDesktopShort
      const char* execStr = isHome ? homeExec.get() :
                            fileName == QLatin1String("trash-can.desktop") && ds.contains(QLatin1String("Trash")) ? "pcmanfm-qt trash:///" :
                            fileName == QLatin1String("computer.desktop") && ds.contains(QLatin1String("Computer")) ? "pcmanfm-qt computer:///" :
@@ -85,7 +85,7 @@ Last-Update: 2023-12-01
          if(g_key_file_load_from_file(kf, file->path().toString().get(), G_KEY_FILE_NONE, nullptr)) {
 --- a/pcmanfm/desktopwindow.h
 +++ b/pcmanfm/desktopwindow.h
-@@ -160,6 +160,7 @@ private:
+@@ -164,6 +164,7 @@ private:
      void createHomeShortcut();
      void createComputerShortcut();
      void createNetworkShortcut();
@@ -95,7 +95,7 @@ Last-Update: 2023-12-01
      static void onTrashChanged(GFileMonitor* monitor, GFile* gf, GFile* other, GFileMonitorEvent evt, DesktopWindow* pThis);
 --- a/pcmanfm/desktop-preferences.ui
 +++ b/pcmanfm/desktop-preferences.ui
-@@ -664,6 +664,17 @@ are left clicked, even when it is not th
+@@ -660,6 +660,17 @@ are left clicked, even when it is not th
              </property>
             </widget>
            </item>

debian/pcmanfm-qt.lintian-overrides

@@ -0,0 +1,6 @@
+# This is expected
+pcmanfm-qt: desktop-entry-lacks-keywords-entry [usr/share/applications/pcmanfm-qt-desktop-pref.desktop]
+pcmanfm-qt: desktop-entry-lacks-keywords-entry [usr/share/applications/pcmanfm-qt.desktop]
+
+# False positive
+pcmanfm-qt: hardening-no-fortify-functions [usr/bin/pcmanfm-qt]

debian/source/lintian-overrides

@@ -0,0 +1,5 @@
+# We add this via quilt patch
+pcmanfm-qt source: superfluous-file-pattern icons/lubuntu-manual.svg [debian/copyright:*]
+
+# These are expected
+pcmanfm-qt source: very-long-line-length-in-source-file * > 512 [debian/patches/add-manual.patch:*]