debian/changelog

@@ -1,77 +1,3 @@
-lxqt-runner (2.2.0-0ubuntu1) questing; urgency=medium
-
-  * New upstream release.
-    - Update build dependencies.
-  * Update copyright file.
-  * Update Standards-Version to 4.7.2, no changes needed.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 31 Jul 2025 15:42:09 -0500
-
-lxqt-runner (2.1.2-0ubuntu2) plucky; urgency=medium
-
-  * Update Standards-Version to 4.7.1, no changes needed.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 21 Feb 2025 16:38:18 -0600
-
-lxqt-runner (2.1.2-0ubuntu1) plucky; urgency=medium
-
-  * New upstream release.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 04 Feb 2025 15:25:10 -0600
-
-lxqt-runner (2.1.1-0ubuntu1) plucky; urgency=medium
-
-  * New upstream release.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 11 Jan 2025 16:55:28 -0600
-
-lxqt-runner (2.1.0-0ubuntu1) plucky; urgency=medium
-
-  * New upstream release.
-    - Bump build dependencies.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 15 Nov 2024 15:33:10 -0600
-
-lxqt-runner (2.0.0-0ubuntu1) oracular; urgency=medium
-
-  * New upstream release.
-  * Update copyright file.
-  * Bump Standards-Version to 4.7.0, no changes necessary.
-  * Adjust build dependencies.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 15 Aug 2024 16:29:58 -0500
-
-lxqt-runner (1.4.0-0ubuntu1) noble; urgency=medium
-
-  * New upstream release.
-  * Fix copyright file.
-  * Bump build dependency versions.
-
- -- Aaron Rainbolt <arraybolt3@gmail.com>  Mon, 13 Nov 2023 14:59:58 -0600
-
-lxqt-runner (1.3.0-0ubuntu1) mantic; urgency=medium
-
-  * New upstream release.
-  * Bump build dependencies.
-  * Remove redundant hardening rule.
-  * Bump Standards-Version to 4.6.2, no changes needed.
-  * I guess we don't require root to build, do we?
-  * Update copyright years.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 11 Aug 2023 12:50:19 -0500
-
-lxqt-runner (1.2.0-0ubuntu1) lunar; urgency=medium
-
-  * New upstream release.
-  * Fix the watch file, for real this time.
-  * Bump build dependencies in debian/control.
-  * Bump Standards-version to 4.6.1, no changes needed.
-  * Lubuntuify the package slightly, to make debhelper happy.
-  * Remove reverse-applicable upstream patches.
-  * Less Rs.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 18 Nov 2022 22:12:50 -0600
-
 lxqt-runner (1.1.0-0ubuntu2) kinetic; urgency=medium
 
   * Backport upstream patches:
@@ -398,3 +324,4 @@ lxqt-runner (0.9.0+20150831-1) experimental; urgency=medium
   * Adding upstream version 0.9.0.
 
  -- Alf Gaida <agaida@siduction.org>  Sun, 15 Feb 2015 18:41:53 +0100
+

debian/control

@@ -1,28 +1,25 @@
 Source: lxqt-runner
 Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
 Uploaders: Alf Gaida <agaida@siduction.org>,
            Andrew Lee (李健秋) <ajqlee@debian.org>,
            ChangZhuo Chen (陳昌倬) <czchen@debian.org>
 Section: x11
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
-               layer-shell-qt (>= 6.0.0),
+               libkf5windowsystem-dev,
-               libkf6windowsystem-dev (>= 6.0.0),
+               liblxqt-globalkeys-ui1-dev (>= 1.1.0),
-               liblayershellqtinterface-dev (>= 6.0.0),
+               liblxqt-globalkeys1-dev (>= 1.1.0),
-               liblxqt-globalkeys-ui2-dev (>= 2.2.0),
+               liblxqt1-dev (>= 1.1.0),
-               liblxqt-globalkeys2-dev (>= 2.2.0),
-               liblxqt2-dev (>= 2.2.0),
                libmuparser-dev,
-               libx11-dev,
+               libqt5svg5-dev,
-               qt6-svg-dev (>= 6.6.0),
+               libqt5x11extras5-dev,
-               qt6-wayland-dev (>= 6.6.0)
+               libx11-dev
-Standards-Version: 4.7.2
+Standards-Version: 4.5.1
-Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-runner-packaging
+Vcs-Browser: https://phab.lubuntu.me/source/lxqt-runner/
-Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-runner-packaging.git
+Vcs-Git: https://phab.lubuntu.me/source/lxqt-runner.git
-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-runner
+XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-runner
-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-runner.git
+XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-runner.git
-Rules-Requires-Root: no
 Homepage: https://github.com/lxqt/lxqt-runner
 
 Package: lxqt-runner
