Control: tag -1 patch Dear maintainer,
greetings from the BSP currently taking place in Karlsruhe. Here's a patch that fixes the configure script to make use of pkg-config to detect freetype2. Because I could not be bothered to find out how to use dh-autoreconf with old Debhelper-based debian/rules, I took the liberty to clean up debian/rules and bump the DH compat level... I have uploaded the resulting package to DELAYED/15; feel free to reschedule or cancel my upload as you see fit. Cheers, -Hilko
diff -Nru otf2bdf-3.1/debian/changelog otf2bdf-3.1/debian/changelog --- otf2bdf-3.1/debian/changelog 2017-10-24 10:40:21.000000000 +0200 +++ otf2bdf-3.1/debian/changelog 2018-10-26 22:55:05.000000000 +0200 @@ -1,3 +1,10 @@ +otf2bdf (3.1-4.1) unstable; urgency=medium + + * Non-maintainer upload + * Detect freetype2 via pkg-config, modernize package (Closes: #892336) + + -- Hilko Bengen <ben...@debian.org> Fri, 26 Oct 2018 22:55:05 +0200 + otf2bdf (3.1-4) unstable; urgency=medium * Upgraded Standards-Version from 3.9.3 to 4.1.1 diff -Nru otf2bdf-3.1/debian/compat otf2bdf-3.1/debian/compat --- otf2bdf-3.1/debian/compat 2012-11-30 14:20:41.000000000 +0100 +++ otf2bdf-3.1/debian/compat 2018-10-26 22:36:05.000000000 +0200 @@ -1 +1 @@ -9 +10 diff -Nru otf2bdf-3.1/debian/control otf2bdf-3.1/debian/control --- otf2bdf-3.1/debian/control 2017-10-24 10:40:21.000000000 +0200 +++ otf2bdf-3.1/debian/control 2018-10-26 22:36:02.000000000 +0200 @@ -2,8 +2,9 @@ Section: utils Priority: optional Maintainer: Miriam Ruiz <mir...@debian.org> -Build-Depends: debhelper (>= 9), quilt, autotools-dev, - zlib1g-dev, libfreetype6-dev +Build-Depends: debhelper (>= 10), quilt, autotools-dev, + zlib1g-dev, libfreetype6-dev, + pkg-config, Standards-Version: 4.1.1 Homepage: http://www.math.nmsu.edu/~mleisher/Software/otf2bdf/ diff -Nru otf2bdf-3.1/debian/patches/freetype2.patch otf2bdf-3.1/debian/patches/freetype2.patch --- otf2bdf-3.1/debian/patches/freetype2.patch 1970-01-01 01:00:00.000000000 +0100 +++ otf2bdf-3.1/debian/patches/freetype2.patch 2018-10-26 22:43:23.000000000 +0200 @@ -0,0 +1,26 @@ +Index: otf2bdf/configure.in +=================================================================== +--- otf2bdf.orig/configure.in ++++ otf2bdf/configure.in +@@ -3,12 +3,16 @@ dnl Process this file with autoconf to p + AC_INIT(otf2bdf.c) + + AC_PROG_CC ++PKG_PROG_PKG_CONFIG + +-OLDLIBS=$LIBS +-LIBS="$LIBS `freetype-config --libs`" +-CPPFLAGS="$CPPFLAGS `freetype-config --cflags`" +-AC_CHECK_LIB(freetype, FT_Init_FreeType, LIBS="$LIBS -lfreetype",[ +- AC_MSG_ERROR([Can't find Freetype library! Compile FreeType first.])]) ++PKG_CHECK_MODULES( ++ [FREETYPE], ++ [freetype2], ++ [ ++ CFLAGS="$CFLAGS $FREETYPE_CFLAGS" ++ LIBS="$LIBS $FREETYPE_LIBS" ++ ], ++ [AC_MSG_ERROR([Can't find Freetype library])]) + AC_SUBST(LIBS) + + dnl get Compiler flags right. diff -Nru otf2bdf-3.1/debian/patches/series otf2bdf-3.1/debian/patches/series --- otf2bdf-3.1/debian/patches/series 2017-10-24 10:40:21.000000000 +0200 +++ otf2bdf-3.1/debian/patches/series 2018-10-26 22:17:06.000000000 +0200 @@ -1,2 +1,3 @@ mkinstalldirs.patch args.patch +freetype2.patch diff -Nru otf2bdf-3.1/debian/rules otf2bdf-3.1/debian/rules --- otf2bdf-3.1/debian/rules 2012-11-30 14:22:48.000000000 +0100 +++ otf2bdf-3.1/debian/rules 2018-10-26 22:47:45.000000000 +0200 @@ -3,85 +3,10 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) -CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) -LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -LDFLAGS2:=-Wl,-z,defs -Wl,-as-needed -Wl,--no-undefined - -config.status: configure - dh_testdir - [ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make patch - [ ! -d debian/pixmaps ] || { cd debian/pixmaps && for i in *.sng; do sng "$$i"; done; } - -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess -endif - - ./configure \ - --prefix=/usr \ - --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info \ - CFLAGS="$(CFLAGS) $(CPPFLAGS)" \ - CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS)" \ - LDFLAGS="$(LDFLAGS) $(LDFLAGS2)" - -build-stamp: config.status - dh_testdir - $(MAKE) - touch $@ - -build-indep: build-stamp - -build-arch: build-stamp - -build: build-arch build-indep - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - [ ! -f Makefile ] || $(MAKE) distclean - rm -rf config.sub config.guess config.status config.log config.cache - [ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make unpatch - [ ! -d debian/pixmaps ] || rm -vf debian/pixmaps/*.png - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - $(MAKE) \ - prefix=$(CURDIR)/debian/otf2bdf/usr \ +override_dh_auto_install: + dh_auto_install -- \ MKINSTALLDIRS="mkdir -p" \ - install - -# Build architecture-independent files here. -binary-indep: build install - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples - dh_installman otf2bdf.man - dh_install - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build-arch build-indep build clean binary-indep binary-arch binary install + prefix=$(CURDIR)/debian/otf2bdf/usr +%: + dh $@ --with=quilt,autoreconf
