Refresh add-manual.patch

debian/changelog

@@ -1,26 +1,3 @@
-pcmanfm-qt (2.2.0-0ubuntu1) questing; urgency=medium
-
-  * 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.
-
- -- 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.

debian/control

@@ -11,7 +11,7 @@ Priority: optional
 Build-Depends: debhelper-compat (= 13),
                layer-shell-qt,
                libexif-dev,
-               libfm-qt6-dev (>= 2.2.0),
+               libfm-qt6-dev (>= 2.1.0),
                libkf6windowsystem-dev,
                liblayershellqtinterface-dev (>= 6.0.0),
                libmenu-cache-dev,
@@ -43,10 +43,10 @@ Build-Depends: debhelper-compat (= 13),
                libxcb-xv0-dev,
                libxcb-xvmc0-dev,
                libxkbcommon-dev (>= 0.5.0),
-               lxqt-build-tools (>= 2.2.0),
+               lxqt-build-tools (>= 2.1.0),
                qt6-svg-dev (>= 6.6.0),
                qt6-wayland-dev (>= 6.6.0)
-Standards-Version: 4.7.2
+Standards-Version: 4.7.0
 Vcs-Browser: https://git.lubuntu.me/Lubuntu/pcmanfm-qt-packaging
 Vcs-Git: https://git.lubuntu.me/Lubuntu/pcmanfm-qt-packaging.git
 Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/pcmanfm-qt

debian/copyright

@@ -4,7 +4,7 @@ Source: https://github.com/lxqt/pcmanfm-qt
 
 Files: *
 Copyright: 2017,     Pedram Pourang (Tsu Jan) <tsujan2000@gmail.com>
-           2013-2025 LXQt team
+           2013-2024 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,12 +15,11 @@ Copyright: 2010-2018 Rafael Laguna <rafaellaguna@gmail.com>
 License: GPL-2.0+
 
 Files: debian/*
-Copyright: 2021-2025 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+Copyright: 2021-2024 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,7 +5,7 @@ Last-Update: 2023-12-01
 ---
 --- a/pcmanfm/desktoppreferencesdialog.cpp
 +++ b/pcmanfm/desktoppreferencesdialog.cpp
-@@ -124,6 +124,7 @@ DesktopPreferencesDialog::DesktopPrefere
+@@ -121,6 +121,7 @@ DesktopPreferencesDialog::DesktopPrefere
    ui.trashBox->setChecked(ds.contains(QLatin1String("Trash")));
    ui.computerBox->setChecked(ds.contains(QLatin1String("Computer")));
    ui.networkBox->setChecked(ds.contains(QLatin1String("Network")));
@@ -13,7 +13,7 @@ Last-Update: 2023-12-01
  
    // set fallback icon here (cannot be done in .ui)
    ui.networkBox->setIcon(QIcon::fromTheme(QStringLiteral("network"), QIcon::fromTheme(QStringLiteral("folder-network"))));
-@@ -215,6 +216,9 @@ void DesktopPreferencesDialog::applySett
+@@ -212,6 +213,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
-@@ -310,6 +310,16 @@ void DesktopWindow::updateShortcutsFromS
+@@ -305,6 +305,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()) {
-@@ -395,6 +405,20 @@ void DesktopWindow::createNetworkShortcu
+@@ -390,6 +400,20 @@ void DesktopWindow::createNetworkShortcu
      g_key_file_free(kf);
  }
  
@@ -63,7 +63,7 @@ Last-Update: 2023-12-01
  void DesktopWindow::createTrash() {
      if(trashMonitor_) {
          return;
-@@ -1046,7 +1070,8 @@ void DesktopWindow::onFileClicked(int ty
+@@ -1041,7 +1065,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"));
-@@ -1380,7 +1405,8 @@ void DesktopWindow::trustOurDesktopShort
+@@ -1375,7 +1400,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
-@@ -164,6 +164,7 @@ private:
+@@ -161,6 +161,7 @@ private:
      void createHomeShortcut();
      void createComputerShortcut();
      void createNetworkShortcut();

debian/source/lintian-overrides

@@ -3,3 +3,4 @@ pcmanfm-qt source: superfluous-file-pattern icons/lubuntu-manual.svg [debian/cop
 
 # These are expected
 pcmanfm-qt source: very-long-line-length-in-source-file * > 512 [debian/patches/add-manual.patch:*]
+pcmanfm-qt source: very-long-line-length-in-source-file * > 512 [*.ts:*]