From 7793e94e323a459279d8f5d99227e9c8256f79d5 Mon Sep 17 00:00:00 2001 From: Christopher Knadle Date: Mon, 22 Oct 2018 00:10:18 +0000 Subject: [PATCH] Import Debian changes 1.3.0~svn316-2.4 libg15render (1.3.0~svn316-2.4) unstable; urgency=medium * Non-maintainer upload. * debian/control: - Add pkg-config and quilt to Build-Depends * debian/patches: - Add 01-pkg-config-configure-in.patch to use pkg-config (Closes: #892334) * debian/source/format: - Use 3.0 (quilt) format --- debian/changelog | 12 ++++++++++++ debian/control | 2 +- debian/patches/01-pkg-config-configure-in.patch | 11 +++++++++++ debian/patches/series | 1 + debian/source/format | 1 + 5 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 debian/patches/01-pkg-config-configure-in.patch create mode 100644 debian/patches/series create mode 100644 debian/source/format diff --git a/debian/changelog b/debian/changelog index 9b103e2..3be7535 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +libg15render (1.3.0~svn316-2.4) unstable; urgency=medium + + * Non-maintainer upload. + * debian/control: + - Add pkg-config and quilt to Build-Depends + * debian/patches: + - Add 01-pkg-config-configure-in.patch to use pkg-config (Closes: #892334) + * debian/source/format: + - Use 3.0 (quilt) format + + -- Christopher Knadle Mon, 22 Oct 2018 00:10:18 +0000 + libg15render (1.3.0~svn316-2.3) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/control b/debian/control index cadbd36..b6cf3b3 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: Giacomo Catenazzi Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtool, automake1.11, - libg15-dev, libusb-dev, libfreetype6-dev + libg15-dev, libusb-dev, libfreetype6-dev, pkg-config, quilt Standards-Version: 3.8.2 Homepage: http://www.g15tools.com diff --git a/debian/patches/01-pkg-config-configure-in.patch b/debian/patches/01-pkg-config-configure-in.patch new file mode 100644 index 0000000..829231e --- /dev/null +++ b/debian/patches/01-pkg-config-configure-in.patch @@ -0,0 +1,11 @@ +--- a/configure.in ++++ b/configure.in +@@ -17,7 +17,7 @@ + AC_ARG_ENABLE(ttf, [ --enable-ttf enable FreeType2 support], + if [[[ "$enableval" = "yes" ]]]; then + AC_DEFINE(TTF_SUPPORT, [1], [Define to 1 to enable FreeType2 support]) +- CFLAGS="$CFLAGS `freetype-config --cflags`" ++ CFLAGS="$CFLAGS `pkg-config --cflags freetype2`" + FTLIB="-lfreetype" + ttf_support="yes" + else diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..0de138d --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01-pkg-config-configure-in.patch diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt)