[Pkg-alsa-devel] Bug#1015753: alsa-plugins: Ubuntu-specific debian/rules handling no longer correct, should be dropped

[Steve Langasek]

Package: alsa-plugins
Version: 1.2.7.1-1
Severity: minor
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu kinetic ubuntu-patch

Dear maintainers,

The alsa-plugins package currently has logic to disable certain plugins when
building on Ubuntu.  The Ubuntu archive reasons for disabling them no longer
apply and this Ubuntu-specific logic should be dropped.  Please find a patch
attached.

Included in this patch is a Conflicts/Replaces/Provides against
libasound2-plugins-extra, the name of the Ubuntu-specific package where
these plugins were being shipped instead.  Ubuntu needs this for upgrades;
if you don't want it in Debian, we will carry this as a delta in Ubuntu.

Thanks for considering,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                   https://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
diff -Nru alsa-plugins-1.2.7.1/debian/control alsa-plugins-1.2.7.1/debian/control
--- alsa-plugins-1.2.7.1/debian/control	2022-07-05 19:18:58.000000000 -0700
+++ alsa-plugins-1.2.7.1/debian/control	2022-07-20 06:26:37.000000000 -0700
@@ -26,6 +26,9 @@
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Conflicts: libasound2-plugins-extra
+Replaces: libasound2-plugins-extra
+Provides: libasound2-plugins-extra
 Description: ALSA library additional plugins
  This package contains plugins for the ALSA library that are
  not included in the main libasound2 package.
diff -Nru alsa-plugins-1.2.7.1/debian/rules alsa-plugins-1.2.7.1/debian/rules
--- alsa-plugins-1.2.7.1/debian/rules	2020-08-20 12:34:14.000000000 -0700
+++ alsa-plugins-1.2.7.1/debian/rules	2022-07-20 06:21:29.000000000 -0700
@@ -3,17 +3,12 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs
 
-ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
-LIBAV=--disable-libav --disable-a52 --disable-lavrate
-endif
-
 %:
 	dh $@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		--with-plugindir=/usr/lib/$(DEB_HOST_MULTIARCH)/alsa-lib \
-		$(LIBAV) \
 		--disable-static
 
 override_dh_auto_install: