New upstream release.

debian/changelog

@@ -1,3 +1,62 @@
+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:
@@ -324,4 +383,3 @@ 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,25 +1,28 @@
 Source: lxqt-runner
 Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+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),
-               libkf5windowsystem-dev,
+               layer-shell-qt (>= 6.0.0),
-               liblxqt-globalkeys-ui1-dev (>= 1.1.0),
+               libkf6windowsystem-dev (>= 6.0.0),
-               liblxqt-globalkeys1-dev (>= 1.1.0),
+               liblayershellqtinterface-dev (>= 6.0.0),
-               liblxqt1-dev (>= 1.1.0),
+               liblxqt-globalkeys-ui2-dev (>= 2.1.0),
+               liblxqt-globalkeys2-dev (>= 2.1.0),
+               liblxqt2-dev (>= 2.1.0),
                libmuparser-dev,
-               libqt5svg5-dev,
+               libx11-dev,
-               libqt5x11extras5-dev,
+               qt6-svg-dev (>= 6.6.0),
-               libx11-dev
+               qt6-wayland-dev (>= 6.6.0)
-Standards-Version: 4.5.1
+Standards-Version: 4.7.0
-Vcs-Browser: https://phab.lubuntu.me/source/lxqt-runner/
+Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-runner-packaging
-Vcs-Git: https://phab.lubuntu.me/source/lxqt-runner.git
+Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-runner-packaging.git
-XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-runner
+Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-runner
-XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-runner.git
+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
@@ -37,7 +40,7 @@ Package: lxqt-runner-l10n
 Architecture: all
 Multi-Arch: foreign
 Section: localization
-Depends: qttranslations5-l10n, ${misc:Depends}
+Depends: qt6-translations-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,13 +3,19 @@ Upstream-Name: lxqt-runner
 Source: https://github.com/lxqt/lxqt-runner
 
 Files: *
-Copyright: 2012-2019, LXQt team
+Copyright: 2012-2024 LXQt team
-           2010-2013, Razor team
+           2010-2013 Razor team
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2021,      Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+Copyright: 2014-2019 Alf Gaida <agaida@siduction.org>
-           2014-2019, Alf Gaida <agaida@siduction.org>
+           2015      Andrew Lee <ajqlee@debian.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-2023 Simon Qugley <tsimonq2@ubuntu.com>
+           2023-2024 Aaron Rainbolt <arraybolt3@gmail.com>
 License: LGPL-2.1+
 
 License: LGPL-2.1+

debian/patches/221-1.patch

@@ -1,52 +0,0 @@
-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

@@ -1,75 +0,0 @@
-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

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

debian/rules

@@ -2,7 +2,6 @@
 # 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-Browser: https://github.com/lxqt/lxqt-runner
+Repository-Browse: https://github.com/lxqt/lxqt-runner

debian/upstream/signing-key.asc

