Merge 95f9613624f8c6c7a497febf3d545f4bbf0cb6c0 into 11e1b104a5f41bf8fdb7d187966cf6936718dded

debian/changelog

@@ -1,32 +1,29 @@
-libsysstat (0.4.4-1ubuntu1) hirsute; urgency=medium
+libsysstat (0.4.6-1~ppa1) jammy; urgency=medium
 
-  * Merge from debian unstable.
+  * Backport to Jammy.
-  * Bumped debhelper-compat to 13.
+  * Removed "-Wl,--as-needed" flag from debian/rules.
+  * Ran wrap-and-sort.
+  * Bumped standards-version, no changes necessary.
+  * Added Lubuntu Developers to debian/copyright.
 
- -- Raman Sarda <theloudspeaker@disroot.org>  Fri, 12 Feb 2021 02:54:27 +0530
+ -- Aaron Rainbolt <arraybolt3@gmail.com>  Wed, 22 Jun 2022 02:27:34 -0500
 
-libsysstat (0.4.4-1) unstable; urgency=medium
+libsysstat (0.4.6-1) unstable; urgency=medium
 
   [ Alf Gaida ]
-  * Switched to gbp
+  * Switched to gbp.
-  * Bumped Standards-Version to 4.4.0, no changes needed
 
   [ Andrew Lee (李健秋) ]
   * New upstream release.
   * Added myself as uploader.
 
- -- Andrew Lee (李健秋) <ajqlee@debian.org>  Wed, 06 Jan 2021 06:29:33 +0800
+  [ ChangZhuo Chen (陳昌倬) ]
+  * Bump Standards-Version to 4.6.0.
+  * Bump compat to 13.
+  * Add Rules-Requires-Root: no.
+  * Fix wrong field name in d/upstream/metadata.
 
-libsysstat (0.4.3-0ubuntu1) groovy; urgency=medium
+ -- ChangZhuo Chen (陳昌倬) <czchen@debian.org>  Wed, 09 Feb 2022 23:16:01 +0800
-
-  * New upstream release.
-    - Update upstream signing key.
-    - Update LXQt build dependencies.
-  * Bump Standards-version to 4.5.0, no changes needed.
-  * debhelper -> debhelper-compat.
-  * Run wrap-and-sort.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 03 Jun 2020 23:22:21 -0500
 
 libsysstat (0.4.2-1) unstable; urgency=medium
 
@@ -40,14 +37,6 @@ libsysstat (0.4.2-1) unstable; urgency=medium
 
  -- Alf Gaida <agaida@siduction.org>  Sun, 27 Jan 2019 13:53:21 +0100
 
-libsysstat (0.4.2-0ubuntu1) disco; urgency=medium
-
-  * New upstream release.
-  * Bump Standards-version to 4.3.0, no changes needed.
-  * Bump debhelper compat to 12, no changes needed.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 25 Jan 2019 22:26:21 -0600
-
 libsysstat (0.4.1-2) unstable; urgency=medium
 
   * lxqt-build-tools >= 0.5.0~ is needed
@@ -61,17 +50,6 @@ libsysstat (0.4.1-1) unstable; urgency=medium
 
  -- Alf Gaida <agaida@siduction.org>  Wed, 23 May 2018 02:18:52 +0200
 
-libsysstat (0.4.1-0ubuntu1) cosmic; urgency=medium
-
-  * New upstream release.
-  * Update Vcs-* and Maintainer to Lubuntu values.
-  * Update copyright.
-  * Bump build dependencies.
-  * Update the watch file to point to the new upstream location.
-  * Remove trailing whitespace from the changelog file.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 21 May 2018 22:12:03 -0500
-
 libsysstat (0.4.0-4) unstable; urgency=medium
 
   * Bumped Standards to 4.1.4, no changes needed
@@ -182,4 +160,3 @@ libsysstat (0.3.0+20150806-1) unstable; urgency=medium
   * Remove un-needed dependency: libqt5xdg-dev
 
  -- ChangZhuo Chen (陳昌倬) <czchen@debian.org>  Tue, 22 Sep 2015 21:35:12 +0800
-

debian/control

@@ -1,19 +1,16 @@
 Source: libsysstat
-Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
-XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
 Uploaders: Alf Gaida <agaida@siduction.org>,
            Andrew Lee (李健秋) <ajqlee@debian.org>,
            ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
            Shih-Yuan Lee (FourDollars) <fourdollars@gmail.com>
 Section: libs
 Priority: optional
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: debhelper-compat (= 13), lxqt-build-tools (>= 0.11.0-0.1~)
-               lxqt-build-tools (>= 0.6.0~),
+Standards-Version: 4.6.1
-Standards-Version: 4.5.0
+Rules-Requires-Root: no
-Vcs-Browser: https://phab.lubuntu.me/source/libsysstat/
+Vcs-Browser: https://salsa.debian.org/lxqt-team/libsysstat
-Vcs-Git: https://phab.lubuntu.me/source/libsysstat.git
+Vcs-Git: https://salsa.debian.org/lxqt-team/libsysstat.git
-XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/libsysstat
-XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/libsysstat.git
 Homepage: https://github.com/lxqt/libsysstat
 
 Package: libsysstat-qt5-0

debian/copyright

@@ -3,12 +3,14 @@ Upstream-Name: libsysstat
 Source: https://github.com/lxqt/libsysstat
 
 Files: *
-Copyright: 2012-2018 LXQt team
+Copyright: 2012-2019 LXQt team
            2012      Razor team
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2014-2018 Alf Gaida <agaida@siduction.org>
+Copyright: 2014-2019 Alf Gaida <agaida@siduction.org>
+           2022 ChangZhuo Chen (陳昌倬) <czchen@debian.org>
+           2022 Lubuntu Develoeprs <lubuntu-devel@lists.ubuntu.com>
 License: LGPL-2.1+
 
 License: LGPL-2.1+

debian/libsysstat-qt5-0.symbols

@@ -1,4 +1,5 @@
 libsysstat-qt5.so.0 libsysstat-qt5-0 #MINVER#
+* Build-Depends-Package: libsysstat-qt5-0-dev
  (c++)"SysStat::CpuStat::qt_metacall(QMetaObject::Call, int, void**)@Base" 0.2.0
  (c++)"SysStat::CpuStat::qt_metacast(char const*)@Base" 0.2.0
  (c++)"SysStat::CpuStat::setMonitoring(SysStat::CpuStat::Monitoring)@Base" 0.2.0

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

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

debian/upstream/signing-key.asc

@@ -1,5 +1,55 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
+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
+=h7ww
+-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
 mQINBF6cxrwBEADfl3ydxNfLBbWGPesXty2baQgixZ3D6aCxadI2kX+aikmT8rd0
 ttDKN18cXV52Ssxnj0qhgf4hwnu/b0be6BzqSEyGM+UQR3X2CYpxrMakfW32Q18K
 X5ec0RPR2ucBq9G0r9t6FYC8FkJ4uQUU3xxrLW3z302S0Makjgzm8BV9WrFQ7oFF