Commit 1f8d75a3 authored by Adrian Bunk's avatar Adrian Bunk Committed by Tobias Frost

Import Debian changes 1.0.11-2

tvtime (1.0.11-2) unstable; urgency=medium

  * QA upload.
  * Use pkg-config for finding freetype. (Closes: #892455)
parent 3cd50b94
This diff is collapsed.
This diff is collapsed.
tvtime (1.0.11-2) unstable; urgency=medium
* QA upload.
* Use pkg-config for finding freetype. (Closes: #892455)
-- Adrian Bunk <bunk@debian.org> Fri, 26 Oct 2018 18:32:26 +0300
tvtime (1.0.11-1) unstable; urgency=medium
* QA upload.
......
......@@ -3,7 +3,7 @@ Section: video
Priority: optional
Maintainer: Debian QA Group <packages@qa.debian.org>
Build-Depends:
debhelper (>= 7),
debhelper (>= 9.20160403~),
autotools-dev,
zlib1g-dev,
libpng-dev,
......
Description: Use pkg-config for finding freetype
Author: Adrian Bunk <bunk@debian.org>
Bug-Debian: https://bugs.debian.org/892455
--- tvtime-1.0.11.orig/configure.ac
+++ tvtime-1.0.11/configure.ac
@@ -71,10 +71,7 @@ dnl ------------------------------------
dnl freetype
dnl ---------------------------------------------
dnl Test for freetype
-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
-if test "$FREETYPE_CONFIG" = "no" ; then
- AC_MSG_ERROR(freetype2 needed and freetype-config not found)
-fi
+PKG_CHECK_MODULES(TTF, freetype2)
dnl ---------------------------------------------
dnl libxml2
--- tvtime-1.0.11.orig/src/Makefile.am
+++ tvtime-1.0.11/src/Makefile.am
@@ -19,9 +19,6 @@ pkgsysconfdir = $(sysconfdir)/@PACKAGE@
tmpdir = /tmp
localedir = $(datadir)/locale
-TTF_CFLAGS = `$(FREETYPE_CONFIG) --cflags`
-TTF_LIBS = `$(FREETYPE_CONFIG) --libs`
-
# Set the following if you want to specify an additional font directory
# FONT_CFLAGS = -DFONTDIR='/usr/share/fonts/truetype/freefont/'
saveconfig.diff
home.diff
freetype.patch
......@@ -33,6 +33,7 @@ CFLAGS += -Wall
config.status: configure
dh_testdir
dh_autotools-dev_updateconfig
dh_autoreconf
# Add here commands to configure the package.
./configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment