diff -Nru aeolus-0.9.7/debian/changelog aeolus-0.9.7/debian/changelog --- aeolus-0.9.7/debian/changelog 2020-01-20 16:03:26.000000000 +0000 +++ aeolus-0.9.7/debian/changelog 2020-02-15 08:42:42.000000000 +0000 @@ -1,3 +1,20 @@ +aeolus (0.9.7-2) unstable; urgency=medium + + [ Dennis Braun ] + * Fix FTCBFS (Closes: #950826) + + Pass a triplet-prefixed pkg-config + * d/control: + + Add me as an uploader + + Bump Standards Version to 4.5.0 + + Add libfreetype6-dev and pkg-config to B-D + + Set RRR: no + * d/patches/: Merge patches + + [ Sebastian Ramacher ] + * debian/rules: Remove unnecessary -Smakefile + + -- Dennis Braun Sat, 15 Feb 2020 09:42:42 +0100 + aeolus (0.9.7-1) unstable; urgency=medium * Team upload @@ -15,9 +32,8 @@ [ Dennis Braun ] * New upstream release (Closes: #901543) * d/control: - + Bump dh-compat version to 12 + + Bump dh-compat version to 12 + Bump Standards Version to 4.4.1 - + Add libfreetype6-dev and pkg-config to Build-Depends * d/copyright: + Update copyright year + Add myself diff -Nru aeolus-0.9.7/debian/control aeolus-0.9.7/debian/control --- aeolus-0.9.7/debian/control 2020-01-20 16:03:26.000000000 +0000 +++ aeolus-0.9.7/debian/control 2020-02-15 08:38:27.000000000 +0000 @@ -3,6 +3,7 @@ Priority: optional Maintainer: Debian Multimedia Maintainers Uploaders: + Dennis Braun , Free Ekanayaka , Jaromír Mikeš , Build-Depends: @@ -13,10 +14,13 @@ libjack-dev, libreadline-dev, libzita-alsa-pcmi-dev, -Standards-Version: 4.4.1 + libfreetype6-dev, + pkg-config +Standards-Version: 4.5.0 Vcs-Git: https://salsa.debian.org/multimedia-team/aeolus.git Vcs-Browser: https://salsa.debian.org/multimedia-team/aeolus Homepage: https://kokkinizita.linuxaudio.org/linuxaudio/aeolus/ +Rules-Requires-Root: no Package: aeolus Architecture: any diff -Nru aeolus-0.9.7/debian/patches/01-makefile.patch aeolus-0.9.7/debian/patches/01-makefile.patch --- aeolus-0.9.7/debian/patches/01-makefile.patch 2020-01-20 16:03:26.000000000 +0000 +++ aeolus-0.9.7/debian/patches/01-makefile.patch 2020-02-15 08:38:27.000000000 +0000 @@ -1,27 +1,18 @@ Author: Alessio Treglia -Description: Add DESTDIR and adjust PREFIX envvars. - Plus, fix FTBFS with binutils-gold. - Disable -march-native to fix FTBFS. - Add -pthread to the linking flags. - Install aeolus_*.so binaries into /usr/lib/aeolus since they are provided - for internal use only; inform aeolus about this change by passing the - proper value of the path from which it'll load the private libs. +Author: Dennis Braun +Description: Disable -march-native and add a proper pkgconf variable to fix FTBFS. Bug: http://bugs.debian.org/553630 Bug: http://bugs.debian.org/578278 -Last-Update: 2020-01-12 +Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=950826 +Last-Update: 2020-02-13 --- a/source/Makefile +++ b/source/Makefile -@@ -17,15 +17,13 @@ - # - # ------------------------------------------------------------------------- - --SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/') --PREFIX ?= /usr/local -+PREFIX ?= /usr +@@ -21,11 +21,11 @@ + PREFIX ?= /usr/local BINDIR ?= $(PREFIX)/bin --LIBDIR ?= $(PREFIX)/lib$(SUFFIX) -+LIBDIR ?= $(PREFIX)/lib/aeolus + LIBDIR ?= $(PREFIX)/lib$(SUFFIX) ++PKG_CONF ?= pkgconf VERSION = 0.9.7 CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\" -DLIBDIR=\"$(LIBDIR)\" @@ -30,7 +21,16 @@ all: aeolus aeolus_x11.so aeolus_txt.so -@@ -74,7 +72,6 @@ +@@ -45,7 +45,7 @@ + XIFACE_O = styles.o mainwin.o midiwin.o audiowin.o instrwin.o editwin.o \ + midimatrix.o multislider.o functionwin.o xiface.o addsynth.o + aeolus_x11.so: CPPFLAGS += -D_REENTRANT +-aeolus_x11.so: CPPFLAGS += $(shell pkgconf --cflags freetype2) ++aeolus_x11.so: CPPFLAGS += $(shell $(PKG_CONF) --cflags freetype2) + aeolus_x11.so: CXXFLAGS += -shared -fPIC + aeolus_x11.so: LDFLAGS += -shared + aeolus_x11.so: LDLIBS += -lclthreads -lclxclient -lpthread -lXft -lX11 +@@ -74,7 +74,6 @@ install -m 755 aeolus $(DESTDIR)$(BINDIR) install -m 755 aeolus_x11.so $(DESTDIR)$(LIBDIR) install -m 755 aeolus_txt.so $(DESTDIR)$(LIBDIR) diff -Nru aeolus-0.9.7/debian/patches/02-pkg-config_fix.patch aeolus-0.9.7/debian/patches/02-pkg-config_fix.patch --- aeolus-0.9.7/debian/patches/02-pkg-config_fix.patch 2020-01-20 16:03:26.000000000 +0000 +++ aeolus-0.9.7/debian/patches/02-pkg-config_fix.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -From: Dennis Braun -Date: Sun, 12 Jan 2020 19:27:21 +0100 -Subject: Fix pkg-config command in Makefile -Forwarded: no - ---- a/source/Makefile -+++ b/source/Makefile -@@ -45,7 +45,7 @@ - XIFACE_O = styles.o mainwin.o midiwin.o audiowin.o instrwin.o editwin.o \ - midimatrix.o multislider.o functionwin.o xiface.o addsynth.o - aeolus_x11.so: CPPFLAGS += -D_REENTRANT --aeolus_x11.so: CPPFLAGS += $(shell pkgconf --cflags freetype2) -+aeolus_x11.so: CPPFLAGS += $(shell pkg-config --cflags freetype2) - aeolus_x11.so: CXXFLAGS += -shared -fPIC - aeolus_x11.so: LDFLAGS += -shared - aeolus_x11.so: LDLIBS += -lclthreads -lclxclient -lpthread -lXft -lX11 diff -Nru aeolus-0.9.7/debian/patches/series aeolus-0.9.7/debian/patches/series --- aeolus-0.9.7/debian/patches/series 2020-01-20 16:03:26.000000000 +0000 +++ aeolus-0.9.7/debian/patches/series 2020-02-15 08:38:27.000000000 +0000 @@ -1,2 +1 @@ 01-makefile.patch -02-pkg-config_fix.patch diff -Nru aeolus-0.9.7/debian/rules aeolus-0.9.7/debian/rules --- aeolus-0.9.7/debian/rules 2020-01-20 16:03:26.000000000 +0000 +++ aeolus-0.9.7/debian/rules 2020-02-15 08:39:35.000000000 +0000 @@ -6,8 +6,16 @@ export DESTDIR=$(CURDIR)/debian/aeolus +include /usr/share/dpkg/buildtools.mk + +export PKG_CONF=$(PKG_CONFIG) + +export PREFIX=/usr + +export LIBDIR=$(PREFIX)/lib/aeolus + %: - dh $@ -Smakefile -Dsource + dh $@ -Dsource override_dh_installchangelogs: dh_installchangelogs README