Merge branch 'ci/stable' into ci/unstable

Added libsystemd-dev as Build-Depends
The build of lxqt-admin failed because of files that are created, but not installed. In the cmake file of lxqt-admin-time, cmake is checking for system libraries and sets -DNO_SYSTEMD, if it does not find systemd libs. Added libsystemd-dev as Build-Depends to avoid the creation of this files.
9 changed files with 70 additions and 87 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,52 +1,9 @@
-lxqt-admin (1.4.0-0ubuntu1) noble; urgency=medium
-
-  * New upstream release.
-  * Bump build dependencies.
-  * Update copyright years.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Sun, 12 Nov 2023 18:00:48 -0600
-
-lxqt-admin (1.3.0-0ubuntu1) mantic; urgency=medium
-
-  * New upstream release.
-  * Bump build dependencies.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 11 Aug 2023 09:49:20 -0500
-
-lxqt-admin (1.2.0-1ubuntu1) lunar; urgency=medium
-
-  [ ChangZhuo Chen ]
-  * Add Repository-Browse to upstream metadata.
-
-  [ Aaron Rainbolt ]
-  * Revert a sync from Debian.
-  * Bumped Standards-Version to 4.6.2, no changes necessary.
-  * Updated copyright file.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Sun, 12 Feb 2023 20:24:28 -0600
-
-lxqt-admin (1.2.0-0ubuntu1) lunar; urgency=medium
+lxqt-admin (0.16.0-1ubuntu1) hirsute; urgency=medium

  * 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.
+  * Bump debhelper-compat requirement to 13.

- -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 17 Nov 2022 22:12:20 -0600
-
-lxqt-admin (1.1.0-1) experimental; urgency=medium
-
-  * New upstream release.
-  * Upstreamed compatible changes from Ubuntu, modifying the following files:
-    - control
-    - copyright
-    - docs
-    - lintian-overrides
-    - lxqt-admin-l10n.install
-    - rules
-    - upstream/*
-
- -- Aaron Rainbolt <arraybolt3@gmail.com>  Tue, 12 Jul 2022 16:16:35 -0500
+ -- Raman Sarda <theloudspeaker@disroot.org>  Sun, 21 Feb 2021 22:31:25 +0530

 lxqt-admin (0.16.0-1) unstable; urgency=medium

@ -59,6 +16,23 @@ 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.
@ -66,6 +40,12 @@ 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.
@ -80,6 +60,16 @@ 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)
@ -94,6 +84,16 @@ 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
@ -238,3 +238,4 @@ 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
+
--- a/debian/control
+++ b/debian/control
@ -3,26 +3,23 @@ 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>,
-           Simon Quigley <tsimonq2@debian.org>,
-           Aaron Rainbolt <arraybolt3@gmail.com>
+           Andrew Lee (李健秋) <ajqlee@debian.org>
 Section: x11
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
               libkf5windowsystem-dev,
-               liblxqt1-dev (>= 1.4.0),
+               liblxqt0-dev (>= 0.16.0~),
               libpolkit-qt5-1-dev,
               libqt5svg5-dev,
               libqt5x11extras5-dev,
               libsystemd-dev,
               libx11-dev
-Standards-Version: 4.6.2
-Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-admin-packaging
-Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-admin-packaging.git
+Standards-Version: 4.5.0
+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
 Homepage: https://github.com/lxqt/lxqt-admin
-Rules-Requires-Root: no

 Package: lxqt-admin
 Architecture: any
@ -40,7 +37,7 @@ Architecture: all
 Multi-Arch: foreign
 Section: localization
 Depends: qttranslations5-l10n, ${misc:Depends}
+Breaks: lxqt-admin (<< 0.11.0)
+Replaces: lxqt-admin (<< 0.11.0)
 Description: Language package for lxqt-admin
- The l10n files for lxqt-admin.
- .
 This package contains the l10n files needed by lxqt-admin.
--- a/debian/copyright
+++ b/debian/copyright
@ -3,15 +3,13 @@ Upstream-Name: lxqt-admin
 Source: https://github.com/lxqt/lxqt-admin

 Files: *
-Copyright: 2014-2023 LXQt team
-           2014-2016 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
+Copyright: 2014-2019 LXQt team
+           2014 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
 License: LGPL-2.1+

 Files: debian/*
-Copyright: 2021-2023 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-                2022 ChangZhuo Chen (陳昌倬) <czchen@debian.org>
-           2014-2019 Alf Gaida <agaida@siduction.org>
-                2015 Andrew Lee (李健秋) <ajqlee@debian.org>
+Copyright: 2014-2019 Alf Gaida <agaida@siduction.org>
+	   2015	     Andrew Lee (李健秋) <ajqlee@debian.org>
 License: LGPL-2.1+

 License: LGPL-2.1+
--- a/debian/lintian-overrides
+++ b/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: binary-without-manpage usr/bin/lxqt-admin-time
+lxqt-admin: binary-without-manpage usr/bin/lxqt-admin-user
+lxqt-admin: binary-without-manpage 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
--- a/debian/lxqt-admin.install
+++ b/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
--- a/debian/rules
+++ b/debian/rules
@ -2,6 +2,7 @@
 # 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

 %:
--- a/debian/salsa-ci.yml
+++ b/debian/salsa-ci.yml
@ -1,12 +0,0 @@
-# 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
-
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@ -3,4 +3,4 @@ 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
+Repository-Browser: https://github.com/lxqt/lxqt-admin
--- a/debian/watch
+++ b/debian/watch
@ -1,5 +1,3 @@
 version=4
-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
+opts="pgpsigurlmangle=s/$/.asc/" \
+https://github.com/lxqt/lxqt-admin/releases .*/lxqt-admin-([\d\.]+).tar.xz