From 2017391fb366fedcf9f41ca78a914a9082c70e17 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 22 Jun 2022 01:56:00 -0500 Subject: [PATCH 01/10] Applied debdiff from Kinetic's package. --- debian/changelog | 49 ++------- debian/control | 18 ++-- debian/copyright | 7 +- debian/libsysstat-qt5-0-dev.install | 6 +- debian/libsysstat-qt5-0.symbols | 1 + debian/salsa-ci.yml | 12 +++ debian/upstream/metadata | 7 ++ debian/upstream/signing-key.asc | 152 ++++++++++++++++++---------- debian/watch | 2 +- 9 files changed, 147 insertions(+), 107 deletions(-) create mode 100644 debian/salsa-ci.yml create mode 100644 debian/upstream/metadata diff --git a/debian/changelog b/debian/changelog index 89103c6..59fd7ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,32 +1,19 @@ -libsysstat (0.4.4-1ubuntu1) hirsute; urgency=medium - - * Merge from debian unstable. - * Bumped debhelper-compat to 13. - - -- Raman Sarda Fri, 12 Feb 2021 02:54:27 +0530 - -libsysstat (0.4.4-1) unstable; urgency=medium +libsysstat (0.4.6-1) unstable; urgency=medium [ Alf Gaida ] - * Switched to gbp - * Bumped Standards-Version to 4.4.0, no changes needed + * Switched to gbp. [ Andrew Lee (李健秋) ] * New upstream release. * Added myself as uploader. - -- Andrew Lee (李健秋) 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 - - * 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 Wed, 03 Jun 2020 23:22:21 -0500 + -- ChangZhuo Chen (陳昌倬) Wed, 09 Feb 2022 23:16:01 +0800 libsysstat (0.4.2-1) unstable; urgency=medium @@ -40,14 +27,6 @@ libsysstat (0.4.2-1) unstable; urgency=medium -- Alf Gaida 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 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 +40,6 @@ libsysstat (0.4.1-1) unstable; urgency=medium -- Alf Gaida 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 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 +150,3 @@ libsysstat (0.3.0+20150806-1) unstable; urgency=medium * Remove un-needed dependency: libqt5xdg-dev -- ChangZhuo Chen (陳昌倬) Tue, 22 Sep 2015 21:35:12 +0800 - diff --git a/debian/control b/debian/control index 13eda20..0ad94cd 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,5 @@ Source: libsysstat -Maintainer: Lubuntu Developers -XSBC-Original-Maintainer: LXQt Packaging Team +Maintainer: LXQt Packaging Team Uploaders: Alf Gaida , Andrew Lee (李健秋) , ChangZhuo Chen (陳昌倬) , @@ -9,17 +8,17 @@ Section: libs Priority: optional Build-Depends: debhelper-compat (= 13), lxqt-build-tools (>= 0.6.0~), -Standards-Version: 4.5.0 -Vcs-Browser: https://phab.lubuntu.me/source/libsysstat/ -Vcs-Git: https://phab.lubuntu.me/source/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 +Standards-Version: 4.6.0 +Rules-Requires-Root: no +Vcs-Browser: https://salsa.debian.org/lxqt-team/libsysstat +Vcs-Git: https://salsa.debian.org/lxqt-team/libsysstat.git Homepage: https://github.com/lxqt/libsysstat Package: libsysstat-qt5-0 Architecture: any Multi-Arch: same -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${shlibs:Depends}, + ${misc:Depends} Description: Qt-based interface to system statistics SysStat is a Qt-based interface to system statistics. . @@ -28,7 +27,8 @@ Description: Qt-based interface to system statistics Package: libsysstat-qt5-0-dev Architecture: any Section: libdevel -Depends: libsysstat-qt5-0 (= ${binary:Version}), ${misc:Depends} +Depends: ${misc:Depends}, + libsysstat-qt5-0 (= ${binary:Version}) Description: Qt-based interface to system statistics (dev) SysStat is a Qt-based interface to system statistics. . diff --git a/debian/copyright b/debian/copyright index b2bbe95..9b1d354 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,12 +3,13 @@ Upstream-Name: libsysstat Source: https://github.com/lxqt/libsysstat Files: * -Copyright: 2012-2018 LXQt team - 2012 Razor team +Copyright: 2012-2019 LXQt team + 2012 Razor team License: LGPL-2.1+ Files: debian/* -Copyright: 2014-2018 Alf Gaida +Copyright: 2014-2019 Alf Gaida + 2022 ChangZhuo Chen (陳昌倬) License: LGPL-2.1+ License: LGPL-2.1+ diff --git a/debian/libsysstat-qt5-0-dev.install b/debian/libsysstat-qt5-0-dev.install index 2f4771d..59b70ad 100644 --- a/debian/libsysstat-qt5-0-dev.install +++ b/debian/libsysstat-qt5-0-dev.install @@ -1,7 +1,9 @@ usr/include/sysstat-qt5/ usr/lib/*/libsysstat-qt5.so + usr/lib/*/pkgconfig/sysstat-qt5.pc -usr/share/cmake/sysstat-qt5/sysstat-qt5-config-version.cmake + usr/share/cmake/sysstat-qt5/sysstat-qt5-config.cmake -usr/share/cmake/sysstat-qt5/sysstat-qt5-targets-relwithdebinfo.cmake +usr/share/cmake/sysstat-qt5/sysstat-qt5-config-version.cmake usr/share/cmake/sysstat-qt5/sysstat-qt5-targets.cmake +usr/share/cmake/sysstat-qt5/sysstat-qt5-targets-relwithdebinfo.cmake diff --git a/debian/libsysstat-qt5-0.symbols b/debian/libsysstat-qt5-0.symbols index 6f1b83f..1c8b481 100644 --- a/debian/libsysstat-qt5-0.symbols +++ b/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 diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml new file mode 100644 index 0000000..28214c5 --- /dev/null +++ b/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 + diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 0000000..76d0bde --- /dev/null +++ b/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 + diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc index 396ad68..1c6a2af 100644 --- a/debian/upstream/signing-key.asc +++ b/debian/upstream/signing-key.asc @@ -1,52 +1,102 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -sw== -=gSIv +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=h7ww +-----END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +sw== +=gSIv -----END PGP PUBLIC KEY BLOCK----- diff --git a/debian/watch b/debian/watch index 47aaf49..cf81bc3 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=4 opts="pgpsigurlmangle=s/$/.asc/" \ - https://github.com/lxqt/libsysstat/releases .*/libsysstat-([\d\.]+).tar.xz +https://github.com/lxqt/libsysstat/releases .*/libsysstat-([\d\.]+).tar.xz From 2f50f0cd6a107e488da2330251ae9c5180a43c24 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 22 Jun 2022 01:56:51 -0500 Subject: [PATCH 02/10] Backport to Jammy. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 59fd7ce..2a149b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libsysstat (0.4.6-1ubuntu1) UNRELEASED; urgency=medium + + * Backport to Jammy. + + -- Aaron Rainbolt Wed, 22 Jun 2022 01:56:26 -0500 + libsysstat (0.4.6-1) unstable; urgency=medium [ Alf Gaida ] From 0b84f3653b956f86f725dca95244e71a2477fd08 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 22 Jun 2022 02:25:19 -0500 Subject: [PATCH 03/10] Removed unneeded linker flags --- debian/changelog | 1 + debian/rules | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2a149b9..ca108fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libsysstat (0.4.6-1ubuntu1) UNRELEASED; urgency=medium * Backport to Jammy. + * Removed "-Wl,--as-needed" flag from debian/rules. -- Aaron Rainbolt Wed, 22 Jun 2022 01:56:26 -0500 diff --git a/debian/rules b/debian/rules index b5c1e6f..f989889 100755 --- a/debian/rules +++ b/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 %: From 5320b0daca22958bf8acfc94a1f73ae0dbedc019 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 22 Jun 2022 02:27:51 -0500 Subject: [PATCH 04/10] Set distro name --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ca108fb..c0cc180 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libsysstat (0.4.6-1ubuntu1) UNRELEASED; urgency=medium +libsysstat (0.4.6-1ubuntu1) jammy; urgency=medium * Backport to Jammy. * Removed "-Wl,--as-needed" flag from debian/rules. - -- Aaron Rainbolt Wed, 22 Jun 2022 01:56:26 -0500 + -- Aaron Rainbolt Wed, 22 Jun 2022 02:27:34 -0500 libsysstat (0.4.6-1) unstable; urgency=medium From 8d1eafebe4a8f329ecf09e3821c57a22b8404b27 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 22 Jun 2022 02:28:41 -0500 Subject: [PATCH 05/10] Set version --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c0cc180..a66a733 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libsysstat (0.4.6-1ubuntu1) jammy; urgency=medium +libsysstat (0.4.6-1ubuntu1~ppa1) jammy; urgency=medium * Backport to Jammy. * Removed "-Wl,--as-needed" flag from debian/rules. From e7e2892a6560605891807409c8967098facfe1b4 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 22 Jun 2022 02:42:18 -0500 Subject: [PATCH 06/10] Run wrap-and-sort. --- debian/changelog | 1 + debian/control | 9 +++------ debian/libsysstat-qt5-0-dev.install | 6 ++---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index a66a733..ef49a89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ libsysstat (0.4.6-1ubuntu1~ppa1) jammy; urgency=medium * Backport to Jammy. * Removed "-Wl,--as-needed" flag from debian/rules. + * Ran wrap-and-sort. -- Aaron Rainbolt Wed, 22 Jun 2022 02:27:34 -0500 diff --git a/debian/control b/debian/control index 0ad94cd..505d7cf 100644 --- a/debian/control +++ b/debian/control @@ -6,8 +6,7 @@ Uploaders: Alf Gaida , Shih-Yuan Lee (FourDollars) Section: libs Priority: optional -Build-Depends: debhelper-compat (= 13), - lxqt-build-tools (>= 0.6.0~), +Build-Depends: debhelper-compat (= 13), lxqt-build-tools (>= 0.6.0~) Standards-Version: 4.6.0 Rules-Requires-Root: no Vcs-Browser: https://salsa.debian.org/lxqt-team/libsysstat @@ -17,8 +16,7 @@ Homepage: https://github.com/lxqt/libsysstat Package: libsysstat-qt5-0 Architecture: any Multi-Arch: same -Depends: ${shlibs:Depends}, - ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Description: Qt-based interface to system statistics SysStat is a Qt-based interface to system statistics. . @@ -27,8 +25,7 @@ Description: Qt-based interface to system statistics Package: libsysstat-qt5-0-dev Architecture: any Section: libdevel -Depends: ${misc:Depends}, - libsysstat-qt5-0 (= ${binary:Version}) +Depends: libsysstat-qt5-0 (= ${binary:Version}), ${misc:Depends} Description: Qt-based interface to system statistics (dev) SysStat is a Qt-based interface to system statistics. . diff --git a/debian/libsysstat-qt5-0-dev.install b/debian/libsysstat-qt5-0-dev.install index 59b70ad..2f4771d 100644 --- a/debian/libsysstat-qt5-0-dev.install +++ b/debian/libsysstat-qt5-0-dev.install @@ -1,9 +1,7 @@ usr/include/sysstat-qt5/ usr/lib/*/libsysstat-qt5.so - usr/lib/*/pkgconfig/sysstat-qt5.pc - -usr/share/cmake/sysstat-qt5/sysstat-qt5-config.cmake usr/share/cmake/sysstat-qt5/sysstat-qt5-config-version.cmake -usr/share/cmake/sysstat-qt5/sysstat-qt5-targets.cmake +usr/share/cmake/sysstat-qt5/sysstat-qt5-config.cmake usr/share/cmake/sysstat-qt5/sysstat-qt5-targets-relwithdebinfo.cmake +usr/share/cmake/sysstat-qt5/sysstat-qt5-targets.cmake From 538bbeb0cb4e2b0b2fca7b5afc9c4437931c714c Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 22 Jun 2022 02:44:42 -0500 Subject: [PATCH 07/10] Fixed version --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ef49a89..0e1420e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libsysstat (0.4.6-1ubuntu1~ppa1) jammy; urgency=medium +libsysstat (0.4.6-1~ppa1) jammy; urgency=medium * Backport to Jammy. * Removed "-Wl,--as-needed" flag from debian/rules. From 398ce1f4a5ab3df75ab61df4d0babd73ccd5ecf3 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 22 Jun 2022 02:47:45 -0500 Subject: [PATCH 08/10] Bump standards-version --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0e1420e..bcb7af8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ libsysstat (0.4.6-1~ppa1) jammy; urgency=medium * Backport to Jammy. * Removed "-Wl,--as-needed" flag from debian/rules. * Ran wrap-and-sort. + * Bumped standards-version, no changes necessary. -- Aaron Rainbolt Wed, 22 Jun 2022 02:27:34 -0500 diff --git a/debian/control b/debian/control index 505d7cf..d433885 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Uploaders: Alf Gaida , Section: libs Priority: optional Build-Depends: debhelper-compat (= 13), lxqt-build-tools (>= 0.6.0~) -Standards-Version: 4.6.0 +Standards-Version: 4.6.1 Rules-Requires-Root: no Vcs-Browser: https://salsa.debian.org/lxqt-team/libsysstat Vcs-Git: https://salsa.debian.org/lxqt-team/libsysstat.git From b67d7e9f93a2e25e6115604b11c40310dc62ddd8 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 22 Jun 2022 02:52:45 -0500 Subject: [PATCH 09/10] Bumped lxqt-build-tools version --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index d433885..4664884 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Alf Gaida , Shih-Yuan Lee (FourDollars) Section: libs Priority: optional -Build-Depends: debhelper-compat (= 13), lxqt-build-tools (>= 0.6.0~) +Build-Depends: debhelper-compat (= 13), lxqt-build-tools (>= 0.11.0-0.1~) Standards-Version: 4.6.1 Rules-Requires-Root: no Vcs-Browser: https://salsa.debian.org/lxqt-team/libsysstat From 95f9613624f8c6c7a497febf3d545f4bbf0cb6c0 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 22 Jun 2022 02:53:40 -0500 Subject: [PATCH 10/10] Added Lubuntu Developers copyright --- debian/changelog | 1 + debian/copyright | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index bcb7af8..cc38b3a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ libsysstat (0.4.6-1~ppa1) jammy; urgency=medium * Removed "-Wl,--as-needed" flag from debian/rules. * Ran wrap-and-sort. * Bumped standards-version, no changes necessary. + * Added Lubuntu Developers to debian/copyright. -- Aaron Rainbolt Wed, 22 Jun 2022 02:27:34 -0500 diff --git a/debian/copyright b/debian/copyright index 9b1d354..cda7d31 100644 --- a/debian/copyright +++ b/debian/copyright @@ -10,6 +10,7 @@ License: LGPL-2.1+ Files: debian/* Copyright: 2014-2019 Alf Gaida 2022 ChangZhuo Chen (陳昌倬) + 2022 Lubuntu Develoeprs License: LGPL-2.1+ License: LGPL-2.1+