Page MenuHomeLubuntu Development

Masterwork From Distant Lands
ActivePublic

Authored by The_LoudSpeaker on Jan 30 2020, 3:48 PM.
diff -Nru lxqt-config-0.14.1/debian/README.source lxqt-config-0.14.1/debian/README.source
--- lxqt-config-0.14.1/debian/README.source 2019-03-09 18:54:10.000000000 +0000
+++ lxqt-config-0.14.1/debian/README.source 1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-LXQt-config
------------
-
-Software Licences
-=================
-
-This software contains GPL v2+, GPL v3+ and LGPL v2+.
-This document
-(http://www.gnu.org/licenses/gpl-faq.html#v3HowToUpgrade)
-tells us GPL v2+ can upgrade GPL v3+. You can upgrade LGPL v3+
-
-see also http://gplv3.fsf.org/dd3-faq
-
--- Yukiharu YABUKI <yyabuki@debian.org> 2015-08-21 18:42:35+09:00
diff -Nru lxqt-config-0.14.1/debian/changelog lxqt-config-0.14.1/debian/changelog
--- lxqt-config-0.14.1/debian/changelog 2019-03-09 18:54:59.000000000 +0000
+++ lxqt-config-0.14.1/debian/changelog 2020-01-27 22:02:17.000000000 +0000
@@ -1,3 +1,33 @@
+lxqt-config (0.14.1-3ubuntu1) focal; urgency=low
+
+ * Merge from Debian unstable. Remaining changes:
+ - Updated build-depends.
+ - keeping ubuntu-side install file.
+ - updated rules.
+
+ -- Raman sarda <thelouspeaker@lubuntu.me> Sun, 28 Jan 2020 03:32:19 +0530
+
+lxqt-config (0.14.1-3) unstable; urgency=medium
+
+ * Build without touchpad support on kfreebsd and hurd, thanks
+ Paul Sonnenschein <paul@sonnenschein.ruhr> (Closes: #933336)
+
+ -- Alf Gaida <agaida@siduction.org> Sun, 04 Aug 2019 04:07:48 +0200
+
+lxqt-config (0.14.1-2) unstable; urgency=medium
+
+ * Fixed keyboard layout switch shortcut (Closes: #925346)
+
+ -- Alf Gaida <agaida@siduction.org> Sat, 23 Mar 2019 15:53:38 +0100
+
+lxqt-config (0.14.1-1) unstable; urgency=medium
+
+ * Cherry-picking new upstream version 0.14.1.
+ * Bumped build dependency liblxqt to 0.14.1~
+ * Extended the package description a bit
+
+ -- Alf Gaida <agaida@siduction.org> Sun, 24 Feb 2019 20:35:48 +0100
+
lxqt-config (0.14.1-0ubuntu1) disco; urgency=medium
* New upstream release.
@@ -5,6 +35,23 @@
-- Simon Quigley <tsimonq2@ubuntu.com> Sat, 09 Mar 2019 12:54:59 -0600
+lxqt-config (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~)
+ * Added build dependency libxi-dev
+ * Added build dependency xserver-xorg-input-libinput-dev
+ * Removed obsolete PULL_TRANSLATIONS= OFF from dh_auto_configure
+ * Added l10n-package, moved from lxqt-l10n
+ * Added d/upstream/metadata
+ * Fixed d/manpages
+ * Basic Touchpad configuration added upstream (Closes: #845624)
+
+ -- Alf Gaida <agaida@siduction.org> Sun, 27 Jan 2019 17:15:29 +0100
+
lxqt-config (0.14.0-0ubuntu1) disco; urgency=medium
* New upstream release.
@@ -37,6 +84,14 @@
-- Simon Quigley <tsimonq2@ubuntu.com> Sun, 30 Dec 2018 17:21:31 -0600
+lxqt-config (0.13.0-1) unstable; urgency=medium
+
+ * Cherry-picking new upstream version 0.13.0.
+ * Bumped build dependency liblxqt0-dev to >= 0.13.0~
+ * Added recommend xsettingsd
+
+ -- Alf Gaida <agaida@siduction.org> Thu, 24 May 2018 20:43:08 +0200
+
lxqt-config (0.13.0-0ubuntu5) cosmic; urgency=medium
* Set default GTK theme if rc file doesn't exists.
@@ -243,3 +298,4 @@
* Added README.source -- mention for License.
-- Yukiharu YABUKI <yyabuki@debian.org> Fri, 21 Aug 2015 19:40:47 +0900
+
diff -Nru lxqt-config-0.14.1/debian/control lxqt-config-0.14.1/debian/control
--- lxqt-config-0.14.1/debian/control 2019-03-09 18:54:46.000000000 +0000
+++ lxqt-config-0.14.1/debian/control 2020-01-27 22:02:19.000000000 +0000
@@ -7,7 +7,7 @@
Build-Depends: debhelper (>= 12),
libkf5screen-dev,
libkf5windowsystem-dev,
- liblxqt0-dev (>= 0.14.0),
+ liblxqt0-dev (>= 0.14.1~),
libqt5svg5-dev,
libqt5x11extras5-dev,
libx11-dev,
@@ -45,7 +45,8 @@
qt5-style-plugins,
synaptic
Description: LXQt system settings center
- The LXQt system settings center
+ The LXQt system settings center which summarizes all configuration tools as
+ well as counterparts of other LXQt components or third-party applications.
.
This package contain the LXQt configuration ui.
@@ -57,4 +58,7 @@
Breaks: lxqt-config (<< 0.11.0)
Replaces: lxqt-config (<< 0.11.0)
Description: Language package for lxqt-config
- This package contains the l10n files needed by lxqt-config.
+ The LXQt system settings center which summarizes all configuration tools as
+ well as counterparts of other LXQt components or third-party applications.
+ .
+ This package contains the l10n files needed by the lxqt-config.
diff -Nru lxqt-config-0.14.1/debian/patches/fix-keybord-layout-shortcut.patch lxqt-config-0.14.1/debian/patches/fix-keybord-layout-shortcut.patch
--- lxqt-config-0.14.1/debian/patches/fix-keybord-layout-shortcut.patch 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-config-0.14.1/debian/patches/fix-keybord-layout-shortcut.patch 2019-03-23 14:07:04.000000000 +0000
@@ -0,0 +1,32 @@
+From dfe9a2b27aab40262b9186672fad480a406d5c4a Mon Sep 17 00:00:00 2001
+From: Tsu Jan <tsujan2000@gmail.com>
+Date: Fri, 22 Mar 2019 19:55:32 +0430
+Subject: [PATCH] Fixed changing keyboard layout switch shortcut and model
+
+Fixes https://github.com/lxqt/lxqt-config/issues/445
+---
+ lxqt-config-input/keyboardlayoutconfig.cpp | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/lxqt-config-input/keyboardlayoutconfig.cpp b/lxqt-config-input/keyboardlayoutconfig.cpp
+index f5a7f24..bc6c369 100644
+--- a/lxqt-config-input/keyboardlayoutconfig.cpp
++++ b/lxqt-config-input/keyboardlayoutconfig.cpp
+@@ -40,8 +40,14 @@ KeyboardLayoutConfig::KeyboardLayoutConfig(LXQt::Settings* _settings, QWidget* p
+ connect(ui.removeLayout, &QAbstractButton::clicked, this, &KeyboardLayoutConfig::onRemoveLayout);
+ connect(ui.moveUp, &QAbstractButton::clicked, this, &KeyboardLayoutConfig::onMoveUp);
+ connect(ui.moveDown, &QAbstractButton::clicked, this, &KeyboardLayoutConfig::onMoveDown);
+- connect(ui.keyboardModel, QOverload<int>::of(&QComboBox::activated), this, &KeyboardLayoutConfig::settingsChanged);
+- connect(ui.switchKey, QOverload<int>::of(&QComboBox::activated), this, &KeyboardLayoutConfig::settingsChanged);
++ connect(ui.keyboardModel, QOverload<int>::of(&QComboBox::activated), [this](int /*index*/) {
++ applyConfig_ = true;
++ Q_EMIT settingsChanged();
++ });
++ connect(ui.switchKey, QOverload<int>::of(&QComboBox::activated), [this](int /*index*/) {
++ applyConfig_ = true;
++ Q_EMIT settingsChanged();
++ });
+ }
+
+ KeyboardLayoutConfig::~KeyboardLayoutConfig() {
+
diff -Nru lxqt-config-0.14.1/debian/patches/series lxqt-config-0.14.1/debian/patches/series
--- lxqt-config-0.14.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-config-0.14.1/debian/patches/series 2019-03-23 14:07:23.000000000 +0000
@@ -0,0 +1 @@
+fix-keybord-layout-shortcut.patch
diff -Nru lxqt-config-0.14.1/debian/rules lxqt-config-0.14.1/debian/rules
--- lxqt-config-0.14.1/debian/rules 2019-03-09 18:54:10.000000000 +0000
+++ lxqt-config-0.14.1/debian/rules 2020-01-27 21:59:47.000000000 +0000
@@ -5,14 +5,29 @@
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+include /usr/share/dpkg/architecture.mk
+
+ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
+ CONF_FLAGS += -DWITH_TOUCHPAD=NO
+endif
+
+ifeq ($(DEB_HOST_ARCH_OS), hurd)
+ CONF_FLAGS += -DWITH_TOUCHPAD=NO
+endif
+
+
%:
dh ${@} --buildsystem cmake
+override_dh_missing:
+ dh_missing --fail-missing
+
+override_dh_makeshlibs:
+ dh_makeshlibs -Xlxqt-config
+
override_dh_auto_configure:
dh_auto_configure -- \
-DPULL_TRANSLATIONS=OFF \
-DUPDATE_TRANSLATIONS=OFF \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
-
-override_dh_makeshlibs:
- dh_makeshlibs -Xlxqt-config
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ $(CONF_FLAGS)

Event Timeline

The_LoudSpeaker changed the title of this paste from untitled to Masterwork From Distant Lands.
The_LoudSpeaker changed the visibility from "All Users" to "Public (No Login Required)".Jan 30 2020, 3:51 PM