diff -pruN 1.2.0-1/debian/changelog 1.2.0-0ubuntu1/debian/changelog --- 1.2.0-1/debian/changelog 2022-11-30 09:18:48.000000000 +0000 +++ 1.2.0-0ubuntu1/debian/changelog 2022-11-19 00:55:38.000000000 +0000 @@ -1,37 +1,72 @@ -pcmanfm-qt (1.2.0-1) experimental; urgency=medium +pcmanfm-qt (1.2.0-0ubuntu1) lunar; urgency=medium * New upstream release. - * Update d/watch for GitHub. - * Sort d/copyright. - * Remove unnecessary patches. - - -- ChangZhuo Chen (陳昌倬) Wed, 30 Nov 2022 17:18:48 +0800 - -pcmanfm-qt (1.1.0-2) experimental; urgency=medium - - * Removed redundant "Repository-Browse" field from debian/upstream/metadata. - * Upstreamed compatible Ubuntu changes, modifying the following files: - - control - - copyright - - lintian-overrides - - rules - - upstream/signing-key.asc - - patches directory - - -- Aaron Rainbolt Fri, 15 Jul 2022 04:57:59 -0500 - -pcmanfm-qt (1.1.0-1) experimental; urgency=medium - - * New upstream version 1.0.0 - * Add debian/salsa-ci.yml file. - * Update debian/upstream/signing-key.asc. - * New upstream version 1.1.0 - * Build-deps on lxqt-build-tools (>= 1.1.0~). - * Build-deps on libfm-qt-dev (>= 1.1.0~). - * Depends on libfm-qt11 (>= 1.1.0~). - * Drop obsoleted lxqt-common and pcmanfm-qt from Breaks and Replaces. + * Fix the watch file, for real this time. + * Lubuntuify the package slightly, to make debhelper happy. + * Bump Standards-version to 4.6.1, no changes needed. + * Bump build dependencies in debian/control. + * Remove reverse-applicable upstream patches. + * Brief copyright update. - -- Andrew Lee (李健秋) Wed, 13 Jul 2022 03:37:37 +0800 + -- Simon Quigley Fri, 18 Nov 2022 18:55:38 -0600 + +pcmanfm-qt (1.1.0-0ubuntu4) kinetic; urgency=medium + + * Backport some upstream patches: + - Prevent an empty desktop path. + + https://github.com/lxqt/pcmanfm-qt/pull/1601 + + https://github.com/lxqt/pcmanfm-qt/commit/f1438b + - Allow customizing workspace margins on desktop. + + https://github.com/lxqt/pcmanfm-qt/pull/1606 + + https://github.com/lxqt/pcmanfm-qt/commit/1151f4 + + -- Simon Quigley Wed, 22 Jun 2022 00:03:18 -0500 + +pcmanfm-qt (1.1.0-0ubuntu3) kinetic; urgency=medium + + * Create a new patch from thin air (woah, shiny!) which adds the Lubuntu + Manual as an optional desktop shortcut. Spread the good work Lyn has been + doing for a few years now. :) + + -- Simon Quigley Thu, 16 Jun 2022 23:06:52 -0400 + +pcmanfm-qt (1.1.0-0ubuntu2) kinetic; urgency=medium + + * Cherry-pick upstream commit fixing some scaling oddities: + - https://github.com/lxqt/pcmanfm-qt/commit/c84434 + - https://github.com/lxqt/pcmanfm-qt/issues/1595 + + -- Simon Quigley Wed, 08 Jun 2022 19:05:41 -0500 + +pcmanfm-qt (1.1.0-0ubuntu1) kinetic; urgency=medium + + * New upstream release. + * Update build dependencies and remove some old Breaks/Replaces. + + -- Simon Quigley Thu, 02 Jun 2022 09:35:43 -0500 + +pcmanfm-qt (0.17.0-0ubuntu1) impish; urgency=medium + + * New upstream release 0.17.0 + * Update debian/control + - Use libfm-qt 0.17.1 + - Use lxqt-build-tools 0.9.0 + - Bump Standards-Version to 4.5.1 + - Readd ${misc:Depends} and ${shlibs:Depends} + - Extend description of pcmanfm-qt-l10n + * Update debian/copyright + + -- apt-ghetto Tue, 10 Aug 2021 15:28:47 +0200 + +pcmanfm-qt (0.16.0-1ubuntu2) hirsute; urgency=low + + [ Raman Sarda ] + * New upstream version. + * Bump debhelper-compat requirement to 13. + * Drop empty series file. + * Update dependencies. + + -- Raman Sarda Mon, 22 Feb 2021 01:37:46 +0530 pcmanfm-qt (0.16.0-1) unstable; urgency=medium @@ -52,6 +87,17 @@ pcmanfm-qt (0.16.0-1) unstable; urgency= -- Andrew Lee (李健秋) Thu, 07 Jan 2021 17:33:42 +0800 +pcmanfm-qt (0.15.0-0ubuntu1) groovy; urgency=medium + + * New upstream release. + - Update upstream signing key. + - Update LXQt build dependencies. + - libfm-qt6 -> libfm-qt7 due to SONAME bump. + * Update Standards-version to 4.5.0, no changes needed. + * Migrate to debhelper-compat. + + -- Simon Quigley Thu, 04 Jun 2020 14:18:48 -0500 + pcmanfm-qt (0.14.1-3) unstable; urgency=medium * Enhanched the fix and included pcmanfm/settings.cpp - the fallback @@ -76,6 +122,25 @@ pcmanfm-qt (0.14.1-1) unstable; urgency= -- Alf Gaida Sun, 24 Feb 2019 23:23:24 +0100 +pcmanfm-qt (0.14.1-0ubuntu3) eoan; urgency=medium + + * Drop patch change-thumbnail-view-icon.patch + + -- apt-ghetto Sun, 29 Sep 2019 11:19:46 +0200 + +pcmanfm-qt (0.14.1-0ubuntu2) eoan; urgency=medium + + * Changed thumbnail view icon to view-preview + + -- Hans P Möller Sat, 07 Sep 2019 12:34:58 -0400 + +pcmanfm-qt (0.14.1-0ubuntu1) disco; urgency=medium + + * New upstream release. + * Run wrap-and-sort. + + -- Simon Quigley Sat, 09 Mar 2019 13:23:17 -0600 + pcmanfm-qt (0.14.0-1) unstable; urgency=medium * Cherry-picking upstream release 0.14.0. @@ -92,6 +157,36 @@ pcmanfm-qt (0.14.0-1) unstable; urgency= -- Alf Gaida Sun, 27 Jan 2019 19:40:51 +0100 +pcmanfm-qt (0.14.0-0ubuntu2) disco; urgency=medium + + * Depend on the newer libfm-qt6 package. + + -- Simon Quigley Sat, 26 Jan 2019 10:21:10 -0600 + +pcmanfm-qt (0.14.0-0ubuntu1) disco; urgency=medium + + * New upstream release. + - Bump build dependencies. + - Remove reverse-applicable patches. + * Bump Standards-version to 4.3.0, no changes needed. + * Bump debhelper compat to 12, no changes needed. + * Add a new pcmanfm-qt-l10n package. + + -- Simon Quigley Sat, 26 Jan 2019 01:01:30 -0600 + +pcmanfm-qt (0.13.0-2ubuntu2) cosmic; urgency=medium + + * No-change rebuild for changes in libfm-qt. + + -- Simon Quigley Wed, 10 Oct 2018 21:00:58 -0500 + +pcmanfm-qt (0.13.0-2ubuntu1) cosmic; urgency=medium + + * Update Vcs-* and Maintainer for maintaining in Lubuntu. + * Polish the drag and drop experience by backporting some upstream commits. + + -- Simon Quigley Sat, 14 Jul 2018 18:24:46 -0500 + pcmanfm-qt (0.13.0-2) unstable; urgency=medium * Switch to unstable @@ -457,3 +552,4 @@ pcmanfm-qt (0.9.0+20150816-1) unstable; * Warpped lines in copyright. -- Andrew Lee (李健秋) Mon, 17 Aug 2015 21:04:54 +0800 + diff -pruN 1.2.0-1/debian/control 1.2.0-0ubuntu1/debian/control --- 1.2.0-1/debian/control 2022-11-30 06:31:26.000000000 +0000 +++ 1.2.0-0ubuntu1/debian/control 2022-11-19 00:48:57.000000000 +0000 @@ -1,37 +1,37 @@ Source: pcmanfm-qt -Maintainer: LXQt Packaging Team +Maintainer: Lubuntu Developers +XSBC-Original-Maintainer: LXQt Packaging Team Uploaders: Alf Gaida , ChangZhuo Chen (陳昌倬) , Andrew Lee (李健秋) , Shih-Yuan Lee (FourDollars) , - Yuan CHAO , - Simon Quigley , - Aaron Rainbolt + Yuan CHAO Section: x11 Priority: optional Build-Depends: debhelper-compat (= 13), libexif-dev, - libfm-qt-dev (>= 1.2.0-3~), + libfm-qt-dev (>= 1.2.0), libkf5windowsystem-dev, libmenu-cache-dev, libqt5svg5-dev, libqt5x11extras5-dev, libx11-dev, - lxqt-build-tools (>= 0.12.0~) + lxqt-build-tools (>= 0.12.0) Standards-Version: 4.6.1 -Vcs-Browser: https://salsa.debian.org/lxqt-team/pcmanfm-qt -Vcs-Git: https://salsa.debian.org/lxqt-team/pcmanfm-qt.git +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 +XS-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: ${misc:Depends}, - ${shlibs:Depends}, - default-dbus-session-bus | dbus-session-bus | dbus-x11, +Depends: default-dbus-session-bus | dbus-session-bus | dbus-x11, desktop-file-utils, - libfm-qt11 (>= 1.1.0~), - lxqt-sudo + libfm-qt12 (>= 1.2.0), + lxqt-sudo, + ${misc:Depends}, + ${shlibs:Depends} Recommends: eject, ffmpegthumbnailer, gvfs-backends, @@ -52,8 +52,7 @@ Package: pcmanfm-qt-l10n Architecture: all Multi-Arch: foreign Section: localization -Depends: ${misc:Depends}, - qttranslations5-l10n +Depends: qttranslations5-l10n, ${misc:Depends} Description: Language package for pcmanfm-qt PCManFM-Qt is the Qt port of the LXDE file manager PCManFM. . diff -pruN 1.2.0-1/debian/copyright 1.2.0-0ubuntu1/debian/copyright --- 1.2.0-1/debian/copyright 2022-11-30 06:31:26.000000000 +0000 +++ 1.2.0-0ubuntu1/debian/copyright 2022-11-19 00:55:03.000000000 +0000 @@ -3,19 +3,19 @@ Upstream-Name: pcmanfm-qt Source: https://github.com/lxqt/pcmanfm-qt Files: * -Copyright: 2009-2018 Hong Jen Yee (PCMan) - 2012-2013 Andriy Grytsenko (LStranger) +Copyright: 2017, Pedram Pourang (Tsu Jan) 2013-2022 LXQt team + 2009-2018 Hong Jen Yee (PCMan) + 2012-2013 Andriy Grytsenko (LStranger) 2014 Kuzma Shapran - 2017 Pedram Pourang (Tsu Jan) License: GPL-2.0+ Files: debian/* -Copyright: 2013-2019 Alf Gaida +Copyright: 2021-2022 Lubuntu Developers 2014-2015 Wen Liao - 2014-2022 ChangZhuo Chen (陳昌倬) + 2014-2016 ChangZhuo Chen (陳昌倬) + 2013-2018 Alf Gaida 2015 Andrew Lee (李健秋) - 2021-2022 Lubuntu Developers License: GPL-2.0+ License: GPL-2.0+ diff -pruN 1.2.0-1/debian/lintian-overrides 1.2.0-0ubuntu1/debian/lintian-overrides --- 1.2.0-1/debian/lintian-overrides 2022-11-30 06:28:12.000000000 +0000 +++ 1.2.0-0ubuntu1/debian/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -# No keywords entries needed in the desktop files. -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] diff -pruN 1.2.0-1/debian/patches/add-manual.patch 1.2.0-0ubuntu1/debian/patches/add-manual.patch --- 1.2.0-1/debian/patches/add-manual.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.0-0ubuntu1/debian/patches/add-manual.patch 2022-11-19 00:41:25.000000000 +0000 @@ -0,0 +1,105 @@ +Description: Add a desktop shortcut for the Lubuntu Manual +Forwarded: eventually +Author: Simon Quigley +Last-Update: 2022-06-16 +--- +diff --git a/pcmanfm/desktop-preferences.ui b/pcmanfm/desktop-preferences.ui +index d73e731..459926a 100644 +--- a/pcmanfm/desktop-preferences.ui ++++ b/pcmanfm/desktop-preferences.ui +@@ -573,6 +573,17 @@ are left clicked, even when it is not the default file manager. + + + ++ ++ ++ ++ Lubuntu Manual ++ ++ ++ ++ .. ++ ++ ++ + + + +diff --git a/pcmanfm/desktoppreferencesdialog.cpp b/pcmanfm/desktoppreferencesdialog.cpp +index 87fcfc2..a691d0c 100644 +--- a/pcmanfm/desktoppreferencesdialog.cpp ++++ b/pcmanfm/desktoppreferencesdialog.cpp +@@ -204,6 +204,9 @@ void DesktopPreferencesDialog::applySettings() + if(ui.networkBox->isChecked()) { + ds << QLatin1String("Network"); + } ++ if(ui.lubuntuManualBox->isChecked()) { ++ ds << QLatin1String("Lubuntu Manual"); ++ } + settings.setDesktopShortcuts(ds); + + settings.setDesktopCellMargins(QSize(ui.hMargin->value(), ui.vMargin->value())); +diff --git a/pcmanfm/desktopwindow.cpp b/pcmanfm/desktopwindow.cpp +index 78e8d2f..3edb7f0 100644 +--- a/pcmanfm/desktopwindow.cpp ++++ b/pcmanfm/desktopwindow.cpp +@@ -276,6 +276,16 @@ void DesktopWindow::updateShortcutsFromSettings(Settings& settings) { + paths.push_back(Fm::FilePath::fromLocalPath(network.toStdString().c_str())); + } + } ++ // Lubuntu Manual ++ if(ds.contains(QLatin1String("Lubuntu Manual"))) { ++ createLubuntuManualShortcut(); ++ } ++ 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())); ++ } ++ } + + // WARNING: QFile::remove() is not compatible with libfm-qt and should not be used. + if(!paths.empty()) { +@@ -361,6 +371,20 @@ void DesktopWindow::createNetworkShortcut() { + g_key_file_free(kf); + } + ++void DesktopWindow::createLubuntuManualShortcut() { ++ GKeyFile* kf = g_key_file_new(); ++ g_key_file_set_string(kf, "Desktop Entry", "Type", "Application"); ++ g_key_file_set_string(kf, "Desktop Entry", "Exec", "firefox manual.lubuntu.me"); ++ g_key_file_set_string(kf, "Desktop Entry", "Icon", "help-browser"); ++ const QString name = tr("Lubuntu Manual"); ++ g_key_file_set_string(kf, "Desktop Entry", "Name", name.toStdString().c_str()); ++ ++ auto path = Fm::FilePath::fromLocalPath(XdgDir::readDesktopDir().toStdString().c_str()).localPath(); ++ auto trash_can = Fm::CStrPtr{g_build_filename(path.get(), "lubuntu-manual.desktop", nullptr)}; ++ g_key_file_save_to_file(kf, trash_can.get(), nullptr); ++ g_key_file_free(kf); ++} ++ + void DesktopWindow::createTrash() { + if(trashMonitor_) { + return; +@@ -1260,7 +1284,8 @@ void DesktopWindow::trustOurDesktopShortcut(std::shared_ptr + 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:///" : +- fileName == QLatin1String("network.desktop") && ds.contains(QLatin1String("Network")) ? "pcmanfm-qt network:///" : nullptr; ++ fileName == QLatin1String("network.desktop") && ds.contains(QLatin1String("Network")) ? "pcmanfm-qt network:///" : ++ fileName == QLatin1String("lubuntu-manual.desktop") && ds.contains(QLatin1String("Lubuntu Manual")) ? "firefox manual.lubuntu.me" : nullptr ; + if(execStr) { + GKeyFile* kf = g_key_file_new(); + if(g_key_file_load_from_file(kf, file->path().toString().get(), G_KEY_FILE_NONE, nullptr)) { +diff --git a/pcmanfm/desktopwindow.h b/pcmanfm/desktopwindow.h +index 742d964..4a90cb4 100644 +--- a/pcmanfm/desktopwindow.h ++++ b/pcmanfm/desktopwindow.h +@@ -155,6 +155,7 @@ private: + void createHomeShortcut(); + void createComputerShortcut(); + void createNetworkShortcut(); ++ void createLubuntuManualShortcut(); + + void createTrash(); + static void onTrashChanged(GFileMonitor* monitor, GFile* gf, GFile* other, GFileMonitorEvent evt, DesktopWindow* pThis); diff -pruN 1.2.0-1/debian/patches/series 1.2.0-0ubuntu1/debian/patches/series --- 1.2.0-1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.0-0ubuntu1/debian/patches/series 2022-11-19 00:51:09.000000000 +0000 @@ -0,0 +1 @@ +add-manual.patch diff -pruN 1.2.0-1/debian/pcmanfm-qt.install 1.2.0-0ubuntu1/debian/pcmanfm-qt.install --- 1.2.0-1/debian/pcmanfm-qt.install 2022-11-30 06:26:55.000000000 +0000 +++ 1.2.0-0ubuntu1/debian/pcmanfm-qt.install 2022-11-19 00:41:25.000000000 +0000 @@ -1,7 +1,6 @@ etc/xdg/autostart/lxqt-desktop.desktop -usr/share/applications/pcmanfm-qt.desktop +usr/bin/pcmanfm-qt usr/share/applications/pcmanfm-qt-desktop-pref.desktop +usr/share/applications/pcmanfm-qt.desktop usr/share/man/man1/pcmanfm-qt.1 usr/share/pcmanfm-qt/lxqt/settings.conf -usr/bin/pcmanfm-qt - diff -pruN 1.2.0-1/debian/rules 1.2.0-0ubuntu1/debian/rules --- 1.2.0-1/debian/rules 2022-11-30 06:28:12.000000000 +0000 +++ 1.2.0-0ubuntu1/debian/rules 2022-11-19 00:41:25.000000000 +0000 @@ -2,15 +2,14 @@ # export DH_VERBOSE=1 export LC_ALL=C.UTF-8 +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: dh ${@} --buildsystem cmake -override_dh_missing: - dh_missing --fail-missing - override_dh_auto_configure: - dh_auto_configure -- \ - -DUPDATE_TRANSLATIONS=OFF \ + dh_auto_configure --\ + -DPULL_TRANSLATIONS=OFF\ + -DUPDATE_TRANSLATIONS=OFF\ -DCMAKE_BUILD_TYPE=RelWithDebInfo diff -pruN 1.2.0-1/debian/salsa-ci.yml 1.2.0-0ubuntu1/debian/salsa-ci.yml --- 1.2.0-1/debian/salsa-ci.yml 2022-11-30 06:26:55.000000000 +0000 +++ 1.2.0-0ubuntu1/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -# For more information on what jobs are run see: -# https://salsa.debian.org/salsa-ci-team/pipeline -# -# To enable the jobs, go to your repository (at salsa.debian.org) -# and click over Settings > CI/CD > Expand (in General pipelines). -# In "Custom CI config path" write debian/salsa-ci.yml and click -# in "Save Changes". The CI tests will run after the next commit. ---- -include: - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml - diff -pruN 1.2.0-1/debian/upstream/metadata 1.2.0-0ubuntu1/debian/upstream/metadata --- 1.2.0-1/debian/upstream/metadata 2022-11-30 06:28:12.000000000 +0000 +++ 1.2.0-0ubuntu1/debian/upstream/metadata 2022-11-19 00:41:25.000000000 +0000 @@ -2,3 +2,5 @@ Bug-Database: https://github.com/lxqt/pc Bug-Submit: https://github.com/lxqt/pcmanfm-qt/issues/new Changelog: https://github.com/lxqt/pcmanfm-qt/blob/master/CHANGELOG Repository: https://github.com/lxqt/pcmanfm-qt.git +Repository-Browse: https://github.com/lxqt/pcmanfm-qt + diff -pruN 1.2.0-1/debian/watch 1.2.0-0ubuntu1/debian/watch --- 1.2.0-1/debian/watch 2022-11-30 06:28:12.000000000 +0000 +++ 1.2.0-0ubuntu1/debian/watch 2022-11-19 00:45:45.000000000 +0000 @@ -1,6 +1,5 @@ version=4 - -# See https://davesteele.github.io/development/2015/05/02/debian-watch-file-format-for-signed-github-source-tars/ for GitHub workaround for releases page. - -opts="downloadurlmangle=s/archive\/refs\/tags\/@ANY_VERSION@@ARCHIVE_EXT@/releases\/download\/$1\/@PACKAGE@-$1\.tar\.xz/,pgpsigurlmangle=s/$/.asc/" \ -https://github.com/lxqt/@PACKAGE@/tags .*/@ANY_VERSION@@ARCHIVE_EXT@ +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