diff -Nru asc-2.6.1.0/debian/changelog asc-2.6.1.0/debian/changelog --- asc-2.6.1.0/debian/changelog 2018-07-27 16:13:12.000000000 +0000 +++ asc-2.6.1.0/debian/changelog 2018-10-21 14:50:17.000000000 +0000 @@ -1,3 +1,14 @@ +asc (2.6.1.0-5) unstable; urgency=medium + + * Add pkg-config-freetype.patch and use pkg-config to detect freetype2. + (Closes: #887600) + * Switch to compat level 11. Build with autoreconf. + * Build-depend on libcurl4-gnutls-dev or libcurl4-openssl-dev so that + auto-reconfiguration works. + * Declare compliance with Debian Policy 4.2.1. + + -- Markus Koschany Sun, 21 Oct 2018 16:50:17 +0200 + asc (2.6.1.0-4) unstable; urgency=medium * Declare compliance with Debian Policy 4.1.5. diff -Nru asc-2.6.1.0/debian/compat asc-2.6.1.0/debian/compat --- asc-2.6.1.0/debian/compat 2018-07-27 16:13:12.000000000 +0000 +++ asc-2.6.1.0/debian/compat 2018-10-21 14:11:53.000000000 +0000 @@ -1 +1 @@ -10 +11 diff -Nru asc-2.6.1.0/debian/control asc-2.6.1.0/debian/control --- asc-2.6.1.0/debian/control 2018-07-27 16:13:12.000000000 +0000 +++ asc-2.6.1.0/debian/control 2018-10-21 14:50:17.000000000 +0000 @@ -8,10 +8,11 @@ Barry deFreese , Markus Koschany Build-Depends: - debhelper (>= 10), + debhelper (>= 11), libboost-dev, libboost-regex-dev, libbz2-dev, + libcurl4-openssl-dev | libcurl4-gnutls-dev, libexpat1-dev, libfreetype6-dev, libjpeg-dev, @@ -26,7 +27,7 @@ libwxgtk3.0-dev, libxt-dev, zip -Standards-Version: 4.1.5 +Standards-Version: 4.2.1 Vcs-Git: https://anonscm.debian.org/git/pkg-games/asc.git Vcs-Browser: https://anonscm.debian.org/git/pkg-games/asc.git Homepage: http://www.asc-hq.org diff -Nru asc-2.6.1.0/debian/patches/pkg-config-freetype.patch asc-2.6.1.0/debian/patches/pkg-config-freetype.patch --- asc-2.6.1.0/debian/patches/pkg-config-freetype.patch 1970-01-01 00:00:00.000000000 +0000 +++ asc-2.6.1.0/debian/patches/pkg-config-freetype.patch 2018-10-21 14:37:07.000000000 +0000 @@ -0,0 +1,58 @@ +From: Markus Koschany +Date: Sun, 21 Oct 2018 16:03:30 +0200 +Subject: pkg-config freetype + +Check with pkg-config for freetype2. +Do not rely on removed freetype-config script anymore. + +Forwarded: no +--- + configure.ac | 28 ++++------------------------ + 1 file changed, 4 insertions(+), 24 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a602197..1191c48 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -383,6 +383,7 @@ AC_SUBST(SIGC_CFLAGS) + dnl *********************************** + dnl CHECKS FOR INCLUDED PARAGUI LIBRARY + ++ + ft2test=yes + AC_ARG_ENABLE(ft2test, + AS_HELP_STRING([--disable-ft2test],[disable the freetype check]), +@@ -395,30 +396,9 @@ if test "$ft2test" = "yes"; then + dnl freetype-config is missing. + + have_freetype=no +- AC_PATH_PROG(freetype_config,freetype-config,no) +- if test "$ac_cv_path_freetype_config" != "no"; then +- have_freetype=yes +- FREETYPE_CFLAGS="`$ac_cv_path_freetype_config --cflags`" +- FREETYPE_LIBS="`$ac_cv_path_freetype_config --libs`" +- else +- AC_CHECK_LIB(freetype,FT_Init_FreeType,have_freetype=yes) +- AC_CHECK_HEADER(ft2build.h,have_ft2build=yes) +- if test "$have_ft2build" != "yes"; then +- have_freetype="no" +- elif test "$have_freetype" = "yes"; then +- FREETYPE_LIBS="-lfreetype" +- ft2inc="no" +- AC_MSG_CHECKING(freetype2 include directory) +- if test -d /usr/local/include/freetype2; then +- ft2inc="/usr/local/include/freetype2" +- elif test -d /usr/include/freetype2; then +- ft2inc="/usr/include/freetype2" +- fi +- AC_MSG_RESULT($ft2inc) +- FREETYPE_CFLAGS="-I$ft2inc" +- fi +- fi +- ++ PKG_CHECK_MODULES([FT2], [freetype2 >= 6.0.0],have_freetype=yes,,) ++ FREETYPE_CFLAGS="`pkg-config --cflags freetype2`" ++ FREETYPE_LIBS="`pkg-config --libs freetype2`" + if test x$have_freetype = xno; then + AC_LIB_MISSING( FreeType2, http://www.freetype.org/) + fi diff -Nru asc-2.6.1.0/debian/patches/series asc-2.6.1.0/debian/patches/series --- asc-2.6.1.0/debian/patches/series 2018-07-27 16:13:12.000000000 +0000 +++ asc-2.6.1.0/debian/patches/series 2018-10-21 14:37:07.000000000 +0000 @@ -1,3 +1,4 @@ reproducible-build.patch reproducible-zip.patch libphysfs-3.0.1.patch +pkg-config-freetype.patch diff -Nru asc-2.6.1.0/debian/rules asc-2.6.1.0/debian/rules --- asc-2.6.1.0/debian/rules 2018-07-27 16:13:12.000000000 +0000 +++ asc-2.6.1.0/debian/rules 2018-10-21 14:50:17.000000000 +0000 @@ -3,10 +3,7 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: - dh $@ --without autoreconf + dh $@ override_dh_auto_test: # Do nothing here to prevent a FTBFS - -get-orig-source: - uscan --verbose --download-current-version --force-download