@@ -1,5 +1,55 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
+mQINBFXQeMMBEACif4+9pTrC6uNmRng0ZbzLh7p3cazmbnp2YFgDQDJZ7ZNmebxy
+ngRuRhjGuDcFAL/37BwJnrBpfZFK9ljoH4Fo5Jm9cOELaTy7AIcEiV9dKMyrKF1E
+C76d8jHVuzuPbI92DkFdLZAdk+qjrrAy0x43PvUd+aaBGLcFs1ZMk7gOvElc2d95
+zWWSp5anjukmGbp+EsStnWJkF6VHj56qmklfYy5ioiVBOSpXo/RsACAcIlz8C8A1
+d4tNMiB2uF2OrUfrL8DD6m3nBqep+AYbIQrxMl9kUQH3I33e9kH/L+SHQyE6phS8
+Czq06WjV4TcJ9VWxm7hQCNLYSxhZYYr1AW45lS5+xmfBOq2qeLgvjbFxa8PPrsp6
+Bqgt8MjwUkXjU5IB7YulUBvFU2l0MJZWDBuNy0oNtCe1cU3JyIqLKjvzQQQ9eD5L
+o3Ul704TLHz0z+67Rxh05Mi4JvyFMjnooSJkNH8/7yXoBN0ZGOh1/5zMU1gK5bmP
+6hKgis2exSZNIS74mF6/PqGgcwk3PyI4T3keUQoNPj11M2EznLHxY19QZfQ5oMed
+8xOlHKjpcm8PYMB4gduNXlV7gI9h7UxuC5GuPiP2lmM6wUyHu48divxDk5UYgPEC
+xlPI2wHCNDsuy0EruCYIvrMSZfpYCCSrmXiOORBLO5qXkauILLkJarHqjQARAQAB
+tCBBbGYgR2FpZGEgPGFnYWlkYUBzaWR1Y3Rpb24ub3JnPokCOAQTAQIAIgUCVdB4
+wwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQQsnI069epeOT2xAAgSHf
+41103cnElGf6TokPl4J6hdRPy2CUAjmBtMfr8eajYvGDGgnmsh9AGYGURjfFVCCf
+Ag+8b6nF3xg03UmgsuSO8H78HGv9kKzF9aHmLt+SXq3jUX+LnIkFHErZWjFAKdJr
+luu1j6ltxLe9PQljxZnugzMaUbW8eEPKvcriiDn3S4/DtikW/jpGA0MTY4ZWs9pZ
+L/6iRRH99L2X/cWO4sCgDXCTt4oK0f5OvwiuCoVOM+PYoIm31JICCKOlqamkCn7d
+2KH3nsy0v7tXgnrnb/zr8jVGsZLzUE51AFOzb5Ec74/2SAq8X4gbTppttLXEIooq
+nbepitW/PePkPY5gpfwHtFbl88qFnir+ABMefqRZkzeh0tsxJVLVHGP1KZykXpv7
+96A6Q1h7Zo9Ny7WwN5Xl02g35LVCaPyzd3A8A4315uMuP3iziq57UktKqh9d5S3t
+jfK7e9UfFQZBLfxn2sNPsjdYSNUQp/PXTTk/599h359WVuUIR866T8K7N7EEon3p
+qLItZljQ9Nmr/yGwKi9iQgi2LtZj5KUcF1zBLzZKf95FvoqSZqBXdFSjm+eYGaCH
+Q2IBnhyP92lEknSK9ystUJXmY69tQKBFqJxScwaS+7a/rfLKssQjSWxqk+SX4QeW
+e9z9FUpo71bq0Zkc/M9aOCoEEmhg4Ob/JWy08oC5Ag0EVdB4wwEQAKZDCc/C41y0
+omLFCAJybvHiFScM+jOpyGpQvceoviEhIT7h1br/pnSEMkgPQEDPWJGtKueg1/94
+sXTH24uefr3Y6JdZoBtprxl4JXUoOndgq1QH1xuUsy3/9YWU8Qboy9j8a8w0oCDE
+T8Z03KHCwqzD3K+44jhmhF+0eLoaaY8ohS8ziP+DcFKVHyatmS5yCCdjVrj6PxMp
+uy/y5SXT1kmiPdVAIzQlM5DlN6o46TV+BH0pPvVYjtwf31o0FckJxy5S1v0koCNB
+vX2b7tTDPKzn8G18eUVhGoUTZBUCp1gg36wJ0YY4xgZ9vI/xDCeHeAkyvGtaTAoy
+qP4rHoUO5KVRSDh7frSlrdbLGWHaQwOhcqoKd4qP/164wHPGkgHL1vztdOc7l1wx
+q3gMh2uwmJR0NRrw4WVuaIqL9lEbGBNijlmGsuqXfsMRhc/qoqgVDWvrcCtEoOwl
+TONGobW3jpCCjpa9SeGNjxuY6IVLn0lfX4hItNVY9sFA+H+yj4uBQ7zsmMUXafxt
+Yllm0f98yGNg5lnJg4bLOYu3IkpogUKNA3qkZ+6vRtwH70/bJGp7qdx/3G4W5dMX
+asd/rJjdELW+R/NVULAmK1ETSklaa3Z6vbTu8bN8gvP8pmMJ8f/U8+qzkuAqc201
+Z4O+s7ZsQfTiz5mm7zPGIYTnppDSno/rABEBAAGJAh8EGAECAAkFAlXQeMMCGwwA
+CgkQQsnI069epeMt0g/+JrwLhULD6NOxaLgxboh/KZkh/7ViU4cB+QPT8JIcWxkZ
+zj8uk85TUitEUzKmjp/ItCrhQE5WNNWbz/FBnAuLtaQuHhcHMA3Vu95UUCGi1vyZ
+ZRlS3YRM6S9BOzrjG7fGQJmO/RU3g6rb0TAwGFxDHj8t4JEDTc3zASG7wV/VTn06
+d8XIH9CZOw3kUuhkQ3OR/PEj1BCeCC+caC+tBjO0fgvDp8RV7NFQQ9kH8R3/xlWd
+6KMPtILE6fUft6LubWRGd1P5JBuzXivELolASajewbYtL/s87CCji3ngq0aT9raK
+m02wqFzNbX1iv+w2iqPQXq6pdRyxtJ8+Q8Z7zEBGJS5nkrYjsLTduZIjJHYHYH7f
+3/ydVjQ3z12iqHKElgaRI7RUmpNiNxVIr+TtuxzeC6G+CF++XNkUtJODvCmRaoJS
+waYsitz8+LSv3tawZJ0iQkKc9nerQMuBD+AzIr3i4NgXiEIN513esUtnKzeyIIsL
+ntUcBjXKuLCj8OZrZtexjq7edWWbN57/3ikyS2Z7y0i3O30qk5jmccSaS6kA7xTY
+WCDFzbN2v2y+vGu9KYn+2HtrP2BtNa8JTh3waNeLUTpn4GV4mMrsZjOy6vhhHb91
+1TKfI1gvjk7lE9xaWmcDjdI55dw3jIq8kK9SdgORGq9/S3g7KJNRjme+6GjqQfk=
+=h7ww
+-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
 mQINBF6cxrwBEADfl3ydxNfLBbWGPesXty2baQgixZ3D6aCxadI2kX+aikmT8rd0
 ttDKN18cXV52Ssxnj0qhgf4hwnu/b0be6BzqSEyGM+UQR3X2CYpxrMakfW32Q18K
 X5ec0RPR2ucBq9G0r9t6FYC8FkJ4uQUU3xxrLW3z302S0Makjgzm8BV9WrFQ7oFF

debian/watch

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