Package: osspd
Version: 1.3.2-12.1
Severity: important
Tags: patch pending
X-Debbugs-Cc: Sébastien Noel <sebast...@twolife.be>
In #987874 the release team indicated that they would not accept osspd
into bullseye with a debhelper compat bump at this stage of the freeze.
See https://release.debian.org/bullseye/freeze_policy.html for details of
the freeze policy, and note that we have been in the "Hard Freeze" stage
since March, as announced on debian-devel-announce.
I'd like to have osspd in bullseye (I maintain game-data-packager, which
generates some packages that need it) so I've prepared a version of osspd
that reverts the compat bump. Because this is a non-maintainer upload (see
https://www.debian.org/doc/manuals/developers-reference/pkgs.en.html#non-maintainer-uploads-nmus
for more information about NMUs) I have uploaded it to the DELAYED queue
to give the real maintainers a chance to respond. It will go into unstable
in 7 days, unless someone takes further action.
My changes are attached, but you will probably find it easier to review
and fetch them from <https://salsa.debian.org/smcv/osspd.git>. I've tested
this version with the "splay" package and found that it can play a MP3 file
successfully, although there is some crackling/distortion (which also seems
to be present with 1.3.2-12).
If you are happy with this change, please say so, and I can move the upload
out of the DELAYED queue and into unstable immediately.
Conversely, if you have changed your mind and don't want this change,
please say so and I can cancel the delayed upload.
I am unsure whether the release team will be willing to unblock with the
two commits cherry-picked from upstream git included in the package. If
they are not, another upload that additionally reverts one or both of
those commits might be necessary. We are less likely to need to revert
them if we can justify why they are required.
d/p/GIT-fix-adsp_se.patch looks like it might be fixing a genuine bug. Can
you describe the bug that it is fixing and why it should be applied in
bullseye?
d/p/GIT-fix-compiler-warnings.patch looks like it is just silencing
compiler warnings by removing unreachable code. Do we really need this
for bullseye? If it is not strictly necessary then it might be safer to
revert it until after bullseye has been released.
After bullseye is released and the freeze is over, you can reapply the
changes that I've reverted and upload to unstable in the usual way. The
beginning of a release cycle is a more appropriate time to be making
non-critical changes.
If you want to get the cleanup/non-critical changes into Debian without
having them block the freeze/release process, the way to do that is to
upload to experimental. For example, if you look at the flatpak and dbus
packages, you'll see that there is a newer version in experimental that
would not be suitable for bullseye.
Thanks for maintaining osspd,
smcv
>From c81fc9d25d4a6338f22fbdbb7bbf5d382b4ad677 Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Mon, 21 Jun 2021 09:56:01 +0100
Subject: [PATCH 1/2] Revert debhelper compat bump
At this point in the freeze, a debhelper compat level change is
considered unnecessarily risky.
---
debian/compat | 1 +
debian/control | 3 +--
debian/rules | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
create mode 100644 debian/compat
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
index ee044ca..f336a30 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: sound
Priority: optional
Maintainer: Ralf Jung <p...@ralfj.de>
Uploaders: Sébastien Noel <sebast...@twolife.be>
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: debhelper (>= 9.20160709),
libasound2-dev,
libfuse-dev,
libpulse-dev
@@ -15,7 +15,6 @@ Vcs-Git: git://ralfj.de/osspd.git
Package: osspd
Architecture: linux-any
Multi-Arch: foreign
-Pre-Depends: ${misc:Pre-Depends}
Depends: lsb-base (>= 3.2-14),
osspd-pulseaudio | osspd-backend,
${misc:Depends},
diff --git a/debian/rules b/debian/rules
index 2a38240..9b9a0a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ SLAVESDIR=/usr/lib/osspd
UDEVDIR=/lib/udev/rules.d
%:
- dh $@
+ dh $@ --parallel --with=systemd
override_dh_auto_build:
dh_auto_build -- SLAVESDIR=$(SLAVESDIR) UDEVDIR=$(UDEVDIR)
@@ -16,7 +16,7 @@ override_dh_strip:
dh_strip --ddeb-migration='osspd-dbg (<< 1.3.2-7~)'
override_dh_install:
- dh_install
+ dh_install --fail-missing
# adding kmod integration
install -D -m 0644 debian/osspd.kmod debian/osspd/lib/modules-load.d/osspd.conf
--
2.32.0
>From 3efb23d0ec070c92049e4698a90e266da2cdc1c2 Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Mon, 21 Jun 2021 10:18:31 +0100
Subject: [PATCH 2/2] Prepare NMU
---
debian/changelog | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 9481d07..5b456ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+osspd (1.3.2-12.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Revert debhelper compat bump to try to get #986662 fixed in bullseye.
+ At this point in the freeze, a debhelper compat level change is
+ considered unnecessarily risky.
+
+ -- Simon McVittie <s...@debian.org> Mon, 21 Jun 2021 10:17:56 +0100
+
osspd (1.3.2-12) unstable; urgency=low
[ Sébastien Noel ]
--
2.32.0
