13 changed files with 24 additions and 145 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,78 +1,3 @@
-libsysstat (1.1.0-0ubuntu1) plucky; urgency=medium
-
-  * New upstream release.
-    - Bump build dependencies.
-  * Make the package Lintian-clean.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 15 Nov 2024 15:32:11 -0600
-
-libsysstat (1.0.0-0ubuntu1) oracular; urgency=medium
-
-  * New upstream release.
-  * Bump Standards-Version to 4.7.0, no changes necessary.
-  * Bump build deps.
-  * Bump package names for Qt6.
-  * Update copyright file.
-  * Bump soname.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 15 Aug 2024 16:04:14 -0500
-
-libsysstat (0.4.6-2ubuntu1) lunar; urgency=medium
-
-  * Revert a sync from Debian.
-    - Changes from Debian were reviewed, many of them are the results of
-      outdated info on their end, none of them are useful as-is.
-  * Bumped build dependencies.
-  * Bumped Standards-Version to 4.6.2, no changes necessary.
-  * Updated copyright file.
-  * Rebuild against lxqt-build-tools 0.12.0-0ubuntu3.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 09 Feb 2023 14:03:21 -0600
-
-libsysstat (0.4.6-0ubuntu1) lunar; urgency=medium
-
-  * New upstream release 0.4.6.
-  * Overhauled watch file to make it compatible with GitHub again.
-  * Updated copyright file.
-  * Bumped Standards-Version to 4.6.1, no changes necessary.
-  * Removed an obsolete '-Wl,--as-needed' linker flag.
-  * Added 'Rules-Require-Root: no' to debian/control.
-  * Created debian/upstream/metadata.
-  * Removed trailing whitespace from changelog.
-  * Changed Vcs-Browser and Vcs-Git fields to point to Gitea rather than Phab.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Mon, 28 Nov 2022 16:26:08 -0600
-
-libsysstat (0.4.5-0ubuntu1) impish; urgency=medium
-
-  * New upstream release 0.4.5
-  * Update debian/control
-    - Bump Standards-Version to 4.5.1
-    - Use lxqt-build-tools 0.9.0
-  * Added Build-Depends-Package metadata field to symbols
-  * Update debian/copyright
-
- -- apt-ghetto <apt-ghetto@protonmail.com>  Thu, 12 Aug 2021 11:24:57 +0200
-
-libsysstat (0.4.4-1ubuntu1) hirsute; urgency=medium
-
-  * Merge from debian unstable.
-  * Bumped debhelper-compat to 13.
-
- -- Raman Sarda <theloudspeaker@disroot.org>  Fri, 12 Feb 2021 02:54:27 +0530
-
-libsysstat (0.4.4-1) unstable; urgency=medium
-
-  [ Alf Gaida ]
-  * 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
-
 libsysstat (0.4.3-0ubuntu1) groovy; urgency=medium

  * New upstream release.
@ -84,18 +9,6 @@ libsysstat (0.4.3-0ubuntu1) groovy; urgency=medium

 -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 03 Jun 2020 23:22:21 -0500

-libsysstat (0.4.2-1) unstable; urgency=medium
-
-  * Cherry-picking new upstream release 0.4.2.
-  * Bump Standards to 4.3.0, no changes needed
-  * Dropped d/compat, use debhelper-compat = 12, no changes needed
-  * Bumped minimum version lxqt-build-tools (>= 0.6.0~)
-  * Added Build-Depends-Package field to symbols
-  * Fixed years in d/copyright
-  * Added d/upstream/metadata
-
- -- Alf Gaida <agaida@siduction.org>  Sun, 27 Jan 2019 13:53:21 +0100
-
 libsysstat (0.4.2-0ubuntu1) disco; urgency=medium

  * New upstream release.
@ -104,19 +17,6 @@ libsysstat (0.4.2-0ubuntu1) disco; urgency=medium

 -- 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
-
- -- Alf Gaida <agaida@siduction.org>  Wed, 23 May 2018 03:26:50 +0200
-
-libsysstat (0.4.1-1) unstable; urgency=medium
-
-  * Cherry-picking new upstream release 0.4.1.
-  * Fixed watchfile url to lxqt
-
- -- Alf Gaida <agaida@siduction.org>  Wed, 23 May 2018 02:18:52 +0200
-
 libsysstat (0.4.1-0ubuntu1) cosmic; urgency=medium

  * New upstream release.
