From 8d14dd93bcc80f95cf12cd04ad932091de9c5194 Mon Sep 17 00:00:00 2001 From: Raman Sarda Date: Tue, 8 Oct 2019 11:52:17 -0500 Subject: [PATCH 1/2] Picked the latest git. Closes D49 --- debian/changelog | 6 + debian/patches/move-config.patch | 15 -- debian/patches/series | 2 - debian/patches/use-xdg-hierarchy.patch | 290 ------------------------- 4 files changed, 6 insertions(+), 307 deletions(-) delete mode 100644 debian/patches/move-config.patch delete mode 100644 debian/patches/use-xdg-hierarchy.patch diff --git a/debian/changelog b/debian/changelog index 61feeca..bd14a98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lxqt-globalkeys (0.14.1+git20190923-0ubuntu1) eoan; urgency=medium + + * Picked the latest git. + + -- Raman Sarda Tue, 08 Oct 2019 03:27:38 +0530 + lxqt-globalkeys (0.14.1-0ubuntu4) eoan; urgency=medium * Correctly changed the location of upstream config. diff --git a/debian/patches/move-config.patch b/debian/patches/move-config.patch deleted file mode 100644 index 1b5b9a4..0000000 --- a/debian/patches/move-config.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: move shortcuts config fom /etc/xdg/lxqt to /usr/share/lxqt -Author: Alf Gaida -Applied-Upstream: -https://github.com/lxqt/lxqt-globalkeys/commit/cbce84c6703caa0835765fca22542826d575ca1f.patch -Last-Update: 2019-08-20 ---- a/xdg/CMakeLists.txt -+++ b/xdg/CMakeLists.txt -@@ -1,6 +1,6 @@ - # install default config files to /etc/xdg - install(FILES - globalkeyshortcuts.conf -- DESTINATION "${LXQT_ETC_XDG_DIR}/lxqt" -+ DESTINATION "${CMAKE_INSTALL_DATADIR}/lxqt" - COMPONENT Runtime - ) diff --git a/debian/patches/series b/debian/patches/series index 18a9428..696c5fa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ complete-config-file.patch -move-config.patch -use-xdg-hierarchy.patch diff --git a/debian/patches/use-xdg-hierarchy.patch b/debian/patches/use-xdg-hierarchy.patch deleted file mode 100644 index f20d21f..0000000 --- a/debian/patches/use-xdg-hierarchy.patch +++ /dev/null @@ -1,290 +0,0 @@ -Description: Use XDG hierarchy if no config file given -Author: Palo Kisa -Applied-Upstream: -https://github.com/lxqt/lxqt-globalkeys/pull/60/commits/efc2933ec9e8b2f85e2e6eea1d27f5bb3d08f1ba -Last-Update: 2019-08-17 ---- a/daemon/core.cpp -+++ b/daemon/core.cpp -@@ -400,6 +400,7 @@ Core::Core(bool useSyslog, bool minLogLe - , mAllowGrabMiscKeypad(true) - , mAllowGrabPrintable(false) - -+ , mSettings{new QSettings{QStringLiteral("lxqt"), QStringLiteral("globalkeyshortcuts")}} - , mSaveAllowed(false) - - , mShortcutGrabTimeout(new QTimer(this)) -@@ -411,8 +412,6 @@ Core::Core(bool useSyslog, bool minLogLe - initBothPipeEnds(mX11RequestPipe); - initBothPipeEnds(mX11ResponsePipe); - -- mConfigFile = QFile::decodeName(qgetenv("HOME")) + QStringLiteral("/.config/global_key_shortcutss.ini"); -- - try - { - error_t c_error; -@@ -465,18 +464,17 @@ Core::Core(bool useSyslog, bool minLogLe - - - { -- size_t fm = configFiles.size(); -- for (size_t fi = 0; fi < fm; ++fi) -+ // use regular XDG hierarchy (implemented by QSettings) if no config file given on command line -+ auto config_file_i = configFiles.cbegin(); -+ if (config_file_i != configFiles.cend()) -+ mSettings.reset(new QSettings{*config_file_i, QSettings::IniFormat}); -+ for (bool finished = false; !finished; ) - { -- mConfigFile = configFiles[fi]; -- -- QSettings settings(mConfigFile, QSettings::IniFormat, this); -- - QString iniValue; - - if (!minLogLevelSet) - { -- iniValue = settings.value(/* General/ */QStringLiteral("LogLevel")).toString(); -+ iniValue = mSettings->value(/* General/ */QStringLiteral("LogLevel")).toString(); - if (!iniValue.isEmpty()) - { - if (iniValue == QLatin1String("error")) -@@ -504,7 +502,7 @@ Core::Core(bool useSyslog, bool minLogLe - - if (!multipleActionsBehaviourSet) - { -- iniValue = settings.value(/* General/ */QStringLiteral("MultipleActionsBehaviour")).toString(); -+ iniValue = mSettings->value(/* General/ */QStringLiteral("MultipleActionsBehaviour")).toString(); - if (!iniValue.isEmpty()) - { - if (iniValue == firstStr) -@@ -526,18 +524,18 @@ Core::Core(bool useSyslog, bool minLogLe - } - } - -- mAllowGrabLocks = settings.value(/* General/ */QStringLiteral("AllowGrabLocks"), mAllowGrabLocks).toBool(); -- mAllowGrabBaseSpecial = settings.value(/* General/ */QStringLiteral("AllowGrabBaseSpecial"), mAllowGrabBaseSpecial).toBool(); -- mAllowGrabMiscSpecial = settings.value(/* General/ */QStringLiteral("AllowGrabMiscSpecial"), mAllowGrabMiscSpecial).toBool(); -- mAllowGrabBaseKeypad = settings.value(/* General/ */QStringLiteral("AllowGrabBaseKeypad"), mAllowGrabBaseKeypad).toBool(); -- mAllowGrabMiscKeypad = settings.value(/* General/ */QStringLiteral("AllowGrabMiscKeypad"), mAllowGrabMiscKeypad).toBool(); -+ mAllowGrabLocks = mSettings->value(/* General/ */QStringLiteral("AllowGrabLocks"), mAllowGrabLocks).toBool(); -+ mAllowGrabBaseSpecial = mSettings->value(/* General/ */QStringLiteral("AllowGrabBaseSpecial"), mAllowGrabBaseSpecial).toBool(); -+ mAllowGrabMiscSpecial = mSettings->value(/* General/ */QStringLiteral("AllowGrabMiscSpecial"), mAllowGrabMiscSpecial).toBool(); -+ mAllowGrabBaseKeypad = mSettings->value(/* General/ */QStringLiteral("AllowGrabBaseKeypad"), mAllowGrabBaseKeypad).toBool(); -+ mAllowGrabMiscKeypad = mSettings->value(/* General/ */QStringLiteral("AllowGrabMiscKeypad"), mAllowGrabMiscKeypad).toBool(); - -- const auto sections = settings.childGroups(); -+ const auto sections = mSettings->childGroups(); - for(const QString §ion : sections) - { - if (section != QLatin1String("General")) - { -- settings.beginGroup(section); -+ mSettings->beginGroup(section); - - QString shortcut = section; - int pos = shortcut.indexOf(QLatin1Char('.')); -@@ -548,32 +546,32 @@ Core::Core(bool useSyslog, bool minLogLe - - qulonglong id = 0ull; - -- bool enabled = settings.value(EnabledKey, true).toBool(); -+ bool enabled = mSettings->value(EnabledKey, true).toBool(); - -- QString description = settings.value(CommentKey).toString(); -+ QString description = mSettings->value(CommentKey).toString(); - -- if (settings.contains(ExecKey)) -+ if (mSettings->contains(ExecKey)) - { -- QStringList values = settings.value(ExecKey).toStringList(); -+ QStringList values = mSettings->value(ExecKey).toStringList(); - id = registerCommandAction(shortcut, values[0], values.mid(1), description); - } - else - { -- iniValue = settings.value(pathKey).toString(); -+ iniValue = mSettings->value(pathKey).toString(); - if (!iniValue.isEmpty()) - { - QString path = iniValue; - -- if (settings.contains(interfaceKey)) -+ if (mSettings->contains(interfaceKey)) - { -- QString interface = settings.value(interfaceKey).toString(); -+ QString interface = mSettings->value(interfaceKey).toString(); - -- iniValue = settings.value(serviceKey).toString(); -+ iniValue = mSettings->value(serviceKey).toString(); - if (!iniValue.isEmpty()) - { - QString service = iniValue; - -- iniValue = settings.value(methodKey).toString(); -+ iniValue = mSettings->value(methodKey).toString(); - if (!iniValue.isEmpty()) - { - QString method = iniValue; -@@ -593,12 +591,16 @@ Core::Core(bool useSyslog, bool minLogLe - enableActionNonGuarded(id, enabled); - } - -- settings.endGroup(); -+ mSettings->endGroup(); - } - } -+ finished = config_file_i == configFiles.cend(); -+ if (!finished) -+ mSettings.reset(new QSettings{*config_file_i++, QSettings::IniFormat}); -+ - } - } -- log(LOG_DEBUG, "Config file: %s", qPrintable(mConfigFile)); -+ log(LOG_DEBUG, "Config file: %s", qPrintable(mSettings->fileName())); - - - log(LOG_DEBUG, "MinLogLevel: %s", strLevel(mMinLogLevel)); -@@ -730,37 +732,37 @@ void Core::saveConfig() - return; - } - -- QSettings settings(mConfigFile, QSettings::IniFormat); -- -- settings.clear(); -+ QVariant windowSize = mSettings->value(QStringLiteral("WindowSize")); -+ mSettings->clear(); -+ mSettings->setValue(QStringLiteral("WindowSize"), windowSize); - - switch (mMultipleActionsBehaviour) - { - case MULTIPLE_ACTIONS_BEHAVIOUR_FIRST: -- settings.setValue(/* General/ */QLatin1String("MultipleActionsBehaviour"), firstStr); -+ mSettings->setValue(/* General/ */QLatin1String("MultipleActionsBehaviour"), firstStr); - break; - - case MULTIPLE_ACTIONS_BEHAVIOUR_LAST: -- settings.setValue(/* General/ */QLatin1String("MultipleActionsBehaviour"), lastStr); -+ mSettings->setValue(/* General/ */QLatin1String("MultipleActionsBehaviour"), lastStr); - break; - - case MULTIPLE_ACTIONS_BEHAVIOUR_ALL: -- settings.setValue(/* General/ */QLatin1String("MultipleActionsBehaviour"), allStr); -+ mSettings->setValue(/* General/ */QLatin1String("MultipleActionsBehaviour"), allStr); - break; - - case MULTIPLE_ACTIONS_BEHAVIOUR_NONE: -- settings.setValue(/* General/ */QLatin1String("MultipleActionsBehaviour"), noneStr); -+ mSettings->setValue(/* General/ */QLatin1String("MultipleActionsBehaviour"), noneStr); - break; - - default: - ; - } - -- settings.setValue(/* General/ */QLatin1String("AllowGrabLocks"), mAllowGrabLocks); -- settings.setValue(/* General/ */QLatin1String("AllowGrabBaseSpecial"), mAllowGrabBaseSpecial); -- settings.setValue(/* General/ */QLatin1String("AllowGrabMiscSpecial"), mAllowGrabMiscSpecial); -- settings.setValue(/* General/ */QLatin1String("AllowGrabBaseKeypad"), mAllowGrabBaseKeypad); -- settings.setValue(/* General/ */QLatin1String("AllowGrabMiscKeypad"), mAllowGrabMiscKeypad); -+ mSettings->setValue(/* General/ */QLatin1String("AllowGrabLocks"), mAllowGrabLocks); -+ mSettings->setValue(/* General/ */QLatin1String("AllowGrabBaseSpecial"), mAllowGrabBaseSpecial); -+ mSettings->setValue(/* General/ */QLatin1String("AllowGrabMiscSpecial"), mAllowGrabMiscSpecial); -+ mSettings->setValue(/* General/ */QLatin1String("AllowGrabBaseKeypad"), mAllowGrabBaseKeypad); -+ mSettings->setValue(/* General/ */QLatin1String("AllowGrabMiscKeypad"), mAllowGrabMiscKeypad); - - ShortcutAndActionById::const_iterator lastShortcutAndActionById = mShortcutAndActionById.constEnd(); - for (ShortcutAndActionById::const_iterator shortcutAndActionById = mShortcutAndActionById.constBegin(); shortcutAndActionById != lastShortcutAndActionById; ++shortcutAndActionById) -@@ -768,31 +770,31 @@ void Core::saveConfig() - const BaseAction *action = shortcutAndActionById.value().second; - QString section = shortcutAndActionById.value().first + QLatin1Char('.') + QString::number(shortcutAndActionById.key()); - -- settings.beginGroup(section); -+ mSettings->beginGroup(section); - -- settings.setValue(EnabledKey, action->isEnabled()); -- settings.setValue(CommentKey, action->description()); -+ mSettings->setValue(EnabledKey, action->isEnabled()); -+ mSettings->setValue(CommentKey, action->description()); - - if (!strcmp(action->type(), CommandAction::id())) - { - const CommandAction *commandAction = dynamic_cast(action); -- settings.setValue(ExecKey, QVariant(QStringList() << commandAction->command() += commandAction->args())); -+ mSettings->setValue(ExecKey, QVariant(QStringList() << commandAction->command() += commandAction->args())); - } - else if (!strcmp(action->type(), MethodAction::id())) - { - const MethodAction *methodAction = dynamic_cast(action); -- settings.setValue(serviceKey, methodAction->service()); -- settings.setValue(pathKey, methodAction->path().path()); -- settings.setValue(interfaceKey, methodAction->interface()); -- settings.setValue(methodKey, methodAction->method()); -+ mSettings->setValue(serviceKey, methodAction->service()); -+ mSettings->setValue(pathKey, methodAction->path().path()); -+ mSettings->setValue(interfaceKey, methodAction->interface()); -+ mSettings->setValue(methodKey, methodAction->method()); - } - else if (!strcmp(action->type(), ClientAction::id())) - { - const ClientAction *clientAction = dynamic_cast(action); -- settings.setValue(pathKey, clientAction->path().path()); -+ mSettings->setValue(pathKey, clientAction->path().path()); - } - -- settings.endGroup(); -+ mSettings->endGroup(); - } - } - ---- a/daemon/core.h -+++ b/daemon/core.h -@@ -58,6 +58,7 @@ class NativeAdaptor; - class DBusProxy; - class BaseAction; - class QDBusServiceWatcher; -+class QSettings; - - template - class QOrderedSet : public QMap -@@ -242,7 +243,7 @@ private: - bool mAllowGrabMiscKeypad; - bool mAllowGrabPrintable; - -- QString mConfigFile; -+ QScopedPointer mSettings; - bool mSaveAllowed; - - QTimer *mShortcutGrabTimeout; ---- a/daemon/main.cpp -+++ b/daemon/main.cpp -@@ -43,8 +43,6 @@ - #include - #include // for basename() - --#define DEFAULT_CONFIG ".config/lxqt/globalkeyshortcuts.conf" -- - - int main(int argc, char *argv[]) - { -@@ -212,7 +210,7 @@ int main(int argc, char *argv[]) - " --config-file=FILENAME\n" - " Use config file FILENAME. Can be used several times.\n" - " The last loaded file is used to save settings.\n" -- " Default is: ${HOME}/" DEFAULT_CONFIG "\n" -+ " Default is: ${XDG_CONFIG_HOME}/lxqt/globalkeyshortcuts.conf\n" - "\n" - " --help\n" - " -h\n" -@@ -235,13 +233,6 @@ int main(int argc, char *argv[]) - int ignoreIt = chdir((home && *home) ? home : "/"); - (void)ignoreIt; - -- if (configFiles.empty() && home && *home) -- { -- if( ! QFile::exists(QString::fromLocal8Bit(home) + QLatin1Char('/') + QLatin1String(DEFAULT_CONFIG)) ) //Load default settings -- configFiles.push_back(QStringLiteral("/etc/xdg/lxqt/globalkeyshortcuts.conf")); -- configFiles.push_back(QString::fromLocal8Bit(home) + QLatin1Char('/') + QLatin1String(DEFAULT_CONFIG)); -- } -- - LXQt::Application app(argc, argv); - - Core core(runAsDaemon || useSyslog, minLogLevelSet, minLogLevel, configFiles, multipleActionsBehaviourSet, multipleActionsBehaviour); From a1e05493d3095108ea073fc9a13ac2d123693589 Mon Sep 17 00:00:00 2001 From: Raman Sarda Date: Sun, 19 Jan 2020 08:49:04 +0000 Subject: [PATCH 2/2] Bump version number for new release. Summary: Make changes to match latest release. Test Plan: check if it matches with latest version on git and archives. Reviewers: kc2bez, wxl, tsimonq2, rikmills Reviewed By: kc2bez, rikmills Subscribers: rikmills Differential Revision: https://phab.lubuntu.me/D69 --- debian/changelog | 64 +++++++ debian/control | 11 +- debian/gbp.conf | 5 + debian/patches/complete-config-file.patch | 215 ---------------------- debian/patches/series | 1 - 5 files changed, 74 insertions(+), 222 deletions(-) create mode 100644 debian/gbp.conf delete mode 100644 debian/patches/complete-config-file.patch diff --git a/debian/changelog b/debian/changelog index bd14a98..de2aa5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,52 @@ +lxqt-globalkeys (0.14.3-1ubuntu1) focal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Modified lxqt-globalkeys.install to include ubuntu specific changes. + The changes install default config file to another location so that distribution specific config files provided via xdg take precedence. + - new dependencies in control file. + - Translations from debian for following: + 1. config/translations/lxqt-config-globalkeyshortcuts_cs.ts + 2. config/translations/lxqt-config-globalkeyshortcuts_da.ts + 3. config/translations/lxqt-config-globalkeyshortcuts_de.ts + 4. config/translations/lxqt-config-globalkeyshortcuts_el.ts + 5. config/translations/lxqt-config-globalkeyshortcuts_gl.ts + 6. config/translations/lxqt-config-globalkeyshortcuts_gl.ts + 7. config/translations/lxqt-config-globalkeyshortcuts_ja.ts + 8. config/translations/lxqt-config-globalkeyshortcuts_it.ts + 9. config/translations/lxqt-config-globalkeyshortcuts_nb_NO.ts + 10. config/translations/lxqt-config-globalkeyshortcuts_pt.ts + 11. config/translations/lxqt-config-globalkeyshortcuts_pt_BR.ts + - Removed an unncessary patch. + + -- Raman Sarda Tue, 07 Jan 2020 19:26:41 +0530 + +lxqt-globalkeys (0.14.3-1) unstable; urgency=medium + + * New upstream version 0.14.3 (Closes: #883035) + + -- Alf Gaida Wed, 16 Oct 2019 23:33:20 +0200 + +lxqt-globalkeys (0.14.2-1) unstable; urgency=medium + + * Imported new upstream release 0.14.2. + * Switched to gbp + * Bumped Standards-Version to 4.4.1, no changes needed + * Fixed installation path for globalkeyshortcuts.conf to /usr/share/lxqt + + -- Alf Gaida Thu, 10 Oct 2019 23:34:49 +0200 + lxqt-globalkeys (0.14.1+git20190923-0ubuntu1) eoan; urgency=medium * Picked the latest git. -- Raman Sarda Tue, 08 Oct 2019 03:27:38 +0530 +lxqt-globalkeys (0.14.1-1) unstable; urgency=medium + + * Cherry-picking new upstream version 0.14.1. + * Bumped minimum version liblxqt0-dev (>= 0.14.1~) + * Extended the long descriptions a bit + + -- Alf Gaida Sun, 24 Feb 2019 21:28:30 +0100 lxqt-globalkeys (0.14.1-0ubuntu4) eoan; urgency=medium @@ -28,6 +72,20 @@ lxqt-globalkeys (0.14.1-0ubuntu1) disco; urgency=medium * New upstream release. -- Simon Quigley Sat, 09 Mar 2019 13:06:02 -0600 +lxqt-globalkeys (0.14.0-1) unstable; urgency=medium + + * Cherry-picking new upstream version 0.14.0. + * Bumped Standards to 4.3.0, no changes needed + * Dropped d/compat, use debhelper-compat = 12, no changes needed + * Fixed years in d/copyright + * Bumped minimum version liblxqt0-dev (>= 0.14.0~) + * Removed obsolete PULL_TRANSLATIONS= OFF from dh_auto_configure + * Added Build-Depends-Package fields to symbols + * Added l10n-package, moved from lxqt-l10n + * Added build dependency xserver-xorg-input-libinput-dev + * Added d/upstream/metadata + + -- Alf Gaida Sun, 27 Jan 2019 17:37:07 +0100 lxqt-globalkeys (0.14.0-0ubuntu1) disco; urgency=medium @@ -38,6 +96,12 @@ lxqt-globalkeys (0.14.0-0ubuntu1) disco; urgency=medium * Add a lxqt-globalkeys-l10n package. -- Simon Quigley Sat, 26 Jan 2019 00:15:52 -0600 +lxqt-globalkeys (0.13.0-1) unstable; urgency=medium + + * Cherry-picking new upstream version 0.13.0. + * Bumped build dependency liblxqt0-dev to >= 0.13.0~ + + -- Alf Gaida Thu, 24 May 2018 21:23:58 +0200 lxqt-globalkeys (0.13.0-0ubuntu2) cosmic; urgency=medium diff --git a/debian/control b/debian/control index 9ed7ee0..a1306f2 100644 --- a/debian/control +++ b/debian/control @@ -11,12 +11,11 @@ Build-Depends: debhelper (>= 12), liblxqt0-dev (>= 0.14.0), libqt5svg5-dev, libqt5x11extras5-dev, - libx11-dev -Standards-Version: 4.4.0 -Vcs-Browser: https://phab.lubuntu.me/source/lxqt-globalkeys/ -Vcs-Git: https://phab.lubuntu.me/source/lxqt-globalkeys.git -XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-globalkeys -XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-globalkeys.git + libx11-dev, + xserver-xorg-input-libinput-dev, +Standards-Version: 4.4.1 +Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-globalkeys +Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-globalkeys.git Homepage: https://github.com/lxqt/lxqt-globalkeys Package: lxqt-globalkeys diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..9552c6c --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,5 @@ +[DEFAULT] +debian-branch = debian/sid +upstream-branch = upstream/latest +pristine-tar = True +compression = xz diff --git a/debian/patches/complete-config-file.patch b/debian/patches/complete-config-file.patch deleted file mode 100644 index bd368b3..0000000 --- a/debian/patches/complete-config-file.patch +++ /dev/null @@ -1,215 +0,0 @@ -Description: Provide a more complete configuration file. -Author: Walter Lapchynski -Last-Update: 2018-10-06 ---- a/xdg/globalkeyshortcuts.conf -+++ b/xdg/globalkeyshortcuts.conf -@@ -1,46 +1,187 @@ -+[General] -+AllowGrabBaseKeypad=true -+AllowGrabBaseSpecial=false -+AllowGrabLocks=false -+AllowGrabMiscKeypad=true -+AllowGrabMiscSpecial=true -+MultipleActionsBehaviour=first - --[Control%2BAlt%2BT.1] --Comment=QTerminal -+[.20] -+Comment=Switch to desktop 7 - Enabled=true --Exec=qterminal -+path=/panel/desktopswitch/desktop_7 - --[Shift%2BControl%2BF6.2] --Comment=\x2600 \x2193 -+[.23] -+Comment=Switch to desktop 10 - Enabled=true --Exec=lxqt-config-brightness, -d -+path=/panel/desktopswitch/desktop_10 - --[Shift%2BControl%2BF7.3] --Comment=\x2600 \x2191 -+[.24] -+Comment=Switch to desktop 11 - Enabled=true --Exec=lxqt-config-brightness, -i -+path=/panel/desktopswitch/desktop_11 - --[XF86MonBrightnessDown.4] --Comment=\x2600 \x2193 -+[.36] -+Comment=Show/hide runner dialog - Enabled=true --Exec=lxqt-config-brightness, -d -+path=/runner/show_hide_dialog - --[XF86MonBrightnessUp.5] --Comment=\x2600 \x2191 -+[Control%2BAlt%2BD.10] -+Comment=Show desktop - Enabled=true --Exec=lxqt-config-brightness, -i -+path=/panel/showdesktop/show_hide - -- --[Control%2BAlt%2BE.6] -+[Control%2BAlt%2BE.1] - Comment=Pcmanfm - Enabled=true - Exec=pcmanfm-qt - --[Control%2BAlt%2BI.7] -+[Control%2BAlt%2BI.2] - Comment=Web browser - Enabled=true - Exec=xdg-open, about:blank - --[Print.8] -+[Control%2BAlt%2BL.3] -+Comment=lockscreen -+Enabled=true -+Exec=xdg-screensaver, lock -+ -+[Control%2BF1.14] -+Comment=Switch to desktop 1 -+Enabled=true -+path=/panel/desktopswitch/desktop_1 -+ -+[Control%2BF12.25] -+Comment=Switch to desktop 12 -+Enabled=true -+path=/panel/desktopswitch/desktop_12 -+ -+[Control%2BF2.15] -+Comment=Switch to desktop 2 -+Enabled=true -+path=/panel/desktopswitch/desktop_2 -+ -+[Control%2BF3.16] -+Comment=Switch to desktop 3 -+Enabled=true -+path=/panel/desktopswitch/desktop_3 -+ -+[Control%2BF4.17] -+Comment=Switch to desktop 4 -+Enabled=true -+path=/panel/desktopswitch/desktop_4 -+ -+[Control%2BF5.18] -+Comment=Switch to desktop 5 -+Enabled=true -+path=/panel/desktopswitch/desktop_5 -+ -+[Control%2BF6.19] -+Comment=Switch to desktop 6 -+Enabled=true -+path=/panel/desktopswitch/desktop_6 -+ -+[Control%2BF8.21] -+Comment=Switch to desktop 8 -+Enabled=true -+path=/panel/desktopswitch/desktop_8 -+ -+[Control%2BF9.22] -+Comment=Switch to desktop 9 -+Enabled=true -+path=/panel/desktopswitch/desktop_9 -+ -+[Meta%2B0.35] -+Comment=Activate task 10 -+Enabled=true -+path=/panel/taskbar/task_10 -+ -+[Meta%2B1.26] -+Comment=Activate task 1 -+Enabled=true -+path=/panel/taskbar/task_1 -+ -+[Meta%2B2.27] -+Comment=Activate task 2 -+Enabled=true -+path=/panel/taskbar/task_2 -+ -+[Meta%2B3.28] -+Comment=Activate task 3 -+Enabled=true -+path=/panel/taskbar/task_3 -+ -+[Meta%2B4.29] -+Comment=Activate task 4 -+Enabled=true -+path=/panel/taskbar/task_4 -+ -+[Meta%2B5.30] -+Comment=Activate task 5 -+Enabled=true -+path=/panel/taskbar/task_5 -+ -+[Meta%2B6.31] -+Comment=Activate task 6 -+Enabled=true -+path=/panel/taskbar/task_6 -+ -+[Meta%2B7.32] -+Comment=Activate task 7 -+Enabled=true -+path=/panel/taskbar/task_7 -+ -+[Meta%2B8.33] -+Comment=Activate task 8 -+Enabled=true -+path=/panel/taskbar/task_8 -+ -+[Meta%2B9.34] -+Comment=Activate task 9 -+Enabled=true -+path=/panel/taskbar/task_9 -+ -+[Print.4] - Comment=screen shot - Enabled=true - Exec=lximage-qt, -s - --[Control%2BAlt%2BL.30] --Comment=lockscreen -+[Shift%2BControl%2BF6.5] -+Comment=\x2600 \x2193 - Enabled=true --Exec=xdg-screensaver, lock -+Exec=lxqt-config-brightness, -d -+ -+[Shift%2BControl%2BF7.6] -+Comment=\x2600 \x2191 -+Enabled=true -+Exec=lxqt-config-brightness, -i -+ -+[Super_L.9] -+Comment=Show/hide main menu -+Enabled=true -+path=/panel/mainmenu/show_hide -+ -+[XF86AudioLowerVolume.12] -+Comment=Decrease sound volume -+Enabled=true -+path=/panel/volume/down -+ -+[XF86AudioMute.13] -+Comment=Mute/unmute sound volume -+Enabled=true -+path=/panel/volume/mute -+ -+[XF86AudioRaiseVolume.11] -+Comment=Increase sound volume -+Enabled=true -+path=/panel/volume/up -+ -+[XF86MonBrightnessDown.7] -+Comment=\x2600 \x2193 -+Enabled=true -+Exec=lxqt-config-brightness, -d -+ -+[XF86MonBrightnessUp.8] -+Comment=\x2600 \x2191 -+Enabled=true -+Exec=lxqt-config-brightness, -i diff --git a/debian/patches/series b/debian/patches/series index 696c5fa..e69de29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +0,0 @@ -complete-config-file.patch