Control: tags 914645 + patch
Control: tags 914645 + pending
Dear maintainer,
I've prepared an NMU for zita-at1 (versioned as 0.6.0-1.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-at1-0.6.0/debian/changelog zita-at1-0.6.0/debian/changelog
--- zita-at1-0.6.0/debian/changelog 2017-08-11 03:21:29.000000000 +0300
+++ zita-at1-0.6.0/debian/changelog 2019-01-12 13:43:23.000000000 +0200
@@ -1,3 +1,10 @@
+zita-at1 (0.6.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix build without freetype-config. (Closes: #914645)
+
+ -- Adrian Bunk <b...@debian.org> Sat, 12 Jan 2019 13:43:23 +0200
+
zita-at1 (0.6.0-1) unstable; urgency=medium
* New upstream version 0.6.0
diff -Nru zita-at1-0.6.0/debian/patches/no-freetype-config.patch zita-at1-0.6.0/debian/patches/no-freetype-config.patch
--- zita-at1-0.6.0/debian/patches/no-freetype-config.patch 1970-01-01 02:00:00.000000000 +0200
+++ zita-at1-0.6.0/debian/patches/no-freetype-config.patch 2019-01-12 13:43:23.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/914645
+
+--- zita-at1-0.6.0.orig/source/Makefile
++++ zita-at1-0.6.0/source/Makefile
+@@ -34,7 +34,7 @@ all: zita-at1
+
+ ZITA-AT1_O = zita-at1.o styles.o jclient.o mainwin.o png2img.o guiclass.o \
+ button.o rotary.o tmeter.o retuner.o
+-zita-at1: CPPFLAGS += -I/usr/X11R6/include `freetype-config --cflags`
++zita-at1: CPPFLAGS += -I/usr/X11R6/include `pkg-config --cflags xft`
+ zita-at1: LDLIBS += -lcairo -lclxclient -lclthreads -lzita-resampler -lfftw3f -ljack -lpthread -lpng -lXft -lX11 -lrt
+ zita-at1: LDFLAGS += -L/usr/X11R6/lib
+ zita-at1: $(ZITA-AT1_O)
diff -Nru zita-at1-0.6.0/debian/patches/series zita-at1-0.6.0/debian/patches/series
--- zita-at1-0.6.0/debian/patches/series 2014-02-26 14:39:40.000000000 +0200
+++ zita-at1-0.6.0/debian/patches/series 2019-01-12 13:43:23.000000000 +0200
@@ -1 +1,2 @@
01-makefile.patch
+no-freetype-config.patch
