diff -Nru zita-alsa-pcmi-0.3.2/debian/changelog zita-alsa-pcmi-0.3.2/debian/changelog --- zita-alsa-pcmi-0.3.2/debian/changelog 2020-02-03 19:36:38.000000000 +0000 +++ zita-alsa-pcmi-0.3.2/debian/changelog 2020-08-10 16:13:22.000000000 +0000 @@ -1,3 +1,19 @@ +zita-alsa-pcmi (0.3.2-2) unstable; urgency=medium + + [ Helmut Grohne ] + * Fix FTCBFS: Let dh_auto_build pass cross tools to make. + (Closes: #950750) + + [ Dennis Braun ] + * Add me as uploader + * Bump dh-compat to 13 + * Refresh patchset + * Fix zita-alsa-pcmi-utils installation + * Add libzita-alsa-pcmi-dev as B-D for the symbols + * d/rules: Remove -Wl,--as-needed ldflags + + -- Dennis Braun Mon, 10 Aug 2020 18:13:22 +0200 + zita-alsa-pcmi (0.3.2-1) unstable; urgency=medium * Team upload diff -Nru zita-alsa-pcmi-0.3.2/debian/control zita-alsa-pcmi-0.3.2/debian/control --- zita-alsa-pcmi-0.3.2/debian/control 2020-02-03 19:35:57.000000000 +0000 +++ zita-alsa-pcmi-0.3.2/debian/control 2020-04-30 21:56:02.000000000 +0000 @@ -2,9 +2,11 @@ Section: sound Priority: optional Maintainer: Debian Multimedia Maintainers -Uploaders: Jaromír Mikeš +Uploaders: + Dennis Braun , + Jaromír Mikeš Build-Depends: - debhelper-compat (= 12), + debhelper-compat (= 13), libasound2-dev Standards-Version: 4.5.0 Vcs-Git: https://salsa.debian.org/multimedia-team/zita-alsa-pcmi.git diff -Nru zita-alsa-pcmi-0.3.2/debian/libzita-alsa-pcmi0.symbols zita-alsa-pcmi-0.3.2/debian/libzita-alsa-pcmi0.symbols --- zita-alsa-pcmi-0.3.2/debian/libzita-alsa-pcmi0.symbols 2020-02-03 19:35:57.000000000 +0000 +++ zita-alsa-pcmi-0.3.2/debian/libzita-alsa-pcmi0.symbols 2020-08-10 16:08:30.000000000 +0000 @@ -1,4 +1,5 @@ libzita-alsa-pcmi.so.0 libzita-alsa-pcmi0 #MINVER# +* Build-Depends-Package: libzita-alsa-pcmi-dev (c++)"zita_alsa_pcmi_major_version()@Base" 0.2.0 (c++)"zita_alsa_pcmi_minor_version()@Base" 0.2.0 (c++)"Alsa_pcmi::capt_float(char const*, float*, int, int)@Base" 0.2.0 diff -Nru zita-alsa-pcmi-0.3.2/debian/patches/01-makefile.patch zita-alsa-pcmi-0.3.2/debian/patches/01-makefile.patch --- zita-alsa-pcmi-0.3.2/debian/patches/01-makefile.patch 2020-02-03 19:35:57.000000000 +0000 +++ zita-alsa-pcmi-0.3.2/debian/patches/01-makefile.patch 2020-08-10 16:13:22.000000000 +0000 @@ -2,12 +2,14 @@ Patch is applied to fix several build issues Author: Jaromír Mikeš Author: Dennis Braun -Last-Update: 2020-02-02 +Last-Update: 2020-08-10 Forwarded: no ---- a/source/Makefile -+++ b/source/Makefile -@@ -31,7 +31,6 @@ +Index: zita-alsa-pcmi/source/Makefile +=================================================================== +--- zita-alsa-pcmi.orig/source/Makefile ++++ zita-alsa-pcmi/source/Makefile +@@ -31,7 +31,6 @@ VERSION = $(MAJVERS).$(MINVERS) CPPFLAGS += -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS CXXFLAGS += -O2 -Wall -fPIC @@ -15,7 +17,7 @@ LDLFAGS += LDLIBS += -@@ -45,7 +44,7 @@ +@@ -45,7 +44,7 @@ ZITA-ALSA-PCMI_H = zita-alsa-pcmi.h $(ZITA-ALSA-PCMI_MIN): $(ZITA-ALSA-PCMI_O) @@ -24,7 +26,7 @@ install: $(ZITA-ALSA-PCMI_MIN) -@@ -53,8 +52,8 @@ +@@ -53,8 +52,8 @@ install: $(ZITA-ALSA-PCMI_MIN) install -d $(DESTDIR)$(LIBDIR) install -m 644 $(ZITA-ALSA-PCMI_H) $(DESTDIR)$(INCDIR) install -m 755 $(ZITA-ALSA-PCMI_MIN) $(DESTDIR)$(LIBDIR) @@ -35,3 +37,26 @@ uninstall: rm -rf $(DESTDIR)$(INCDIR)/$(ZITA-ALSA-PCMI_H) +Index: zita-alsa-pcmi/apps/Makefile +=================================================================== +--- zita-alsa-pcmi.orig/apps/Makefile ++++ zita-alsa-pcmi/apps/Makefile +@@ -48,14 +48,14 @@ $(ALSA_DELAY_O): + + + install: all +- install -d $(BINDIR) +- install -m 755 alsa_loopback $(DESTDIR)$(BINDIR) +- install -m 755 alsa_delay $(DESTDIR)$(BINDIR) ++ install -d $(DESTDIR)$(BINDIR) ++ install -m 755 alsa_loopback $(DESTDIR)$(BINDIR)/alsa_loopback ++ install -m 755 alsa_delay $(DESTDIR)$(BINDIR)/alsa_delay + + + uninstall: + rm -f $(DESTDIR)$(BINDIR)/alsa_loopback +- rm -f $(DESTDIR)$(BINDIR)/bin/alsa_delay ++ rm -f $(DESTDIR)$(BINDIR)/alsa_delay + + + clean: diff -Nru zita-alsa-pcmi-0.3.2/debian/patches/02-missing_include.patch zita-alsa-pcmi-0.3.2/debian/patches/02-missing_include.patch --- zita-alsa-pcmi-0.3.2/debian/patches/02-missing_include.patch 2020-02-03 19:35:57.000000000 +0000 +++ zita-alsa-pcmi-0.3.2/debian/patches/02-missing_include.patch 2020-08-10 15:46:32.000000000 +0000 @@ -1,19 +1,21 @@ Description: Make apps build with the libraries built by the same package. -Author: Alessio Treglia Forwarded: no --- +Author: Alessio Treglia Forwarded: no ---- a/apps/Makefile -+++ b/apps/Makefile -@@ -24,7 +24,7 @@ +Index: zita-alsa-pcmi/apps/Makefile +=================================================================== +--- zita-alsa-pcmi.orig/apps/Makefile ++++ zita-alsa-pcmi/apps/Makefile +@@ -24,7 +24,7 @@ PREFIX ?= /usr/local BINDIR ?= $(PREFIX)/bin VERSION = "0.3.2" -CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\" -+CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\" -I$(DESTDIR)$(PREFIX)/include -I../source ++CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\" -I../debian/tmp/usr/include -I../source CXXFLAGS += -O2 -Wall -@@ -32,7 +32,7 @@ +@@ -32,7 +32,7 @@ all: alsa_loopback alsa_delay ALSA_LOOPBACK_O = alsa_loopback.o pxthread.o @@ -22,7 +24,7 @@ alsa_loopback: $(ALSA_LOOPBACK_O) $(CXX) $(LDFLAGS) -o $@ $(ALSA_LOOPBACK_O) $(LDLIBS) $(ALSA_LOOPBACK_O): -@@ -40,7 +40,7 @@ +@@ -40,7 +40,7 @@ $(ALSA_LOOPBACK_O): ALSA_DELAY_O = alsa_delay.o mtdm.o pxthread.o diff -Nru zita-alsa-pcmi-0.3.2/debian/patches/04-spelling.patch zita-alsa-pcmi-0.3.2/debian/patches/04-spelling.patch --- zita-alsa-pcmi-0.3.2/debian/patches/04-spelling.patch 2020-02-03 19:36:38.000000000 +0000 +++ zita-alsa-pcmi-0.3.2/debian/patches/04-spelling.patch 2020-08-10 15:31:40.000000000 +0000 @@ -2,9 +2,11 @@ Author: Jaromír Mikeš Forwarded: no ---- a/source/zita-alsa-pcmi.cc -+++ b/source/zita-alsa-pcmi.cc -@@ -708,7 +708,7 @@ int Alsa_pcmi::set_hwpar (snd_pcm_t *han +Index: zita-alsa-pcmi/source/zita-alsa-pcmi.cc +=================================================================== +--- zita-alsa-pcmi.orig/source/zita-alsa-pcmi.cc ++++ zita-alsa-pcmi/source/zita-alsa-pcmi.cc +@@ -709,7 +709,7 @@ int Alsa_pcmi::set_hwpar (snd_pcm_t *han snd_pcm_hw_params_get_channels_max (hwpar, nchan); if (*nchan > 1024) { diff -Nru zita-alsa-pcmi-0.3.2/debian/rules zita-alsa-pcmi-0.3.2/debian/rules --- zita-alsa-pcmi-0.3.2/debian/rules 2020-02-03 19:35:57.000000000 +0000 +++ zita-alsa-pcmi-0.3.2/debian/rules 2020-08-09 19:59:06.000000000 +0000 @@ -1,7 +1,6 @@ #!/usr/bin/make -f export DEB_BUILD_MAINT_OPTIONS = hardening=+all -export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed export PREFIX=/usr export LIBDIR=$(PREFIX)/lib/$(DEB_HOST_MULTIARCH) export DESTDIR=$(CURDIR)/debian/tmp @@ -11,8 +10,8 @@ dh $@ -Smakefile override_dh_auto_build: - $(MAKE) -C source/ - $(MAKE) -C apps/ + dh_auto_build --sourcedirectory=source + dh_auto_build --sourcedirectory=apps override_dh_auto_clean: dh_auto_clean diff -Nru zita-alsa-pcmi-0.3.2/debian/zita-alsa-pcmi-utils.install zita-alsa-pcmi-0.3.2/debian/zita-alsa-pcmi-utils.install --- zita-alsa-pcmi-0.3.2/debian/zita-alsa-pcmi-utils.install 2020-02-03 19:35:57.000000000 +0000 +++ zita-alsa-pcmi-0.3.2/debian/zita-alsa-pcmi-utils.install 2020-08-10 16:02:52.000000000 +0000 @@ -1,2 +1,2 @@ -apps/alsa_delay usr/bin/ -apps/alsa_loopback usr/bin +usr/bin/alsa_delay +usr/bin/alsa_loopback