From a7b8a72f030c10657caecc4a3e3dd296bdae60ac Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Fri, 1 Dec 2023 15:02:23 -0600 Subject: [PATCH] Update the Lubuntu Manual patch to use the dedicated icon. --- debian/changelog | 10 +- debian/copyright | 4 + debian/patches/add-manual.patch | 696 +++++++++++++++++++++++++++++++- debian/pcmanfm-qt.install | 1 + 4 files changed, 704 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index f119dcf..c4f3243 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ -pcmanfm-qt (1.4.0-0ubuntu2~ppa1) jammy; urgency=medium +pcmanfm-qt (1.4.0-0ubuntu3~ppa22.04.1) jammy; urgency=medium * Backport to Jammy. - -- Simon Quigley Mon, 13 Nov 2023 15:52:06 -0600 + -- Simon Quigley Fri, 01 Dec 2023 15:03:56 -0600 + +pcmanfm-qt (1.4.0-0ubuntu3) noble; urgency=medium + + * Update the Lubuntu Manual patch to use the dedicated icon. + + -- Simon Quigley Fri, 01 Dec 2023 14:54:31 -0600 pcmanfm-qt (1.4.0-0ubuntu2) noble; urgency=medium diff --git a/debian/copyright b/debian/copyright index f9ff309..2c4dd0f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -10,6 +10,10 @@ Copyright: 2017, Pedram Pourang (Tsu Jan) 2014 Kuzma Shapran License: GPL-2.0+ +Files: icons/lubuntu-manual.svg +Copyright: 2010-2018 Rafael Laguna +License: GPL-2.0+ + Files: debian/* Copyright: 2021-2023 Lubuntu Developers 2014-2015 Wen Liao diff --git a/debian/patches/add-manual.patch b/debian/patches/add-manual.patch index 5044bb2..9781022 100644 --- a/debian/patches/add-manual.patch +++ b/debian/patches/add-manual.patch @@ -1,7 +1,7 @@ Description: Add a desktop shortcut for the Lubuntu Manual Forwarded: eventually Author: Simon Quigley -Last-Update: 2022-06-16 +Last-Update: 2023-12-01 --- --- a/pcmanfm/desktoppreferencesdialog.cpp +++ b/pcmanfm/desktoppreferencesdialog.cpp @@ -49,8 +49,8 @@ Last-Update: 2022-06-16 +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"); ++ g_key_file_set_string(kf, "Desktop Entry", "Exec", "xdg-open https://manual.lubuntu.me"); ++ g_key_file_set_string(kf, "Desktop Entry", "Icon", "lubuntu-manual"); + const QString name = tr("Lubuntu Manual"); + g_key_file_set_string(kf, "Desktop Entry", "Name", name.toStdString().c_str()); + @@ -79,7 +79,7 @@ Last-Update: 2022-06-16 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 ; ++ fileName == QLatin1String("lubuntu-manual.desktop") && ds.contains(QLatin1String("Lubuntu Manual")) ? "xdg-open https://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)) { @@ -105,7 +105,7 @@ Last-Update: 2022-06-16 + Lubuntu Manual + + -+ ++ + .. + + @@ -113,3 +113,689 @@ Last-Update: 2022-06-16 +--- /dev/null ++++ b/icons/lubuntu-manual.svg +@@ -0,0 +1,683 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ image/svg+xml ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ diff --git a/debian/pcmanfm-qt.install b/debian/pcmanfm-qt.install index ae4bf3f..2bfab3b 100644 --- a/debian/pcmanfm-qt.install +++ b/debian/pcmanfm-qt.install @@ -1,4 +1,5 @@ etc/xdg/autostart/lxqt-desktop.desktop +icons/lubuntu-manual.svg usr/share/icons/hicolor/scalable/apps/ usr/bin/pcmanfm-qt usr/share/applications/pcmanfm-qt-desktop-pref.desktop usr/share/applications/pcmanfm-qt.desktop