Sync with Debian version 1.1.0-1.

debian/changelog

@@ -1,30 +1,16 @@
-lxqt-admin (1.1.0-0ubuntu1) kinetic; urgency=medium
+lxqt-admin (1.1.0-1) experimental; urgency=medium
 
   * New upstream release.
-  * Bump liblxqt build dependency.
-  * Remove old Breaks/Replaces since we're past the LTS.
+  * Upstreamed compatible changes from Ubuntu, modifying the following files:
+    - control
+    - copyright
+    - docs
+    - lintian-overrides
+    - lxqt-admin-l10n.install
+    - rules
+    - upstream/*
 
- -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 01 Jun 2022 14:38:15 -0500
-
-lxqt-admin (0.17.0-0ubuntu1) impish; urgency=medium
-
-  * New upstream release 0.17.0
-  * Update debian/control
-    - Bump Standards-Version to 4.5.1
-    - Use liblxqt0-dev 0.17.0
-    - Extend lxqt-admin-l10n package description
-    - Add build-dep libsystemd-dev
-  * Rename tag for lintian override
-  * Update debian/copyright
-
- -- apt-ghetto <apt-ghetto@protonmail.com>  Tue, 17 Aug 2021 16:08:02 +0200
-
-lxqt-admin (0.16.0-1ubuntu1) hirsute; urgency=medium
-
-  * New upstream version.
-  * Bump debhelper-compat requirement to 13.
-
- -- Raman Sarda <theloudspeaker@disroot.org>  Sun, 21 Feb 2021 22:31:25 +0530
+ -- Aaron Rainbolt <arraybolt3@gmail.com>  Tue, 12 Jul 2022 16:16:35 -0500
 
 lxqt-admin (0.16.0-1) unstable; urgency=medium
 
@@ -37,23 +23,6 @@ lxqt-admin (0.16.0-1) unstable; urgency=medium
 
  -- Andrew Lee (李健秋) <ajqlee@debian.org>  Thu, 07 Jan 2021 16:39:02 +0800
 
-lxqt-admin (0.15.0-0ubuntu1) groovy; urgency=medium
-
-  * New upstream release.
-    - Update upstream signing key.
-    - Update LXQt build dependencies.
-  * Update Standards-version to 4.5.0, no changes needed.
-  * Run wrap-and-sort.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 04 Jun 2020 00:38:52 -0500
-
-lxqt-admin (0.14.1-1ubuntu1) focal; urgency=low
-
-  * Merge from Debian unstable.  Remaining changes:
-    - Updated Build depends for liblxqt0-dev. (liblxqt0-dev (>= 0.14.1~)
-
- -- Raman Sarda <theloudspeaker@lubuntu.me>  Tue, 28 Jan 2020 03:03:34 +0530
-
 lxqt-admin (0.14.1-1) unstable; urgency=medium
 
   * Cherry-picking new upstream version 0.14.1.
@@ -61,12 +30,6 @@ lxqt-admin (0.14.1-1) unstable; urgency=medium
 
  -- Alf Gaida <agaida@siduction.org>  Tue, 26 Feb 2019 01:44:09 +0100
 
-lxqt-admin (0.14.1-0ubuntu1) disco; urgency=medium
-
-  * New upstream release.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 09 Mar 2019 12:52:01 -0600
-
 lxqt-admin (0.14.0-1) unstable; urgency=medium
 
   * Cherry-picking new upstream version 0.14.0.
@@ -81,16 +44,6 @@ lxqt-admin (0.14.0-1) unstable; urgency=medium
 
  -- Alf Gaida <agaida@siduction.org>  Sun, 27 Jan 2019 16:17:25 +0100
 
-lxqt-admin (0.14.0-0ubuntu1) disco; urgency=medium
-
-  * New upstream release.
-    - Bump build dependencies.
-  * Bump Standards-version to 4.3.0, no changes needed.
-  * Bump debhelper compat to 12, no changes needed.
-  * Add a new lxqt-admin-l10n package.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 25 Jan 2019 23:59:31 -0600
-
 lxqt-admin (0.13.0-2) unstable; urgency=medium
 
   * Fixed language in desktop file (ported back from upstream)
@@ -105,16 +58,6 @@ lxqt-admin (0.13.0-1) unstable; urgency=medium
 
  -- Alf Gaida <agaida@siduction.org>  Thu, 24 May 2018 20:30:33 +0200
 
-lxqt-admin (0.13.0-0ubuntu1) cosmic; urgency=medium
-
-  * New upstream release.
-  * Update Vcs-* and Maintainer to Lubuntu values.
-  * Update build dependencies.
-  * Run wrap-and-sort.
-  * Add missing build dependency on libpolkit-qt5-1-dev.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 22 May 2018 23:16:59 -0500
-
 lxqt-admin (0.12.0-5) unstable; urgency=medium
 
   * Bumped compat to 11
@@ -259,4 +202,3 @@ lxqt-admin (0.9.0+20150807-1) unstable; urgency=medium
   * Remove useless whitespaces and warp long lines.
 
  -- Andrew Lee (李健秋) <ajqlee@debian.org>  Sat, 15 Aug 2015 01:49:08 +0800
-

debian/control

@@ -1,9 +1,10 @@
 Source: lxqt-admin
-Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+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>
+           Andrew Lee (李健秋) <ajqlee@debian.org>,
+           Simon Quigley <tsimonq2@debian.org>,
+           Aaron Rainbolt <arraybolt3@gmail.com>
 Section: x11
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
@@ -14,12 +15,11 @@ Build-Depends: debhelper-compat (= 13),
                libqt5x11extras5-dev,
                libsystemd-dev,
                libx11-dev
-Standards-Version: 4.5.1
-Vcs-Browser: https://phab.lubuntu.me/source/lxqt-admin/
-Vcs-Git: https://phab.lubuntu.me/source/lxqt-admin.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
+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
 Homepage: https://github.com/lxqt/lxqt-admin
+Rules-Requires-Root: no
 
 Package: lxqt-admin
 Architecture: any

debian/copyright

@@ -3,12 +3,12 @@ Upstream-Name: lxqt-admin
 Source: https://github.com/lxqt/lxqt-admin
 
 Files: *
-Copyright: 2014-2019 LXQt team
+Copyright: 2014-2022 LXQt team
            2014 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2021,      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+

debian/lintian-overrides

@@ -1,8 +1,8 @@
 # there will be no manual for a foreseable time
-lxqt-admin: no-manual-page usr/bin/lxqt-admin-time
-lxqt-admin: no-manual-page usr/bin/lxqt-admin-user
-lxqt-admin: no-manual-page usr/bin/lxqt-admin-user-helper
+lxqt-admin: no-manual-page [usr/bin/lxqt-admin-time]
+lxqt-admin: no-manual-page [usr/bin/lxqt-admin-user]
+lxqt-admin: no-manual-page [usr/bin/lxqt-admin-user-helper]
 
 # the category is right, but not in freedesktop right now
-lxqt-admin: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-admin-time.desktop
-lxqt-admin: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-admin-user.desktop
+lxqt-admin: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-admin-time.desktop]
+lxqt-admin: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-admin-user.desktop]

debian/lxqt-admin.install

@@ -1,6 +1,6 @@
+usr/share/applications/lxqt-admin-user.desktop
+usr/share/applications/lxqt-admin-time.desktop
+usr/share/polkit-1/actions/org.lxqt.lxqt-admin-user.policy
 usr/bin/lxqt-admin-time
 usr/bin/lxqt-admin-user
 usr/bin/lxqt-admin-user-helper
-usr/share/applications/lxqt-admin-time.desktop
-usr/share/applications/lxqt-admin-user.desktop
-usr/share/polkit-1/actions/org.lxqt.lxqt-admin-user.policy

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/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

@@ -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-Browser: https://github.com/lxqt/lxqt-admin