Control: tags 962265 + pending
Dear maintainer, I've prepared an NMU for sword (versioned as 1.8.1+dfsg-8.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer or cancel the NMU. Regards, Gleisson diff -Nru sword-1.8.1+dfsg/debian/changelog sword-1.8.1+dfsg/debian/changelog --- sword-1.8.1+dfsg/debian/changelog 2018-11-12 14:05:48.000000000 -0200 +++ sword-1.8.1+dfsg/debian/changelog 2020-06-08 21:39:54.000000000 -0300 @@ -1,3 +1,11 @@ +sword (1.8.1+dfsg-8.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fixed ICU checking. Thanks to László Böszörményi <g...@debian.org>. + (Closes: #962265) + + -- Gleisson Jesuino Joaquim Cardoso <gleisson...@gmail.com> Mon, 08 Jun 2020 21:39:54 -0300 + sword (1.8.1+dfsg-8) unstable; urgency=medium * Breaks/Replaces on libsword11v5 >= 1.8, Closes: #913407 diff -Nru sword-1.8.1+dfsg/debian/patches/series sword-1.8.1+dfsg/debian/patches/series --- sword-1.8.1+dfsg/debian/patches/series 2018-11-12 14:05:48.000000000 -0200 +++ sword-1.8.1+dfsg/debian/patches/series 2020-06-08 21:39:54.000000000 -0300 @@ -5,3 +5,4 @@ 0006-powerpc64.patch 0007-gbfwordjs.patch sword_ICU_63.1.patch +sword_ICU_67.1.patch diff -Nru sword-1.8.1+dfsg/debian/patches/sword_ICU_67.1.patch sword-1.8.1+dfsg/debian/patches/sword_ICU_67.1.patch --- sword-1.8.1+dfsg/debian/patches/sword_ICU_67.1.patch 1969-12-31 21:00:00.000000000 -0300 +++ sword-1.8.1+dfsg/debian/patches/sword_ICU_67.1.patch 2020-06-08 21:39:54.000000000 -0300 @@ -0,0 +1,33 @@ +Description: fix ICU checking + Let still search for icu-config but use pkg-config method after that. +Forwarded: no +Author: Laszlo Boszormenyi (GCS) <g...@debian.org> +Last-Update: 2020-06-05 + +--- + +--- sword-1.8.1+dfsg.orig/configure.ac ++++ sword-1.8.1+dfsg/configure.ac +@@ -238,9 +238,19 @@ if test x$with_icu = xyes; then + AM_CXXFLAGS="$AM_CXXFLAGS -D_ICU_" + AM_CFLAGS="$AM_CFLAGS -D_ICU_" + else +- echo "*** The icu-config script installed by icu could not be found" +- echo "*** compiling without ICU support" +- with_icu=no ++ PKG_CHECK_MODULES([ICU], [icu-i18n >= 63.1], [found_icu=yes]) ++ if test "$found_icu" = "yes"; then ++ PKG_CHECK_MODULES([ICU_IO], [icu-io >= 63.1]) ++ ICU_IOLIBS="$ICU_IO_LIBS" ++ with_icu=yes ++ LIBS="$LIBS $ICU_LIBS $ICU_IOLIBS" ++ AM_CXXFLAGS="$AM_CXXFLAGS -D_ICU_" ++ AM_CFLAGS="$AM_CFLAGS -D_ICU_" ++ else ++ echo "*** The icu-config script installed by icu could not be found" ++ echo "*** compiling without ICU support" ++ with_icu=no ++ fi + fi + fi +
