Control: tags 916130 + patch
Control: tags 916130 + pending
Dear maintainer,
I've prepared an NMU for zita-bls1 (versioned as 0.1.0-3.1) and uploaded
it to DELAYED/14. Please feel free to tell me if I should cancel it.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
diff -Nru zita-bls1-0.1.0/debian/changelog zita-bls1-0.1.0/debian/changelog
--- zita-bls1-0.1.0/debian/changelog 2016-12-27 14:29:40.000000000 +0200
+++ zita-bls1-0.1.0/debian/changelog 2019-01-11 13:30:27.000000000 +0200
@@ -1,3 +1,11 @@
+zita-bls1 (0.1.0-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix build without freetype-config and add a direct
+ build dependency on libfreetype6-dev. (Closes: #916130)
+
+ -- Adrian Bunk <b...@debian.org> Fri, 11 Jan 2019 13:30:27 +0200
+
zita-bls1 (0.1.0-3) unstable; urgency=medium
* Set dh/compat 10.
diff -Nru zita-bls1-0.1.0/debian/control zita-bls1-0.1.0/debian/control
--- zita-bls1-0.1.0/debian/control 2016-12-27 14:29:27.000000000 +0200
+++ zita-bls1-0.1.0/debian/control 2019-01-11 13:30:27.000000000 +0200
@@ -10,6 +10,7 @@
libclthreads-dev (>= 2.4.0),
libclxclient-dev (>= 3.9.0),
libfftw3-dev (>= 3.1.2-3.1),
+ libfreetype6-dev,
libjack-dev,
libpng-dev,
libzita-convolver-dev (>= 3.0.0)
diff -Nru zita-bls1-0.1.0/debian/patches/no-freetype-config.patch zita-bls1-0.1.0/debian/patches/no-freetype-config.patch
--- zita-bls1-0.1.0/debian/patches/no-freetype-config.patch 1970-01-01 02:00:00.000000000 +0200
+++ zita-bls1-0.1.0/debian/patches/no-freetype-config.patch 2019-01-11 13:30:27.000000000 +0200
@@ -0,0 +1,15 @@
+Description: freetype-config was removed, use pkg-config instead
+Author: Adrian Bunk <b...@debian.org>
+Bug-Debian: https://bugs.debian.org/916130
+
+--- zita-bls1-0.1.0.orig/source/Makefile
++++ zita-bls1-0.1.0/source/Makefile
+@@ -36,7 +36,7 @@ all: zita-bls1
+
+ ZITA-BLS1_O = zita-bls1.o styles.o jclient.o mainwin.o png2img.o guiclass.o rotary.o \
+ hp3filt.o lfshelf2.o shuffler.o
+-zita-bls1: CPPFLAGS += -I/usr/X11R6/include `freetype-config --cflags`
++zita-bls1: CPPFLAGS += -I/usr/X11R6/include `pkg-config --cflags freetype2`
+ zita-bls1: LDLIBS += -lzita-convolver -lfftw3f -lclxclient -lclthreads -ljack -lcairo -lpthread -lpng -lXft -lX11 -lrt
+ zita-bls1: LDFLAGS += -L/usr/X11R6/lib
+ zita-bls1: $(ZITA-BLS1_O)
diff -Nru zita-bls1-0.1.0/debian/patches/series zita-bls1-0.1.0/debian/patches/series
--- zita-bls1-0.1.0/debian/patches/series 2013-08-21 01:15:20.000000000 +0300
+++ zita-bls1-0.1.0/debian/patches/series 2019-01-11 13:30:27.000000000 +0200
@@ -1 +1,2 @@
01-fix_prefix.patch
+no-freetype-config.patch
