8 changed files with 59 additions and 112 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,67 +1,29 @@
-pavucontrol-qt (1.4.0-0ubuntu1) noble; urgency=medium
+pavucontrol-qt (0.17.0-0ubuntu1) impish; urgency=medium

-  * New upstream release.
-  * Overhauled copyright file.
-
- -- Aaron Rainbolt <arraybolt3@gmail.com>  Sun, 12 Nov 2023 12:20:37 -0600
-
-pavucontrol-qt (1.3.0-0ubuntu1) mantic; urgency=medium
-
-  * New upstream release.
-  * Bump build dependencies.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 03 Aug 2023 10:43:30 -0500
+  * 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

-pavucontrol-qt (1.2.0-1ubuntu3) lunar; urgency=medium
+ -- apt-ghetto <apt-ghetto@protonmail.com>  Wed, 18 Aug 2021 13:57:36 +0200

-  * Swap "pulseaudio | pipewire-pulse" to "pipewire-pulse | pulseaudio" in
-    debian/control to convince Germinate to grab the right package when the
-    Lubuntu ISO builds.
+pavucontrol-qt (0.16.0-1ubuntu2) hirsute; urgency=medium

- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Sun, 02 Apr 2023 15:10:28 -0500
+  * Restore correct upstream signing key.

-pavucontrol-qt (1.2.0-1ubuntu2) lunar; urgency=medium
-
-  [ Debian Janitor ]
-  * Set upstream metadata fields: Repository-Browse.
-
-  [ Aaron Rainbolt ]
-  * Revert a sync from Debian.
-  * Bumped Standards-Version to 4.6.2, no changes necessary.
-  * Updated copyright file.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Sun, 12 Feb 2023 17:33:26 -0600
-
-pavucontrol-qt (1.2.0-0ubuntu1) lunar; urgency=medium
-
-  * New upstream release.
-  * Fix the watch file, for real this time.
-  * Lubuntuify the package slightly, to make debhelper happy.
-  * Bump build dependencies in debian/control.
+ -- Rik Mills <rikmills@kde.org>  Sun, 21 Feb 2021 19:47:12 +0000

- -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 17 Nov 2022 16:43:15 -0600
+pavucontrol-qt (0.16.0-1ubuntu1) hirsute; urgency=medium

-pavucontrol-qt (1.1.0-1) experimental; urgency=medium
+  * Merge from Debian unstable. Remaining changes:
+    - Lubuntuify the package.
+    - Run wrap-and-sort