--- a/debian/control
+++ b/debian/control
@ -1,23 +1,20 @@
 Source: libsysstat
 Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-Original-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),
-               lxqt-build-tools (>= 2.1.0),
-Standards-Version: 4.7.0
-Vcs-Browser: https://git.lubuntu.me/Lubuntu/libsysstat-packaging
-Vcs-Git: https://git.lubuntu.me/Lubuntu/libsysstat-packaging.git
-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/libsysstat
-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/libsysstat.git
+Build-Depends: debhelper-compat (= 12), lxqt-build-tools (>= 0.7.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
 Homepage: https://github.com/lxqt/libsysstat
-Rules-Requires-Root: no

-Package: libsysstat-qt6-1
+Package: libsysstat-qt5-0
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
@ -26,10 +23,10 @@ Description: Qt-based interface to system statistics
 .
 This package contain the shared library.

-Package: libsysstat-qt6-1-dev
+Package: libsysstat-qt5-0-dev
 Architecture: any
 Section: libdevel
-Depends: libsysstat-qt6-1 (= ${binary:Version}), ${misc:Depends}
+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.
 .
--- a/debian/copyright
+++ b/debian/copyright
@ -3,14 +3,12 @@ Upstream-Name: libsysstat
 Source: https://github.com/lxqt/libsysstat

 Files: *
-Copyright: 2012-2024 LXQt team
+Copyright: 2012-2018 LXQt team
           2012 Razor team
-           2009-2012, Kuzma Shapran <kuzma.shapran@gmail.com>
 License: LGPL-2.1+

 Files: debian/*
-Copyright: 2021-2024 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-           2014-2018 Alf Gaida <agaida@siduction.org>
+Copyright: 2014-2018 Alf Gaida <agaida@siduction.org>
 License: LGPL-2.1+

 License: LGPL-2.1+
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@ -1,6 +0,0 @@
-[DEFAULT]
-debian-branch = debian/sid
-upstream-branch = upstream/latest
-pristine-tar = True
-compression = xz
-
--- a/debian/libsysstat-qt5-0-dev.install
+++ b/debian/libsysstat-qt5-0-dev.install
@ -0,0 +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-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-targets.cmake
--- a/debian/libsysstat-qt5-0.install
+++ b/debian/libsysstat-qt5-0.install
@ -0,0 +1 @@
+usr/lib/*/libsysstat-qt5.so.*
--- a/debian/libsysstat-qt5-0.symbols
+++ b/debian/libsysstat-qt5-0.symbols
@ -1,5 +1,4 @@
-libsysstat-qt6.so.1 libsysstat-qt6-1 #MINVER#
-* Build-Depends-Package: libsysstat-qt6-1-dev
+libsysstat-qt5.so.0 libsysstat-qt5-0 #MINVER#
 (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
--- a/debian/libsysstat-qt6-1-dev.install
+++ b/debian/libsysstat-qt6-1-dev.install
@ -1,7 +0,0 @@
-usr/include/sysstat-qt6/
-usr/lib/*/libsysstat-qt6.so
-usr/lib/*/pkgconfig/sysstat-qt6.pc
-usr/share/cmake/sysstat-qt6/sysstat-qt6-config-version.cmake
-usr/share/cmake/sysstat-qt6/sysstat-qt6-config.cmake
-usr/share/cmake/sysstat-qt6/sysstat-qt6-targets-relwithdebinfo.cmake
-usr/share/cmake/sysstat-qt6/sysstat-qt6-targets.cmake
--- a/debian/libsysstat-qt6-1.install
+++ b/debian/libsysstat-qt6-1.install
@ -1 +0,0 @@
-usr/lib/*/libsysstat-qt6.so.*
--- a/debian/libsysstat-qt6-1.lintian-overrides
+++ b/debian/libsysstat-qt6-1.lintian-overrides
@ -1,2 +0,0 @@
-# False positive
-libsysstat-qt6-1: hardening-no-fortify-functions [usr/lib/x86_64-linux-gnu/*]
--- 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/upstream/metadata
+++ b/debian/upstream/metadata
@ -1,6 +0,0 @@
-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.git
-Repository-Browse: https://github.com/lxqt/libsysstat
--- 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/libsysstat/releases .*/libsysstat-([\d\.]+).tar.xz