diff -Nru alsaequal-0.6/debian/changelog alsaequal-0.6/debian/changelog --- alsaequal-0.6/debian/changelog 2016-12-12 07:34:48.000000000 +0000 +++ alsaequal-0.6/debian/changelog 2020-04-21 17:12:12.000000000 +0000 @@ -1,3 +1,37 @@ +alsaequal (0.6-8~18.04.sav0) bionic; urgency=medium + + * Backport to Bionic + * debian/control: Set debhelper-compat (= 11) BD + + -- Rob Savoury Tue, 21 Apr 2020 10:12:12 -0700 + +alsaequal (0.6-8) unstable; urgency=medium + + * Team upload + + [ Helmut Grohne ] + * Fix FTCBFS: Force using $(CC) as $(LD). (Closes: #865743) + + [ Ondřej Nový ] + * d/copyright: Use https protocol in Format field + * d/control: Set Vcs-* to salsa.debian.org + + [ Felipe Sateler ] + * Change maintainer address to debian-multimedia@lists.debian.org + + [ Ondřej Nový ] + * Use debhelper-compat instead of debian/compat + + [ Sebastian Ramacher ] + * debian/rules: Use dpkg's architecture.mk + * debian/control: + - Remove obsolete Pre-Depends + - Bump debhelper compat to 12 + - Bump Standards-Version + * debian/patches: Fix link order (Closes: #882378) + + -- Sebastian Ramacher Sun, 08 Dec 2019 19:12:04 +0100 + alsaequal (0.6-7) unstable; urgency=medium * Remove myself from the uploaders list. diff -Nru alsaequal-0.6/debian/compat alsaequal-0.6/debian/compat --- alsaequal-0.6/debian/compat 2016-01-22 22:24:54.000000000 +0000 +++ alsaequal-0.6/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -Nru alsaequal-0.6/debian/control alsaequal-0.6/debian/control --- alsaequal-0.6/debian/control 2016-01-22 22:24:54.000000000 +0000 +++ alsaequal-0.6/debian/control 2020-04-21 17:12:12.000000000 +0000 @@ -1,17 +1,17 @@ Source: alsaequal Priority: optional Section: libs -Maintainer: Debian Multimedia Maintainers +Maintainer: Debian Multimedia Maintainers Uploaders: Alessandro Ghedini Build-Depends: - debhelper (>= 9), + debhelper-compat (= 11), ladspa-sdk, libasound2-dev -Standards-Version: 3.9.4 +Standards-Version: 4.4.1 Homepage: http://www.thedigitalmachine.net/alsaequal.html -Vcs-Git: git://anonscm.debian.org/pkg-multimedia/alsaequal.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/alsaequal.git +Vcs-Git: https://salsa.debian.org/multimedia-team/alsaequal.git +Vcs-Browser: https://salsa.debian.org/multimedia-team/alsaequal Package: libasound2-plugin-equal Architecture: linux-any @@ -19,8 +19,6 @@ caps (>= 0.9.11), ${misc:Depends}, ${shlibs:Depends} -Pre-Depends: - ${misc:Pre-Depends} Multi-Arch: same Description: equalizer plugin for ALSA Alsaequal is a real-time adjustable equalizer plugin for ALSA. It can diff -Nru alsaequal-0.6/debian/copyright alsaequal-0.6/debian/copyright --- alsaequal-0.6/debian/copyright 2016-01-22 22:24:54.000000000 +0000 +++ alsaequal-0.6/debian/copyright 2019-12-08 17:48:19.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Alsaequal Upstream-Contact: Charles Eidsness Source: http://www.thedigitalmachine.net/alsaequal.html diff -Nru alsaequal-0.6/debian/patches/0006-Fix-link-order.patch alsaequal-0.6/debian/patches/0006-Fix-link-order.patch --- alsaequal-0.6/debian/patches/0006-Fix-link-order.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsaequal-0.6/debian/patches/0006-Fix-link-order.patch 2019-12-08 18:10:03.000000000 +0000 @@ -0,0 +1,44 @@ +From: Sebastian Ramacher +Date: Sun, 8 Dec 2019 19:10:00 +0100 +Subject: Fix link order + +--- + Makefile | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Makefile b/Makefile +index aab028c..fedc681 100644 +--- a/Makefile ++++ b/Makefile +@@ -7,14 +7,14 @@ Q ?= @ + CC := gcc + CFLAGS += -I. -Wall -funroll-loops -ffast-math -fPIC -DPIC + LD := gcc +-LDFLAGS += -Wall -shared -lasound ++LDFLAGS += -Wall -shared + + SND_PCM_OBJECTS = pcm_equal.o ladspa_utils.o +-SND_PCM_LIBS = ++SND_PCM_LIBS = -lasound + SND_PCM_BIN = libasound_module_pcm_equal.so + + SND_CTL_OBJECTS = ctl_equal.o ladspa_utils.o +-SND_CTL_LIBS = ++SND_CTL_LIBS = -lasound + SND_CTL_BIN = libasound_module_ctl_equal.so + + LIBDIR = lib +@@ -31,11 +31,11 @@ dep: + + $(SND_PCM_BIN): $(SND_PCM_OBJECTS) + @echo LD $@ +- $(Q)$(LD) $(LDFLAGS) $(SND_PCM_LIBS) $(SND_PCM_OBJECTS) -o $(SND_PCM_BIN) ++ $(Q)$(LD) $(LDFLAGS) $(SND_PCM_OBJECTS) $(SND_PCM_LIBS) -o $(SND_PCM_BIN) + + $(SND_CTL_BIN): $(SND_CTL_OBJECTS) + @echo LD $@ +- $(Q)$(LD) $(LDFLAGS) $(SND_CTL_LIBS) $(SND_CTL_OBJECTS) -o $(SND_CTL_BIN) ++ $(Q)$(LD) $(LDFLAGS) $(SND_CTL_OBJECTS) $(SND_CTL_LIBS) -o $(SND_CTL_BIN) + + %.o: %.c + @echo GCC $< diff -Nru alsaequal-0.6/debian/patches/03_multiarch-dirs.patch alsaequal-0.6/debian/patches/03_multiarch-dirs.patch --- alsaequal-0.6/debian/patches/03_multiarch-dirs.patch 2016-01-22 22:24:54.000000000 +0000 +++ alsaequal-0.6/debian/patches/03_multiarch-dirs.patch 2019-12-08 18:11:48.000000000 +0000 @@ -1,4 +1,4 @@ -Description: Allow to override installation dir +Description: Allow one to override installation dir Author: Reinhard Tartler Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=635005 Forwarded: charles@thedigitalmachine.net diff -Nru alsaequal-0.6/debian/patches/series alsaequal-0.6/debian/patches/series --- alsaequal-0.6/debian/patches/series 2016-01-22 22:24:54.000000000 +0000 +++ alsaequal-0.6/debian/patches/series 2019-12-08 18:10:03.000000000 +0000 @@ -3,3 +3,4 @@ 04_dpkg-buildflags.patch 05_fix-eq-name.patch 06_fix-caps-error.patch +0006-Fix-link-order.patch diff -Nru alsaequal-0.6/debian/rules alsaequal-0.6/debian/rules --- alsaequal-0.6/debian/rules 2016-01-22 22:24:54.000000000 +0000 +++ alsaequal-0.6/debian/rules 2019-12-08 17:59:53.000000000 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/make -f -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +include /usr/share/dpkg/architecture.mk LIBDIR = lib/$(DEB_HOST_MULTIARCH) # disable quiet build so that build flags are visible (cfr. #662695) @@ -12,6 +12,9 @@ override_dh_clean: dh_clean -XMakefile~ +override_dh_auto_build: + dh_auto_build -- LD='$$(CC)' + override_dh_auto_install: make install LIBDIR=$(LIBDIR) DESTDIR=debian/libasound2-plugin-equal dh_install --sourcedir=debian/config equal.conf \