Compare commits

...

8 Commits

Author SHA1 Message Date
Aaron Rainbolt
87d221d5b8
Removed unneeded Lintian override 2025-07-30 15:26:07 -05:00
Aaron Rainbolt
979f2f6c5b
refresh Lubuntu Manual patch 2025-07-30 15:23:05 -05:00
Aaron Rainbolt
71ef1bd4d1
Update build deps 2025-07-30 15:19:58 -05:00
Aaron Rainbolt
321fd330ac
Bump Standards-Version 2025-07-30 15:18:20 -05:00
Aaron Rainbolt
4b47bffc4e
Update copyright file 2025-07-30 15:17:55 -05:00
Aaron Rainbolt
fa488a15e2
Bump version for new upstream release 2025-07-30 15:15:06 -05:00
22450d34cc Update Standards-Version to 4.7.1, no changes needed. 2025-02-21 16:44:56 -06:00
f2ddcc5b52 No-change rebuild for lxqt-build-tools C++17 -> C++20. 2025-02-21 16:35:16 -06:00
6 changed files with 90 additions and 67 deletions

23
debian/changelog vendored
View File

@ -1,3 +1,26 @@
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.

6
debian/control vendored
View File

@ -11,7 +11,7 @@ Priority: optional
Build-Depends: debhelper-compat (= 13),
layer-shell-qt,
libexif-dev,
libfm-qt6-dev (>= 2.1.0),
libfm-qt6-dev (>= 2.2.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.1.0),
lxqt-build-tools (>= 2.2.0),
qt6-svg-dev (>= 6.6.0),
qt6-wayland-dev (>= 6.6.0)
Standards-Version: 4.7.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
Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/pcmanfm-qt

5
debian/copyright vendored
View File

@ -4,7 +4,7 @@ Source: https://github.com/lxqt/pcmanfm-qt
Files: *
Copyright: 2017, Pedram Pourang (Tsu Jan) <tsujan2000@gmail.com>
2013-2024 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-2024 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+

View File

@ -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,
this, &DesktopPreferencesDialog::onApplyClicked);
@@ -208,6 +209,9 @@ void DesktopPreferencesDialog::applySett
// 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
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>

View File

@ -3,4 +3,3 @@ 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:*]