Revert a sync from Debian.

This reverts commit 8777ec00c1.

debian/.gitignore

@@ -0,0 +1,10 @@
+/*.debhelper
+/*.log
+/*.substvars
+/debhelper-build-stamp
+/files
+
+/lxqt-admin/
+/lxqt-admin-dbg/
+/lxqt-admin-qt5/
+/lxqt-admin-qt5-dbg/

debian/changelog

@@ -1,25 +1,17 @@
-lxqt-admin (1.2.0-1) unstable; urgency=medium
+lxqt-admin (1.2.0-1ubuntu1) lunar; urgency=medium
 
-  * New upstream release.
-
- -- ChangZhuo Chen (陳昌倬) <czchen@debian.org>  Wed, 14 Dec 2022 23:23:59 +0800
-
-lxqt-admin (1.1.0-3) unstable; urgency=medium
-
-  * Fix Build-Depends.
-  * Change Depends/Recommends indent.
-  * Sort copyright.
-  * Add Repository-Browse to upstream metadata.
-  * Use LF in signing-key.asc.
-  * Workaround d/watch for github.
+  * Revert a sync from Debian.
 
- -- ChangZhuo Chen (陳昌倬) <czchen@debian.org>  Sun, 20 Nov 2022 23:04:48 +0800
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Sun, 12 Feb 2023 20:24:28 -0600
 
-lxqt-admin (1.1.0-2) unstable; urgency=medium
+lxqt-admin (1.2.0-0ubuntu1) lunar; urgency=medium
 
-  * Merge to unstable.
+  * New upstream version.
+  * 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 00:56:33 +0800
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 17 Nov 2022 22:12:20 -0600
 
 lxqt-admin (1.1.0-1) experimental; urgency=medium
 
@@ -35,13 +27,6 @@ lxqt-admin (1.1.0-1) experimental; urgency=medium
 
  -- Aaron Rainbolt <arraybolt3@gmail.com>  Tue, 12 Jul 2022 16:16:35 -0500
 
-lxqt-admin (1.0.0-1) unstable; urgency=medium
-
-  * New upstream release
-  * Bumped Standards-Version to 4.6.0, no changes needed
-
- -- S. 7 <severusseptimius7@gmail.com>  Thu, 25 Nov 2021 18:19:55 +0200
-
 lxqt-admin (0.16.0-1) unstable; urgency=medium
 
   [ Alf Gaida ]

debian/control

@@ -1,5 +1,6 @@
 Source: lxqt-admin
-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,25 +10,24 @@ Section: x11
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
                libkf5windowsystem-dev,
-               liblxqt1-dev (>= 1.2.0~),
+               liblxqt1-dev (>= 1.2.0),
                libpolkit-qt5-1-dev,
                libqt5svg5-dev,
                libqt5x11extras5-dev,
                libsystemd-dev,
                libx11-dev
 Standards-Version: 4.6.1
-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-admin
-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-admin.git
+Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-admin-packaging
+Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-admin-packaging.git
+XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-admin
+XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-admin.git
 Homepage: https://github.com/lxqt/lxqt-admin
 Rules-Requires-Root: no
 
 Package: lxqt-admin
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Recommends: lxqt-admin-l10n,
-            lxqt-policykit,
-            lxqt-qtplugin,
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: lxqt-admin-l10n, lxqt-policykit, lxqt-qtplugin
 Description: Admin tools for LXQt
  Admin tools for LXQt, as of now:
   * lxqt-admin-time
@@ -39,8 +39,7 @@ Package: lxqt-admin-l10n
 Architecture: all
 Multi-Arch: foreign
 Section: localization
-Depends: ${misc:Depends},
-         qttranslations5-l10n,
+Depends: qttranslations5-l10n, ${misc:Depends}
 Description: Language package for lxqt-admin
  The l10n files for lxqt-admin.
  .

debian/copyright

@@ -8,9 +8,9 @@ Copyright: 2014-2022 LXQt team
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2014-2019 Alf Gaida <agaida@siduction.org>
-           2015      Andrew Lee (李健秋) <ajqlee@debian.org>
-           2021-2022 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+Copyright: 2021-2022, Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+           2014-2019, Alf Gaida <agaida@siduction.org>
+           2015,      Andrew Lee (李健秋) <ajqlee@debian.org>
 License: LGPL-2.1+
 
 License: LGPL-2.1+

debian/upstream/metadata

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

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\/(.*)\.tar\.gz/releases\/download\/$1\/@PACKAGE@-$1\.tar\.xz/,filenamemangle=s/([\d\.]+)\.tar\.gz/@PACKAGE@-$1\.tar\.xz/,pgpsigurlmangle=s/$/.asc/" \
-https://github.com/lxqt/@PACKAGE@/tags .*/([\d\.]+)\.tar\.gz
+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