Upload to Plucky

This reverts commit 3f6e60c63f.

debian/changelog

@@ -1,20 +1,132 @@
-lxqt-sudo (0.13.0-0ubuntu2) cosmic; urgency=medium
+lxqt-sudo (2.1.0-0ubuntu1) plucky; urgency=medium
 
-  * Change Uploaders to Ubuntu uploaders.
-  * Bump Standards-version to 4.2.0, no changes needed.
-  * Run wrap-and-sort.
-  * Fix the layout and line break so text isn't cut off.
+  * New upstream version.
+    - Bump build dependencies.
 
- -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 20 Aug 2018 23:47:43 -0500
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 15 Nov 2024 15:33:17 -0600
 
-lxqt-sudo (0.13.0-0ubuntu1) cosmic; urgency=medium
+lxqt-sudo (2.0.0-0ubuntu2) plucky; urgency=medium
+
+  * Update the patch to pass through env vars.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 16 Oct 2024 17:09:37 -0500
+
+lxqt-sudo (2.0.0-0ubuntu1) oracular; urgency=medium
+
+  * New upstream release.
+  * Update copyright file.
+  * Drop enable-bidirectional-communication.patch, applied upstream.
+  * Bump Standards-Version to 4.7.0, no changes necessary.
+  * Adjust dependencies.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 15 Aug 2024 16:43:15 -0500
+
+lxqt-sudo (1.4.0-0ubuntu2) noble; urgency=medium
+
+  * Patch in bidirectional communication support (see
+    https://github.com/lxqt/lxqt-sudo/pull/210)
+  * Updated copyright file.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 11 Jan 2024 19:26:41 +0000
+
+lxqt-sudo (1.4.0-0ubuntu1) noble; urgency=medium
 
   * New upstream release.
-  * Update Vcs-* and Maintainer to Lubuntu values.
-  * Update build dependencies.
-  * Update copyright.
+  * Bump build dependencies.
+  * Update copyright years.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sun, 12 Nov 2023 19:13:47 -0600
+
+lxqt-sudo (1.3.0-0ubuntu1.1) mantic; urgency=medium
+
+  * Add a -E option, exposing all environment variables (LP: #2039093).
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 11 Oct 2023 12:02:21 -0500
+
+lxqt-sudo (1.3.0-0ubuntu1) mantic; urgency=medium
+
+  * New upstream release.
+  * Bump build dependencies.
+  * Install new lxqtdoas binary.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 11 Aug 2023 09:51:31 -0500
+
+lxqt-sudo (1.2.0-1ubuntu1) lunar; urgency=medium
+
+  * Reverted a sync from Debian.
+  * Bumped Standards-Version to 4.6.2, no changes necessary.
+  * Removed obsolete 'override_dh_missing' section from debian/rules.
+  * Updated copyright file.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 16 Feb 2023 20:20:33 -0600
+
+lxqt-sudo (1.2.0-0ubuntu1) lunar; urgency=medium
+
+  * New upstream release.
+  * Fix the watch file, for real this time.
+  * Lubuntuify the package slightly, to make debhelper happy.
+  * Bump build dependencies in debian/control.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 18 Nov 2022 18:51:41 -0600
+
+lxqt-sudo (1.1.0-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Removed trailing whitespace from changelog.
+  * Ran wrap-and-sort.
+  * Upstreamed packaging changes from Ubuntu, modifying the following files:
+    - control
+    - copyright
+    - rules
+    - upstream/*
+
+ -- Aaron Rainbolt <arraybolt3@gmail.com>  Wed, 13 Jul 2022 19:57:33 -0500
+
+lxqt-sudo (0.16.0-1) unstable; urgency=medium
+
+  [ Alf Gaida ]
+  * Switched to gbp
+  * Bumped Standards-Version to 4.4.0, no changes needed
+
+  [ Andrew Lee (李健秋) ]
+  * New upstream release. (Closes: #978214)
+
+ -- Andrew Lee (李健秋) <ajqlee@debian.org>  Wed, 06 Jan 2021 18:17:56 +0800
+
+lxqt-sudo (0.14.1-2) unstable; urgency=medium
+
+  * Set HOME right, don't strip TERM (Closes: #928941)
+
+ -- Alf Gaida <agaida@siduction.org>  Mon, 13 May 2019 19:56:39 +0200
+
+lxqt-sudo (0.14.1-1) unstable; urgency=medium
+
+  * Cherry-picking new upstream version 0.14.1.
+  * Bumped minimum version liblxqt0-dev (>= 0.14.1~)
+  * Extended package description a bit
+
+ -- Alf Gaida <agaida@siduction.org>  Sun, 24 Feb 2019 22:25:49 +0100
+
+lxqt-sudo (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 l10n-package, moved from lxqt-l10n
+  * Added d/upstream/metadata
+
+ -- Alf Gaida <agaida@siduction.org>  Sun, 27 Jan 2019 19:32:15 +0100
+
+lxqt-sudo (0.13.0-1) unstable; urgency=medium
+
+  * Cherry-picking new upstream version 0.13.0.
+  * Bumped build dependency liblxqt0-dev to >= 0.13.0~
+  * Bumped year in copyright
 
- -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 22 May 2018 23:52:43 -0500
+ -- Alf Gaida <agaida@siduction.org>  Fri, 25 May 2018 00:02:41 +0200
 
 lxqt-sudo (0.12.0-4) unstable; urgency=medium
 

debian/compat

@@ -1 +0,0 @@
-11

debian/control

@@ -1,21 +1,25 @@
 Source: lxqt-sudo
 Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
-Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
+Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+Uploaders: Alf Gaida <agaida@siduction.org>,
+           ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
+           Andrew Lee (李健秋) <ajqlee@debian.org>,
+           Simon Quigley <tsimonq2@debian.org>,
+           Aaron Rainbolt <arraybolt3@gmail.com>
 Section: x11
 Priority: optional
-Build-Depends: debhelper (>= 11),
-               libkf5windowsystem-dev,
-               liblxqt0-dev (>= 0.13.0),
-               libqt5svg5-dev,
-               libqt5x11extras5-dev,
-               libx11-dev
-Standards-Version: 4.2.0
-Vcs-Browser: https://phab.lubuntu.me/source/lxqt-sudo/
-Vcs-Git: https://phab.lubuntu.me/source/lxqt-sudo.git
-XS-Debian-Vcs-Browser: https://salsa.debian.org/cgit/pkg-team/lxqt-sudo
-XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-sudo.git
+Build-Depends: debhelper-compat (= 13),
+               libkf6windowsystem-dev,
+               liblxqt2-dev (>= 2.1.0),
+               libx11-dev,
+               qt6-svg-dev (>= 6.6.0)
+Standards-Version: 4.7.0
+Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-sudo-packaging
+Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-sudo-packaging.git
+Debian-Vcs-Browser: https://salsa.debian.org/cgit/pkg-team/lxqt-sudo
+Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-sudo.git
 Homepage: https://github.com/lxqt/lxqt-sudo
+Rules-Requires-Root: no
 
 Package: lxqt-sudo
 Architecture: any
@@ -27,3 +31,13 @@ Description: Graphical Qt frontend for plain sudo
  process with requested command (and arguments). If sudo requests user's
  password, the GUI password dialog is shown and (after submit) the password is
  provided to sudo.
+
+Package: lxqt-sudo-l10n
+Architecture: all
+Multi-Arch: foreign
+Section: localization
+Depends: qt6-translations-l10n, ${misc:Depends}
+Description: Language package for lxqt-sudo
+ The l10n files for lxqt-sudo.
+ .
+ This package contains the l10n files needed by lxqt-sudo.

debian/copyright

@@ -3,13 +3,15 @@ Upstream-Name: lxqt-sudo
 Source: https://github.com/lxqt/lxqt-sudo
 
 Files: *
-Copyright: 2015-2018 LXQt team
+Copyright: 2015-2024 LXQt team
+           2015-2018 Palo Kisa <palo.kisa@gmail.com>
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2015-2018 Alf Gaida <agaida@siduction.org>
-           2015 Andrew Lee (李健秋) <ajqlee@debian.org>
-           2015 ChangZhuo Chen (陳昌倬) <czchen@debian.org>
+Copyright: 2021-2024 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+           2015-2019 Alf Gaida <agaida@siduction.org>
+                2015 Andrew Lee (李健秋) <ajqlee@debian.org>
+                2015 ChangZhuo Chen (陳昌倬) <czchen@debian.org>
 License: LGPL-2.1+
 
 License: LGPL-2.1+

debian/gbp.conf

@@ -0,0 +1,6 @@
+[DEFAULT]
+debian-branch = debian/sid
+upstream-branch = upstream/latest
+pristine-tar = True
+compression = xz
+

debian/lxqt-sudo-l10n.install

@@ -0,0 +1 @@
+usr/share/lxqt/translations/lxqt-sudo

debian/lxqt-sudo.install

@@ -0,0 +1,8 @@
+usr/bin/lxdoas
+usr/bin/lxqt-sudo
+usr/bin/lxsu
+usr/bin/lxsudo
+usr/share/man/man1/lxdoas.1
+usr/share/man/man1/lxqt-sudo.1
+usr/share/man/man1/lxsu.1
+usr/share/man/man1/lxsudo.1

debian/patches/bypass-envvar-allowlist.patch

@@ -0,0 +1,82 @@
+Description: Add a -E option, exposing all environment variables
+ Some system tools (such as ubuntu-release-upgrader) read XDG* (etc.), so allow the user to opt-in to preserving those.
+Author: Simon Quigley <tsimonq2@lubuntu.me>
+Origin: upstream
+Forwarded: https://github.com/lxqt/lxqt-sudo/pull/204
+Last-Update: 2023-10-11
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/sudo.cpp
++++ b/sudo.cpp
+@@ -84,6 +84,7 @@ namespace
+                     "    -s|--su        Use %3(1) as backend.\n"
+                     "    -d|--sudo      Use %2(8) as backend.\n"
+                     "    -a|--doas      Use %4(1) as backend.\n"
++                    "    -E|--keep-env  Preserve all existing environment variables.\n"
+                     "  command          Command to run.\n"
+                     "  arguments        Optional arguments for command.\n\n").arg(app_master).arg(sudo_prog).arg(su_prog).arg(doas_prog);
+         if (!err.isEmpty())
+@@ -114,8 +115,13 @@ namespace
+     };
+     assert_helper h;
+ 
+-    inline std::string env_workarounds()
++    inline std::string env_workarounds(bool preserveEnv)
+     {
++        if (preserveEnv) {
++            std::cerr << LXQTSUDO << ": Preserving all environment variables.\n";
++            return "";
++        }
++
+         std::cerr << LXQTSUDO << ": Stripping child environment except for: ";
+         std::ostringstream left_env_params;
+         std::copy(ALLOWED_VARS, ALLOWED_END - 1, std::ostream_iterator<const char *>{left_env_params, ","});
+@@ -196,6 +202,10 @@ int Sudo::main()
+         {
+             mBackend = BACK_DOAS;
+             mArgs.removeAt(0);
++        } else if (QStringLiteral("-E") == arg1 || QStringLiteral("--keep-env") == arg1)
++        {
++            mPreserveEnv = true;
++            mArgs.removeAt(0);
+         }
+     }
+     //any other arguments we simply forward to su/sudo
+@@ -287,11 +297,13 @@ void Sudo::child()
+     switch (mBackend)
+     {
+         case BACK_SUDO:
+-            preserve_env_param = "--preserve-env=";
+-
+-            preserve_env_param += env_workarounds();
+-
+-            *(param_arg++) = preserve_env_param.c_str(); //preserve environment
++            if(!mPreserveEnv) {
++                preserve_env_param = "--preserve-env=";
++                preserve_env_param += env_workarounds(mPreserveEnv);
++            } else {
++                preserve_env_param = "--preserve-env";
++            }
++            *(param_arg++) = preserve_env_param.c_str();
+             *(param_arg++) = "/bin/sh";
+             break;
+         case BACK_DOAS:
+@@ -299,7 +311,7 @@ void Sudo::child()
+             [[fallthrough]];
+         case BACK_SU:
+         case BACK_NONE:
+-            env_workarounds();
++            env_workarounds(mPreserveEnv);
+             break;
+ 
+     }
+--- a/sudo.h
++++ b/sudo.h
+@@ -81,6 +81,7 @@ private:
+     int mChildPid;
+     int mPwdFd;
+     int mRet;
++    bool mPreserveEnv = false;
+ };
+ 
+ #endif //SUDO_H

debian/patches/fix-layout-line-break.patch

@@ -1,46 +0,0 @@
-Description: Fix the layout and line break
- In some cases, text was being cut off from the prompt and was not visible.
-Author: Tsu Jan <tsujan2000@gmail.com>
-Origin: upstream
-Bug: https://github.com/lxqt/lxqt/issues/1505
-Applied-Upstream: commit:01c23a5
-Last-Update: 2018-08-20
---- a/passworddialog.cpp
-+++ b/passworddialog.cpp
-@@ -41,7 +41,7 @@ PasswordDialog::PasswordDialog(QStringLi
-     QString cmd;
-     if (0 < argv.size())
-         cmd = argv[0];
--    ui->descriptionL->setText(tr("<b>%1</b> needs administrative privileges.\nPlease enter your password.").arg(cmd));
-+    ui->descriptionL->setText(tr("<b>%1</b> needs administrative privileges.<br>Please enter your password.").arg(cmd));
-     ui->iconL->setPixmap(QIcon::fromTheme("dialog-password").pixmap(64, 64));
-     setWindowIcon(QIcon::fromTheme("security-high"));
- }
---- a/passworddialog.ui
-+++ b/passworddialog.ui
-@@ -10,12 +10,6 @@
-     <height>200</height>
-    </rect>
-   </property>
--  <property name="sizePolicy">
--   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
--    <horstretch>0</horstretch>
--    <verstretch>0</verstretch>
--   </sizepolicy>
--  </property>
-   <property name="windowTitle">
-    <string>LXQt sudo</string>
-   </property>
-@@ -31,6 +25,12 @@
-      </item>
-      <item row="0" column="1" alignment="Qt::AlignVCenter">
-       <widget class="QLabel" name="descriptionL">
-+       <property name="sizePolicy">
-+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-+         <horstretch>0</horstretch>
-+         <verstretch>0</verstretch>
-+        </sizepolicy>
-+       </property>
-        <property name="text">
-         <string/>
-        </property>

debian/patches/series

@@ -1 +1 @@
-fix-layout-line-break.patch
+bypass-envvar-allowlist.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
 
 %:
@@ -10,6 +9,5 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		-DPULL_TRANSLATIONS=OFF \
 		-DUPDATE_TRANSLATIONS=OFF \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo

debian/salsa-ci.yml

@@ -0,0 +1,12 @@
+# For more information on what jobs are run see:
+# https://salsa.debian.org/salsa-ci-team/pipeline
+#
+# To enable the jobs, go to your repository (at salsa.debian.org)
+# and click over Settings > CI/CD > Expand (in General pipelines).
+# In "Custom CI config path" write debian/salsa-ci.yml and click
+# in "Save Changes". The CI tests will run after the next commit.
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+

debian/upstream/metadata

@@ -0,0 +1,5 @@
+Name: lxqt-sudo
+Bug-Database: https://github.com/lxqt/lxqt-sudo/issues
+Bug-Submit: https://github.com/lxqt/lxqt-sudo/issues/new
+Changelog: https://github.com/lxqt/lxqt-sudo/blob/master/CHANGELOG
+Repository: https://github.com/lxqt/lxqt-sudo

debian/upstream/signing-key.asc

@@ -1,50 +1,52 @@
------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
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+sw==
+=gSIv
 -----END PGP PUBLIC KEY BLOCK-----

debian/watch

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