Revert a sync from Debian.

This reverts commit 3f6e60c63f.

debian/.gitignore

@@ -0,0 +1,6 @@
+/*.debhelper
+/*.log
+/*.substvars
+/files
+
+/lxqt-sudo/

debian/changelog

@@ -1,17 +1,17 @@
-lxqt-sudo (1.2.0-1) unstable; urgency=medium
+lxqt-sudo (1.2.0-1ubuntu1) lunar; urgency=medium
 
-  * New upstream release.
-  * Sort Depends in d/control.
-  * Sort d/copyright.
-  * Update d/watch for GitHub.
+  * Reverted a sync from Debian.
 
- -- ChangZhuo Chen (陳昌倬) <czchen@debian.org>  Sat, 17 Dec 2022 23:58:51 +0800
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 16 Feb 2023 20:20:33 -0600
 
-lxqt-sudo (1.1.0-2) unstable; urgency=medium
+lxqt-sudo (1.2.0-0ubuntu1) lunar; urgency=medium
 
-  * Merge to unstable.
+  * 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.
 
- -- ChangZhuo Chen (陳昌倬) <czchen@debian.org>  Sat, 19 Nov 2022 09:32:56 +0800
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 18 Nov 2022 18:51:41 -0600
 
 lxqt-sudo (1.1.0-1) experimental; urgency=medium
 
@@ -26,14 +26,6 @@ lxqt-sudo (1.1.0-1) experimental; urgency=medium
 
  -- Aaron Rainbolt <arraybolt3@gmail.com>  Wed, 13 Jul 2022 19:57:33 -0500
 
-lxqt-sudo (1.0.0-1) unstable; urgency=medium
-
-  * New upstream release
-  * Bumped Standards-Version to 4.6.0, no changes needed
-  * Update debian/copyright
-
- -- S. 7 <severusseptimius7@gmail.com>  Thu, 25 Nov 2021 18:19:55 +0200
-
 lxqt-sudo (0.16.0-1) unstable; urgency=medium
 
   [ Alf Gaida ]

debian/control

@@ -1,5 +1,6 @@
 Source: lxqt-sudo
-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+XSBC-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>,
@@ -9,22 +10,22 @@ Section: x11
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
                libkf5windowsystem-dev,
-               liblxqt1-dev (>= 1.2.0~),
+               liblxqt1-dev (>= 1.2.0),
                libqt5svg5-dev,
                libqt5x11extras5-dev,
                libx11-dev
 Standards-Version: 4.6.1
-Vcs-Browser: https://salsa.debian.org/cgit/pkg-team/lxqt-sudo
-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-sudo.git
+Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-sudo-packaging
+Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-sudo-packaging.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
 Homepage: https://github.com/lxqt/lxqt-sudo
 Rules-Requires-Root: no
 
 Package: lxqt-sudo
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
-Recommends: lxqt-sudo-l10n,
-            lxqt-qtplugin
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: lxqt-qtplugin, lxqt-sudo-l10n
 Description: Graphical Qt frontend for plain sudo
  lxqt-sudo is a graphical Qt frontend for plain sudo(8) (for requesting
  optional password in GUI fashion). When invoked it simply spawns child sudo
@@ -36,8 +37,7 @@ Package: lxqt-sudo-l10n
 Architecture: all
 Multi-Arch: foreign
 Section: localization
-Depends: ${misc:Depends},
-         qttranslations5-l10n
+Depends: qttranslations5-l10n, ${misc:Depends}
 Description: Language package for lxqt-sudo
  The l10n files for lxqt-sudo.
  .

debian/copyright

@@ -7,10 +7,10 @@ Copyright: 2015-2022 LXQt team
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2015-2019 Alf Gaida <agaida@siduction.org>
-           2015      Andrew Lee (李健秋) <ajqlee@debian.org>
-           2015-2022 ChangZhuo Chen (陳昌倬) <czchen@debian.org>
-           2021-2022 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+Copyright: 2021-2022, 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/watch

@@ -1,6 +1,5 @@
 version=4
-
-# See https://davesteele.github.io/development/2015/05/02/debian-watch-file-format-for-signed-github-source-tars/ for GitHub workaround for releases page.
-
-opts="downloadurlmangle=s/archive\/refs\/tags\/@ANY_VERSION@@ARCHIVE_EXT@/releases\/download\/$1\/@PACKAGE@-$1\.tar\.xz/,filenamemangle=s/@ANY_VERSION@@ARCHIVE_EXT@/@PACKAGE@-$1\.tar\.xz/,pgpsigurlmangle=s/$/.asc/" \
-https://github.com/lxqt/@PACKAGE@/tags .*/@ANY_VERSION@@ARCHIVE_EXT@
+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