From f1c4688096de13e28e7bcd82d6e5a32da5ca91d4 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Thu, 17 Nov 2022 16:27:10 -0600 Subject: [PATCH] Sync with Debian version 1.1.0-1. --- debian/changelog | 66 ++++++++++------------------------------ debian/control | 18 ++++++----- debian/copyright | 4 +-- debian/gbp.conf | 5 +++ debian/lintian-overrides | 4 +-- debian/rules | 1 - debian/upstream/metadata | 2 -- 7 files changed, 35 insertions(+), 65 deletions(-) create mode 100644 debian/gbp.conf diff --git a/debian/changelog b/debian/changelog index b552c11..6e0dfe6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,42 +1,24 @@ -pavucontrol-qt (1.1.0-0ubuntu1) kinetic; urgency=medium +pavucontrol-qt (1.1.0-1) experimental; urgency=medium - * New upstream release. - * Bump build dependencies. + * New upstream release 1.1.0. + * Removed obsolete debian/compat file. + * Switched to GBP. + * Upstreamed non-Ubuntu-specific packaging changes from Ubuntu, modifying + the following files: + - control + - copyright + - lintian-overrides + - *.install + - rules + - upstream/* - -- Simon Quigley Thu, 02 Jun 2022 10:42:22 -0500 + -- Aaron Rainbolt Sun, 10 Jul 2022 04:35:38 -0500 -pavucontrol-qt (0.17.0-0ubuntu2) jammy; urgency=medium +pavucontrol-qt (0.16.0-2) unstable; urgency=medium - * Allow pipewire-pulse as an alternate depends. + * Depend on either pulseaudio or pipewire-pulse (Closes: #995690) - -- Rik Mills Thu, 16 Dec 2021 18:42:24 +0000 - -pavucontrol-qt (0.17.0-0ubuntu1) impish; urgency=medium - - * New upstream release 0.17.0 - * Update debian/control - - Bump debhelper-compat to 13 - - Bump Standards-Version to 4.5.1 - - Use lxqt-build-tools 0.9.0 - - Extend pavucontrol-qt-l10n package description - * Rename tag for lintian override - * Update debian/copyright - - -- apt-ghetto Wed, 18 Aug 2021 13:57:36 +0200 - -pavucontrol-qt (0.16.0-1ubuntu2) hirsute; urgency=medium - - * Restore correct upstream signing key. - - -- Rik Mills Sun, 21 Feb 2021 19:47:12 +0000 - -pavucontrol-qt (0.16.0-1ubuntu1) hirsute; urgency=medium - - * Merge from Debian unstable. Remaining changes: - - Lubuntuify the package. - - Run wrap-and-sort - - -- Rik Mills Sun, 31 Jan 2021 17:05:03 +0000 + -- Arto Jantunen Wed, 03 Nov 2021 12:41:14 +0200 pavucontrol-qt (0.16.0-1) unstable; urgency=medium @@ -49,22 +31,6 @@ pavucontrol-qt (0.16.0-1) unstable; urgency=medium -- Andrew Lee (李健秋) Thu, 07 Jan 2021 16:48:22 +0800 -pavucontrol-qt (0.15.0-0ubuntu1) groovy; urgency=medium - - * New upstream release. - - Update upstream signing key. - - Update LXQt build dependencies. - * Update Standards-version to 4.5.0, no changes needed. - * Run wrap-and-sort. - - -- Simon Quigley Thu, 04 Jun 2020 00:17:27 -0500 - -pavucontrol-qt (0.14.1-1ubuntu1) disco; urgency=medium - - * Lubuntuify the package. - - -- Simon Quigley Sat, 09 Mar 2019 12:29:43 -0600 - pavucontrol-qt (0.14.1-1) unstable; urgency=medium * Cherry-picked upstream release 0.14.1. diff --git a/debian/control b/debian/control index 4266eff..4d77eb4 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,10 @@ Source: pavucontrol-qt -Maintainer: Lubuntu Developers -XSBC-Original-Maintainer: LXQt Packaging Team -Uploaders: Simon Quigley +Maintainer: LXQt Packaging Team +Uploaders: Alf Gaida , + Andrew Lee (李健秋) , + ChangZhuo Chen (陳昌倬) , + Simon Quigley , + Aaron Rainbolt Section: utils Priority: optional Build-Depends: debhelper-compat (= 13), @@ -11,12 +14,11 @@ Build-Depends: debhelper-compat (= 13), libqt5x11extras5-dev, lxqt-build-tools (>= 0.11.0), xdg-user-dirs -Standards-Version: 4.5.1 -Vcs-Browser: https://phab.lubuntu.me/source/pavucontrol-qt/ -Vcs-Git: https://phab.lubuntu.me/source/pavucontrol-qt.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 +Standards-Version: 4.6.1 +Vcs-Browser: https://salsa.debian.org/lxqt-team/pavucontrol-qt +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 diff --git a/debian/copyright b/debian/copyright index 7de2555..776a3fd 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Upstream-Name: pavucontrol-qt Source: https://github.com/lxqt/pavucontrol-qt Files: * -Copyright: 2016-2019 LXQt team +Copyright: 2016-2022 LXQt team 2016-2017 Hong Jen Yee (PCMan) 2016-2017 Palo Kisa License: GPL-2.0+ @@ -41,7 +41,7 @@ Copyright: 2006-2008 Lennart Poettering License: GPL-2.0+ Files: debian/* -Copyright: 2021, Lubuntu Developers +Copyright: 2021-2022, Lubuntu Developers 2016-2019, Alf Gaida License: GPL-2.0+ diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..9552c6c --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,5 @@ +[DEFAULT] +debian-branch = debian/sid +upstream-branch = upstream/latest +pristine-tar = True +compression = xz diff --git a/debian/lintian-overrides b/debian/lintian-overrides index bea1d13..8c79549 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -1,4 +1,4 @@ # yes, we know -pavucontrol-qt: no-manual-page usr/bin/pavucontrol-qt -pavucontrol-qt: desktop-entry-lacks-keywords-entry usr/share/applications/pavucontrol-qt.desktop +pavucontrol-qt: no-manual-page [usr/bin/pavucontrol-qt] +pavucontrol-qt: desktop-entry-lacks-keywords-entry [usr/share/applications/pavucontrol-qt.desktop] diff --git a/debian/rules b/debian/rules index b8fdf4e..4e97055 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 %: diff --git a/debian/upstream/metadata b/debian/upstream/metadata index 40c2727..eff96ab 100644 --- a/debian/upstream/metadata +++ b/debian/upstream/metadata @@ -3,5 +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-Browser: https://github.com/lxqt/pavucontrol-qt -