debian/changelog

@@ -1,37 +1,3 @@
-pcmanfm-qt (2.3.0-0ubuntu1) resolute; urgency=medium
-
-  * New upstream release.
-    - Update build dependencies.
-    - Update add-manual.patch.
-  * Update copyright file.
-  * Update Standards-Version to 4.7.3, no changes needed.
-  * Remove unnecessary Rules-Requires-Root line.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 19 Feb 2026 15:42:37 -0500
-
-pcmanfm-qt (2.2.0-0ubuntu3) resolute; urgency=medium
-
-  * Recommend kf6-breeze-icon-theme instead of transitional package.
-
- -- Rik Mills <rikmills@kde.org>  Thu, 18 Dec 2025 13:15:06 +0000
-
-pcmanfm-qt (2.2.0-0ubuntu2) questing; urgency=medium
-
-  * Bump depends to latest libfm-qt.
-
- -- Rik Mills <rikmills@kde.org>  Wed, 20 Aug 2025 18:33:18 +0100
-
-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.

debian/control

@@ -11,7 +11,7 @@ Priority: optional
 Build-Depends: debhelper-compat (= 13),
                layer-shell-qt,
                libexif-dev,
-               libfm-qt6-dev (>= 2.3.0),
+               libfm-qt6-dev (>= 2.1.0),
                libkf6windowsystem-dev,
                liblayershellqtinterface-dev (>= 6.0.0),
                libmenu-cache-dev,
@@ -43,21 +43,22 @@ Build-Depends: debhelper-compat (= 13),
                libxcb-xv0-dev,
                libxcb-xvmc0-dev,
                libxkbcommon-dev (>= 0.5.0),
-               lxqt-build-tools (>= 2.3.0),
+               lxqt-build-tools (>= 2.1.0),
                qt6-svg-dev (>= 6.6.0),
                qt6-wayland-dev (>= 6.6.0)
-Standards-Version: 4.7.3
+Standards-Version: 4.7.1
 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-Vcs-Git: https://salsa.debian.org/lxqt-team/pcmanfm-qt.git
 Homepage: https://github.com/lxqt/pcmanfm-qt
+Rules-Requires-Root: no
 
 Package: pcmanfm-qt
 Architecture: any
 Depends: default-dbus-session-bus | dbus-session-bus | dbus-x11,
          desktop-file-utils,
-         libfm-qt6-16,
+         libfm-qt6-15,
          lxqt-sudo,
          ${misc:Depends},
          ${shlibs:Depends}
@@ -68,7 +69,7 @@ Recommends: eject,
             lximage-qt,
             lxqt-policykit,
             lxqt-qtplugin,