@@ -40,7 +37,7 @@ Package: lxqt-runner-l10n
 Architecture: all
 Multi-Arch: foreign
 Section: localization
-Depends: qt6-translations-l10n, ${misc:Depends}
+Depends: qttranslations5-l10n, ${misc:Depends}
 Description: Language package for lxqt-runner
  The LXQt runner provides a GUI that comes up on the desktop and allows for
  launching applications, doing some math or shutting down the system.

debian/copyright

@@ -3,19 +3,13 @@ Upstream-Name: lxqt-runner
 Source: https://github.com/lxqt/lxqt-runner
 
 Files: *
-Copyright: 2012-2025 LXQt team
+Copyright: 2012-2019, LXQt team
-           2010-2013 Razor team
+           2010-2013, Razor team
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2014-2019 Alf Gaida <agaida@siduction.org>
+Copyright: 2021,      Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-           2015      Andrew Lee <ajqlee@debian.org>
+           2014-2019, Alf Gaida <agaida@siduction.org>
-           2015      Shih-Yuan Lee (FourDollars) <fourdollars@gmail.com>
-           2015      ChangZhuo Chen <czchen@debian.org>
-           2021      apt-ghetto <apt-ghetto@protonmail.com>
-           2020-2021 Raman Sarda <theloudspeaker@lubuntu.me>
-           2018-2025 Simon Quigley <tsimonq2@ubuntu.com>
-           2023-2025 Aaron Rainbolt <arraybolt3@gmail.com>
 License: LGPL-2.1+
 
 License: LGPL-2.1+

debian/patches/221-1.patch

@@ -0,0 +1,52 @@
+From 703db225dfa722af66e330547a3353238e76ec38 Mon Sep 17 00:00:00 2001
+From: Palo Kisa <palo.kisa@gmail.com>
+Date: Wed, 27 Apr 2022 08:27:06 +0200
+Subject: [PATCH] dialog: Force correct position after move from outside
+
+..of application.
+
+For some reason the dialog gets repositioned by "outer world" (VM?) to
+wrong position (0,0). The root cause of this move is yet unknown and
+this is a workaround to avoid wong position of the window.
+---
+ dialog.cpp | 14 ++++++++++++++
+ dialog.h   |  1 +
+ 2 files changed, 15 insertions(+)
+
+diff --git a/dialog.cpp b/dialog.cpp
+index 7164c65..5667817 100644
+--- a/dialog.cpp
++++ b/dialog.cpp
+@@ -183,6 +183,20 @@ void Dialog::resizeEvent(QResizeEvent *event)
+ }
+ 
+ 
++/************************************************
++
++ ************************************************/
++void Dialog::moveEvent(QMoveEvent *event)
++{
++    // Note: For some reason the dialog gets repositioned by "outer world" (VM?) to
++    // wrong position (0,0). The root cause of this move is yet unknown and
++    // this is a workaround to avoid wong position of the window.
++    if (event->spontaneous())
++        QTimer::singleShot(0, this, &Dialog::realign);
++    return QDialog::moveEvent(event);
++}
++
++
+ /************************************************
+ 
+  ************************************************/
+diff --git a/dialog.h b/dialog.h
+index 0ca29bf..a71dd3d 100644
+--- a/dialog.h
++++ b/dialog.h
+@@ -64,6 +64,7 @@ class Dialog : public QDialog
+ protected:
+     void closeEvent(QCloseEvent *event);
+     void resizeEvent(QResizeEvent *event);
++    void moveEvent(QMoveEvent *event);
+     bool eventFilter(QObject *object, QEvent *event);
+     bool editKeyPressEvent(QKeyEvent *event);
+     bool listKeyPressEvent(QKeyEvent *event);

debian/patches/221-2.patch

