From bd6c953fdf32b68357fbe38a8866c2bb28b26c21 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Fri, 10 Feb 2023 13:29:05 -0600 Subject: [PATCH] Revert a sync from Debian. This reverts commit 3fcf6e56d11eb205a0fc1ab331dfbfe8e301940d. --- debian/changelog | 16 ++++++---- debian/control | 20 ++++++------- debian/copyright | 5 ++-- debian/salsa-ci.yml | 12 -------- debian/source/local-options | 2 ++ debian/upstream/metadata | 1 - debian/upstream/signing-key.asc | 52 --------------------------------- debian/watch | 9 +++--- 8 files changed, 29 insertions(+), 88 deletions(-) delete mode 100644 debian/salsa-ci.yml create mode 100644 debian/source/local-options diff --git a/debian/changelog b/debian/changelog index ef59a3f..4a0231e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,17 @@ -pavucontrol-qt (1.2.0-1) unstable; urgency=medium +pavucontrol-qt (1.2.0-1ubuntu1) lunar; urgency=medium + + * Revert a sync from Debian. + + -- Aaron Rainbolt Fri, 10 Feb 2023 13:30:25 -0600 + +pavucontrol-qt (1.2.0-0ubuntu1) lunar; urgency=medium - * Merge to unstable. * New upstream release. - * Update d/watch for GitHub. - * Bump Standards-Version to 4.6.2. + * Fix the watch file, for real this time. + * Lubuntuify the package slightly, to make debhelper happy. + * Bump build dependencies in debian/control. - -- ChangZhuo Chen (陳昌倬) Thu, 05 Jan 2023 12:51:18 +0800 + -- Simon Quigley Thu, 17 Nov 2022 16:43:15 -0600 pavucontrol-qt (1.1.0-1) experimental; urgency=medium diff --git a/debian/control b/debian/control index 60ac759..37e17e6 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,6 @@ Source: pavucontrol-qt -Maintainer: LXQt Packaging Team +Maintainer: Lubuntu Developers +XSBC-Original-Maintainer: LXQt Packaging Team Uploaders: Alf Gaida , Andrew Lee (李健秋) , ChangZhuo Chen (陳昌倬) , @@ -12,19 +13,19 @@ Build-Depends: debhelper-compat (= 13), libpulse-dev, libqt5svg5-dev, libqt5x11extras5-dev, - lxqt-build-tools (>= 0.12.0~), + lxqt-build-tools (>= 0.12.0), xdg-user-dirs -Standards-Version: 4.6.2 -Vcs-Browser: https://salsa.debian.org/lxqt-team/pavucontrol-qt -Vcs-Git: https://salsa.debian.org/lxqt-team/pavucontrol-qt.git +Standards-Version: 4.6.1 +Vcs-Browser: https://git.lubuntu.me/Lubuntu/pavucontrol-qt-packaging +Vcs-Git: https://git.lubuntu.me/Lubuntu/pavucontrol-qt-packaging.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/pavucontrol-qt +XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/pavucontrol-qt.git Homepage: https://github.com/lxqt/pavucontrol-qt Rules-Requires-Root: no Package: pavucontrol-qt Architecture: any -Depends: ${misc:Depends}, - ${shlibs:Depends}, - pulseaudio | pipewire-pulse +Depends: pulseaudio | pipewire-pulse, ${misc:Depends}, ${shlibs:Depends} Recommends: pavucontrol-qt-l10n Description: Qt port of volume control pavucontrol Qt port of volume control pavucontrol of sound server PulseAudio. As such it @@ -40,8 +41,7 @@ Package: pavucontrol-qt-l10n Architecture: all Multi-Arch: foreign Section: localization -Depends: ${misc:Depends}, - qttranslations5-l10n +Depends: qttranslations5-l10n, ${misc:Depends} Description: Language package for pavucontrol-qt The l10n files for pavucontrol-qt. . diff --git a/debian/copyright b/debian/copyright index d9eb64b..776a3fd 100644 --- a/debian/copyright +++ b/debian/copyright @@ -41,9 +41,8 @@ Copyright: 2006-2008 Lennart Poettering License: GPL-2.0+ Files: debian/* -Copyright: 2016-2019 Alf Gaida - 2021-2022 Lubuntu Developers - 2023 ChangZhuo Chen (陳昌倬) +Copyright: 2021-2022, Lubuntu Developers + 2016-2019, Alf Gaida License: GPL-2.0+ License: GPL-2.0+ diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml deleted file mode 100644 index 28214c5..0000000 --- a/debian/salsa-ci.yml +++ /dev/null @@ -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 - diff --git a/debian/source/local-options b/debian/source/local-options new file mode 100644 index 0000000..9cdfca9 --- /dev/null +++ b/debian/source/local-options @@ -0,0 +1,2 @@ +unapply-patches +abort-on-upstream-changes diff --git a/debian/upstream/metadata b/debian/upstream/metadata index e5166e1..eff96ab 100644 --- a/debian/upstream/metadata +++ b/debian/upstream/metadata @@ -3,4 +3,3 @@ Bug-Database: https://github.com/lxqt/pavucontrol-qt/issues Bug-Submit: https://github.com/lxqt/pavucontrol-qt/issues/new Changelog: https://github.com/lxqt/pavucontrol-qt/blob/master/CHANGELOG Repository: https://github.com/lxqt/pavucontrol-qt -Repository-Browse: https://github.com/lxqt/pavucontrol-qt diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc index 49835ea..396ad68 100644 --- a/debian/upstream/signing-key.asc +++ b/debian/upstream/signing-key.asc @@ -50,55 +50,3 @@ NLJtd3SsRjc7ICtGdCvej59IvCDTjxtkhx5okF03APi1aXpHQrE18/arFD7BpoGO sw== =gSIv -----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 b75fbc5..a544020 100644 --- a/debian/watch +++ b/debian/watch @@ -1,6 +1,5 @@ version=4 - -# 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\/@ANY_VERSION@@ARCHIVE_EXT@/releases\/download\/$1\/@PACKAGE@-$1\.tar\.xz/,filenamemangle=s/@ANY_VERSION@@ARCHIVE_EXT@/@PACKAGE@-$1\.tar\.xz/,pgpsigurlmangle=s/$/.asc/" \ -https://github.com/lxqt/@PACKAGE@/tags .*/@ANY_VERSION@@ARCHIVE_EXT@ +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