-            papirus-icon-theme | kf6-breeze-icon-theme | faenza-icon-theme | oxygen-icon-theme,
+            papirus-icon-theme | breeze-icon-theme | faenza-icon-theme | oxygen-icon-theme,
             pcmanfm-qt-l10n
 Suggests: cdtool [linux-any]
 Description: extremely fast and lightweight file and desktop icon manager

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>
@@ -17,10 +17,9 @@ License: GPL-2.0+
 Files: debian/*
 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>
-           2014-2025 ChangZhuo Chen (陳昌倬) <czchen@debian.org>
-           2025-2026 Aaron Rainbolt <arraybolt3@ubuntu.com>
 License: GPL-2.0+
 
 License: GPL-2.0+

debian/patches/add-manual.patch

@@ -1,19 +1,19 @@
 Description: Add a desktop shortcut for the Lubuntu Manual
 Forwarded: eventually
 Author: Simon Quigley <tsimonq2@lubuntu.me>
-Last-Update: 2026-02-19
+Last-Update: 2023-12-01
 ---
 --- a/pcmanfm/desktoppreferencesdialog.cpp
 +++ b/pcmanfm/desktoppreferencesdialog.cpp
-@@ -124,6 +124,7 @@ DesktopPreferencesDialog::DesktopPrefere
+@@ -120,6 +120,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")));
  
-   // set fallback icon here (cannot be done in .ui)
+   connect(ui.buttonBox->button(QDialogButtonBox::Apply), &QPushButton::clicked,
-   ui.networkBox->setIcon(QIcon::fromTheme(QStringLiteral("network"), QIcon::fromTheme(QStringLiteral("folder-network"))));
+           this, &DesktopPreferencesDialog::onApplyClicked);
-@@ -217,6 +218,9 @@ void DesktopPreferencesDialog::applySett
+@@ -208,6 +209,9 @@ void DesktopPreferencesDialog::applySett
    if(ui.networkBox->isChecked()) {
        ds << QLatin1String("Network");
    }
@@ -25,7 +25,7 @@ Last-Update: 2026-02-19
    settings.setDesktopCellMargins(QSize(ui.hMargin->value(), ui.vMargin->value()));
 --- a/pcmanfm/desktopwindow.cpp
 +++ b/pcmanfm/desktopwindow.cpp
-@@ -306,6 +306,16 @@ void DesktopWindow::updateShortcutsFromS
+@@ -280,6 +280,16 @@ void DesktopWindow::updateShortcutsFromS
              paths.push_back(Fm::FilePath::fromLocalPath(network.toStdString().c_str()));
          }
      }
@@ -33,7 +33,7 @@ Last-Update: 2026-02-19
 +    if(ds.contains(QLatin1String("Lubuntu Manual"))) {
 +        createLubuntuManualShortcut();
 +    }
-+    else if(allowShortcutRemoval) {
++    else if(!firstCall) {
 +        QString network = XdgDir::readDesktopDir() + QLatin1String("/lubuntu-manual.desktop");
 +        if(QFile::exists(network)) {
 +            paths.push_back(Fm::FilePath::fromLocalPath(network.toStdString().c_str()));
@@ -42,7 +42,7 @@ Last-Update: 2026-02-19
  
      // WARNING: QFile::remove() is not compatible with libfm-qt and should not be used.
      if(!paths.empty()) {
-@@ -389,6 +399,20 @@ void DesktopWindow::createNetworkShortcu
+@@ -365,6 +375,20 @@ void DesktopWindow::createNetworkShortcu
      g_key_file_free(kf);
  }
  
@@ -63,7 +63,7 @@ Last-Update: 2026-02-19
  void DesktopWindow::createTrash() {
      if(trashMonitor_) {
          return;
-@@ -1040,7 +1064,8 @@ void DesktopWindow::onFileClicked(int ty
+@@ -1005,7 +1029,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: 2026-02-19
                      QMenu* menu = new QMenu(this);
                      // "Open" action for all
                      QAction* action = menu->addAction(tr("Open"));
-@@ -1374,7 +1399,8 @@ void DesktopWindow::trustOurDesktopShort
+@@ -1314,7 +1339,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: 2026-02-19
          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:
+@@ -160,6 +160,7 @@ private:
      void createHomeShortcut();
      void createComputerShortcut();
      void createNetworkShortcut();
@@ -95,7 +95,7 @@ Last-Update: 2026-02-19
      static void onTrashChanged(GFileMonitor* monitor, GFile* gf, GFile* other, GFileMonitorEvent evt, DesktopWindow* pThis);
 --- a/pcmanfm/desktop-preferences.ui
 +++ b/pcmanfm/desktop-preferences.ui
-@@ -660,6 +660,17 @@ are left clicked, even when it is not th
+@@ -664,6 +664,17 @@ are left clicked, even when it is not th
              </property>
             </widget>
            </item>

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:*]

debian/source/local-options

@@ -0,0 +1,2 @@
+unapply-patches
+abort-on-upstream-changes

debian/watch

@@ -1,6 +1,5 @@
-Version: 5
+version=4
-Template: GitHub
+opts="searchmode=plain, \
-Owner: lxqt
+pgpsigurlmangle=s/$/.asc/, \
-Project: @PACKAGE@
+uversionmangle=s/(\d+\.\d+\.\d+).*/$1/" \
-Download-Url-Mangle: s%https://api.github.com/repos/([^/]+)/@PACKAGE@/git/refs/tags/@ANY_VERSION@%https://github.com/$1/@PACKAGE@/releases/download/$2/@PACKAGE@-$2.tar.xz%g
+  https://api.github.com/repos/lxqt/@PACKAGE@/releases https:\/\/github.com\/lxqt\/@PACKAGE@\/releases\/download\/@ANY_VERSION@\/@PACKAGE@-@ANY_VERSION@.tar.xz
-Pgp-Mode: auto