@@ -0,0 +1,75 @@
+From 88a4d2fb49bc37794a14b7d86b90d515f472d372 Mon Sep 17 00:00:00 2001
+From: Palo Kisa <palo.kisa@gmail.com>
+Date: Wed, 27 Apr 2022 08:32:54 +0200
+Subject: [PATCH] dialog: Listen to KwindowSystem signals only when shown
+
+Most of the time the runner window is not shown and we don't need to be
+notified about all the focus/desktop changes.
+---
+ dialog.cpp | 25 ++++++++++++++++++++++---
+ dialog.h   |  2 ++
+ 2 files changed, 24 insertions(+), 3 deletions(-)
+
+diff --git a/dialog.cpp b/dialog.cpp
+index 5667817..0b9a0e9 100644
+--- a/dialog.cpp
++++ b/dialog.cpp
+@@ -133,8 +133,6 @@ Dialog::Dialog(QWidget *parent) :
+ 
+     connect(mGlobalShortcut, &GlobalKeyShortcut::Action::activated, this, &Dialog::showHide);
+     connect(mGlobalShortcut, &GlobalKeyShortcut::Action::shortcutChanged, this, &Dialog::shortcutChanged);
+-    connect(KWindowSystem::self(), &KWindowSystem::activeWindowChanged, this, &Dialog::onActiveWindowChanged);
+-    connect(KWindowSystem::self(), &KWindowSystem::currentDesktopChanged, this, &Dialog::onCurrentDesktopChanged);
+ 
+     resize(mSettings->value(QL1S("dialog/width"), 400).toInt(), size().height());
+ 
+@@ -197,6 +195,28 @@ void Dialog::moveEvent(QMoveEvent *event)
+ }
+ 
+ 
++/************************************************
++
++ ************************************************/
++void Dialog::showEvent(QShowEvent *event)
++{
++    connect(KWindowSystem::self(), &KWindowSystem::activeWindowChanged, this, &Dialog::onActiveWindowChanged);
++    connect(KWindowSystem::self(), &KWindowSystem::currentDesktopChanged, this, &Dialog::onCurrentDesktopChanged);
++    return QDialog::showEvent(event);
++}
++
++
++/************************************************
++
++ ************************************************/
++void Dialog::hideEvent(QHideEvent *event)
++{
++    QDialog::hideEvent(event);
++    disconnect(KWindowSystem::self(), &KWindowSystem::currentDesktopChanged, this, &Dialog::onCurrentDesktopChanged);
++    disconnect(KWindowSystem::self(), &KWindowSystem::activeWindowChanged, this, &Dialog::onActiveWindowChanged);
++}
++
++
+ /************************************************
+ 
+  ************************************************/
+@@ -397,7 +417,6 @@ void Dialog::applySettings()
+     mCommandItemModel->showHistoryFirst(mSettings->value(QL1S("dialog/history_first"), true).toBool());
+     ui->commandList->setShownCount(mSettings->value(QL1S("dialog/list_shown_items"), 4).toInt());
+ 
+-    realign();
+     mSettings->sync();
+ }
+ 
+diff --git a/dialog.h b/dialog.h
+index a71dd3d..8b7b36f 100644
+--- a/dialog.h
++++ b/dialog.h
+@@ -65,6 +65,8 @@ class Dialog : public QDialog
+     void closeEvent(QCloseEvent *event);
+     void resizeEvent(QResizeEvent *event);
+     void moveEvent(QMoveEvent *event);
++    void showEvent(QShowEvent *event);
++    void hideEvent(QHideEvent *event);
+     bool eventFilter(QObject *object, QEvent *event);
+     bool editKeyPressEvent(QKeyEvent *event);
+     bool listKeyPressEvent(QKeyEvent *event);

debian/patches/series

@@ -0,0 +1,2 @@
+221-1.patch
+221-2.patch

debian/rules

@@ -2,6 +2,7 @@
 # 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
 
 %:

debian/upstream/metadata

@@ -3,4 +3,4 @@ Bug-Database: https://github.com/lxqt/lxqt-runner/issues
 Bug-Submit: https://github.com/lxqt/lxqt-runner/issues/new
 Changelog: https://github.com/lxqt/lxqt-runner/blob/master/CHANGELOG
 Repository: https://github.com/lxqt/lxqt-runner
-Repository-Browse: https://github.com/lxqt/lxqt-runner
+Repository-Browser: https://github.com/lxqt/lxqt-runner

debian/watch

@@ -1,5 +1,3 @@
 version=4
-opts="searchmode=plain, \
+opts="pgpsigurlmangle=s/$/.asc/" \
-pgpsigurlmangle=s/$/.asc/, \
+https://github.com/lxqt/lxqt-runner/releases .*/lxqt-runner-([\d\.]+).tar.xz
-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