-  * 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/*
-
- -- Aaron Rainbolt <arraybolt3@gmail.com>  Sun, 10 Jul 2022 04:35:38 -0500
-
-pavucontrol-qt (0.16.0-2) unstable; urgency=medium
-
-  * Depend on either pulseaudio or pipewire-pulse (Closes: #995690)
-
- -- Arto Jantunen <viiru@debian.org>  Wed, 03 Nov 2021 12:41:14 +0200
+ -- Rik Mills <rikmills@kde.org>  Sun, 31 Jan 2021 17:05:03 +0000

 pavucontrol-qt (0.16.0-1) unstable; urgency=medium

@ -74,6 +36,22 @@ pavucontrol-qt (0.16.0-1) unstable; urgency=medium

 -- Andrew Lee (李健秋) <ajqlee@debian.org>  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 <tsimonq2@ubuntu.com>  Thu, 04 Jun 2020 00:17:27 -0500
+
+pavucontrol-qt (0.14.1-1ubuntu1) disco; urgency=medium
+
+  * Lubuntuify the package.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 09 Mar 2019 12:29:43 -0600
+
 pavucontrol-qt (0.14.1-1) unstable; urgency=medium

  * Cherry-picked upstream release 0.14.1.
--- a/debian/control
+++ b/debian/control
@ -1,11 +1,7 @@
 Source: pavucontrol-qt
 Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
 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>,
-           Simon Quigley <tsimonq2@debian.org>,
-           Aaron Rainbolt <arraybolt3@gmail.com>
+Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
 Section: utils
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
@ -13,19 +9,18 @@ Build-Depends: debhelper-compat (= 13),
               libpulse-dev,
               libqt5svg5-dev,
               libqt5x11extras5-dev,
-               lxqt-build-tools (>= 0.13.0),
+               lxqt-build-tools (>= 0.9.0),
               xdg-user-dirs
-Standards-Version: 4.6.2
-Vcs-Browser: https://git.lubuntu.me/Lubuntu/pavucontrol-qt-packaging
-Vcs-Git: https://git.lubuntu.me/Lubuntu/pavucontrol-qt-packaging.git
+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
 Homepage: https://github.com/lxqt/pavucontrol-qt
-Rules-Requires-Root: no

 Package: pavucontrol-qt
 Architecture: any
-Depends: pipewire-pulse | pulseaudio, ${misc:Depends}, ${shlibs:Depends}
+Depends: pulseaudio, ${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
--- a/debian/copyright
+++ b/debian/copyright
@ -3,12 +3,9 @@ Upstream-Name: pavucontrol-qt
 Source: https://github.com/lxqt/pavucontrol-qt

 Files: *
-Copyright: 2016-2023 LXQt team
-License: GPL-2.0
-
-Files: src/elidinglabel.cc
-       src/elidinglabel.h
-Copyright: 2016-2023 LXQt team
+Copyright: 2016-2019 LXQt team
+           2016-2017 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
+           2016-2017 Palo Kisa <palo.kisa@gmail.com>
 License: GPL-2.0+

 Files: src/cardwidget.cc
@ -21,7 +18,6 @@ Files: src/cardwidget.cc
       src/mainwindow.h
       src/minimalstreamwidget.cc
       src/minimalstreamwidget.h
-       src/pavucontrol.cc
       src/pavucontrol.h
       src/rolewidget.cc
       src/rolewidget.h
@ -35,36 +31,19 @@ Files: src/cardwidget.cc
       src/sourcewidget.h
       src/streamwidget.cc
       src/streamwidget.h
-Copyright: 2008      Sjoerd Simons <sjoerd@luon.net>
-           2006-2009 Lennart Poettering
-           2009-2011 Colin Guthrie <mzcnihpbageby@0pointer.de>
-           2016      Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
+Copyright: 2006-2008 Lennart Poettering
+           2009      Colin Guthrie
 License: GPL-2.0+

-Files: debian/*
-Copyright: 2015      Andrew Lee <ajqlee@debian.org>
-           2015      Shih-Yuan Lee (FourDollars) <fourdollars@gmail.com>
-           2014-2016 ChangZhuo Chen <czchen@gmail.com>
-           2016      Yuan CHAO <yuanchao@gmail.com>
-           2014-2019 Alf Gaida <agaida@siduction.org>
-           2021      apt-ghetto <apt-ghetto@protonmail.com>
-           2021-2022 Rik Mills <rikmills@kde.org>
-           2023      Aaron Rainbolt <arraybolt3@gmail.com>
-           2019-2023 Simon Quigley <tsimonq2@ubuntu.com>
+Files: src/pavucontrol.cc
+Copyright: 2006-2008 Lennart Poettering
+           2008      Sjoerd Simons <sjoerd@luon.net>
 License: GPL-2.0+

-License: GPL-2.0
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- On Debian systems, the complete text of the GNU General Public License
- version 2 can be found in "/usr/share/common-licenses/GPL-2".
+Files: debian/*
+Copyright: 2021,      Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+           2016-2019, Alf Gaida <agaida@siduction.org>
+License: GPL-2.0+

 License: GPL-2.0+
 This program is free software; you can redistribute it and/or modify
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@ -1,5 +0,0 @@
-[DEFAULT]
-debian-branch = debian/sid
-upstream-branch = upstream/latest
-pristine-tar = True
-compression = xz
--- 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

--- 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
@ -3,4 +3,5 @@ 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
+Repository-Browser: https://github.com/lxqt/pavucontrol-qt
+
--- 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/pavucontrol-qt/releases .*/pavucontrol-qt-([\d\.]+).tar.xz