From 8777ec00c16e9f9de316725bf1d15ead349e84af Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Sun, 12 Feb 2023 19:35:46 -0600 Subject: [PATCH] Sync with archive. --- debian/.gitignore | 10 ---- debian/changelog | 33 +++++++++-- debian/control | 21 +++---- debian/copyright | 6 +- debian/upstream/metadata | 1 + debian/upstream/signing-key.asc | 102 ++++++++++++++++---------------- debian/watch | 9 +-- 7 files changed, 98 insertions(+), 84 deletions(-) delete mode 100644 debian/.gitignore diff --git a/debian/.gitignore b/debian/.gitignore deleted file mode 100644 index dd3db13..0000000 --- a/debian/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -/*.debhelper -/*.log -/*.substvars -/debhelper-build-stamp -/files - -/lxqt-admin/ -/lxqt-admin-dbg/ -/lxqt-admin-qt5/ -/lxqt-admin-qt5-dbg/ diff --git a/debian/changelog b/debian/changelog index bc7e045..e5341ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,25 @@ -lxqt-admin (1.2.0-0ubuntu1) lunar; urgency=medium +lxqt-admin (1.2.0-1) unstable; 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. + * New upstream release. + + -- ChangZhuo Chen (陳昌倬) Wed, 14 Dec 2022 23:23:59 +0800 + +lxqt-admin (1.1.0-3) unstable; urgency=medium + + * Fix Build-Depends. + * Change Depends/Recommends indent. + * Sort copyright. + * Add Repository-Browse to upstream metadata. + * Use LF in signing-key.asc. + * Workaround d/watch for github. + + -- ChangZhuo Chen (陳昌倬) Sun, 20 Nov 2022 23:04:48 +0800 - -- Simon Quigley Thu, 17 Nov 2022 22:12:20 -0600 +lxqt-admin (1.1.0-2) unstable; urgency=medium + + * Merge to unstable. + + -- ChangZhuo Chen (陳昌倬) Sat, 19 Nov 2022 00:56:33 +0800 lxqt-admin (1.1.0-1) experimental; urgency=medium @@ -21,6 +35,13 @@ lxqt-admin (1.1.0-1) experimental; urgency=medium -- Aaron Rainbolt Tue, 12 Jul 2022 16:16:35 -0500 +lxqt-admin (1.0.0-1) unstable; urgency=medium + + * New upstream release + * Bumped Standards-Version to 4.6.0, no changes needed + + -- S. 7 Thu, 25 Nov 2021 18:19:55 +0200 + lxqt-admin (0.16.0-1) unstable; urgency=medium [ Alf Gaida ] diff --git a/debian/control b/debian/control index aca3398..2e0e476 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,5 @@ Source: lxqt-admin -Maintainer: Lubuntu Developers -XSBC-Original-Maintainer: LXQt Packaging Team +Maintainer: LXQt Packaging Team Uploaders: Alf Gaida , ChangZhuo Chen (陳昌倬) , Andrew Lee (李健秋) , @@ -10,24 +9,25 @@ Section: x11 Priority: optional Build-Depends: debhelper-compat (= 13), libkf5windowsystem-dev, - liblxqt1-dev (>= 1.2.0), + liblxqt1-dev (>= 1.2.0~), libpolkit-qt5-1-dev, libqt5svg5-dev, libqt5x11extras5-dev, libsystemd-dev, libx11-dev Standards-Version: 4.6.1 -Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-admin-packaging -Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-admin-packaging.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 +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 -Depends: ${misc:Depends}, ${shlibs:Depends} -Recommends: lxqt-admin-l10n, lxqt-policykit, lxqt-qtplugin +Depends: ${misc:Depends}, + ${shlibs:Depends}, +Recommends: lxqt-admin-l10n, + lxqt-policykit, + lxqt-qtplugin, Description: Admin tools for LXQt Admin tools for LXQt, as of now: * lxqt-admin-time @@ -39,7 +39,8 @@ Package: lxqt-admin-l10n Architecture: all Multi-Arch: foreign Section: localization -Depends: qttranslations5-l10n, ${misc:Depends} +Depends: ${misc:Depends}, + qttranslations5-l10n, Description: Language package for lxqt-admin The l10n files for lxqt-admin. . diff --git a/debian/copyright b/debian/copyright index 4951107..f2bcb3b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -8,9 +8,9 @@ Copyright: 2014-2022 LXQt team License: LGPL-2.1+ Files: debian/* -Copyright: 2021-2022, Lubuntu Developers - 2014-2019, Alf Gaida - 2015, Andrew Lee (李健秋) +Copyright: 2014-2019 Alf Gaida + 2015 Andrew Lee (李健秋) + 2021-2022 Lubuntu Developers License: LGPL-2.1+ License: LGPL-2.1+ diff --git a/debian/upstream/metadata b/debian/upstream/metadata index bb676f2..c37c098 100644 --- a/debian/upstream/metadata +++ b/debian/upstream/metadata @@ -3,3 +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 diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc index 396ad68..2e4d6c7 100644 --- a/debian/upstream/signing-key.asc +++ b/debian/upstream/signing-key.asc @@ -1,52 +1,52 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -sw== -=gSIv +-----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 a544020..81e8bb7 100644 --- a/debian/watch +++ b/debian/watch @@ -1,5 +1,6 @@ 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 + +# See https://davesteele.github.io/development/2015/05/02/debian-watch-file-format-for-signed-github-source-tars/ for GitHub workaround for releases page. + +opts="downloadurlmangle=s/archive\/refs\/tags\/(.*)\.tar\.gz/releases\/download\/$1\/@PACKAGE@-$1\.tar\.xz/,filenamemangle=s/([\d\.]+)\.tar\.gz/@PACKAGE@-$1\.tar\.xz/,pgpsigurlmangle=s/$/.asc/" \ +https://github.com/lxqt/@PACKAGE@/tags .*/([\d\.]+)\.tar\.gz