Control: tags 978371 + patch Control: tags 978371 + pending Dear maintainer,
I've prepared an NMU for gnokii (versioned as 0.6.30+dfsg-1.3) and uploaded it to DELAYED/15. Please feel free to tell me if I should cancel it. cu Adrian
diff -Nru gnokii-0.6.30+dfsg/debian/changelog gnokii-0.6.30+dfsg/debian/changelog --- gnokii-0.6.30+dfsg/debian/changelog 2016-12-09 18:39:06.000000000 +0200 +++ gnokii-0.6.30+dfsg/debian/changelog 2021-02-08 22:53:35.000000000 +0200 @@ -1,3 +1,11 @@ +gnokii (0.6.30+dfsg-1.3) unstable; urgency=medium + + * Non-maintainer upload. + * Add upstream workaround for FTBFS with gettext >= 0.20. + (Closes: #978371) + + -- Adrian Bunk <b...@debian.org> Mon, 08 Feb 2021 22:53:35 +0200 + gnokii (0.6.30+dfsg-1.2) unstable; urgency=medium * Non-maintainer upload. diff -Nru gnokii-0.6.30+dfsg/debian/patches/0001-Add-codeset.m4-to-m4-to-prevent-build-failure-with-g.patch gnokii-0.6.30+dfsg/debian/patches/0001-Add-codeset.m4-to-m4-to-prevent-build-failure-with-g.patch --- gnokii-0.6.30+dfsg/debian/patches/0001-Add-codeset.m4-to-m4-to-prevent-build-failure-with-g.patch 1970-01-01 02:00:00.000000000 +0200 +++ gnokii-0.6.30+dfsg/debian/patches/0001-Add-codeset.m4-to-m4-to-prevent-build-failure-with-g.patch 2021-02-08 22:51:47.000000000 +0200 @@ -0,0 +1,44 @@ +From 4dd198d121ca366c9881d022a56394c2e56936d0 Mon Sep 17 00:00:00 2001 +From: Pawel Kot <gno...@gmail.com> +Date: Thu, 2 Jan 2020 13:13:45 +0100 +Subject: Add codeset.m4 to m4/ to prevent build failure with gettext >= 0.20 + +Add codeset.m4 to m4/ as it is missing from gettext distribution from +version 0.20. + +Fixes: https://savannah.nongnu.org/bugs/?57509 + +diff --git a/m4/codeset.m4 b/m4/codeset.m4 +new file mode 100644 +index 00000000..da1b2aef +--- /dev/null ++++ b/m4/codeset.m4 +@@ -0,0 +1,25 @@ ++# codeset.m4 serial 5 (gettext-0.18.2) ++dnl Copyright (C) 2000-2002, 2006, 2008-2014, 2016 Free Software Foundation, ++dnl Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++dnl From Bruno Haible. ++ ++AC_DEFUN([AM_LANGINFO_CODESET], ++[ ++ AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset], ++ [AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[#include <langinfo.h>]], ++ [[char* cs = nl_langinfo(CODESET); return !cs;]])], ++ [am_cv_langinfo_codeset=yes], ++ [am_cv_langinfo_codeset=no]) ++ ]) ++ if test $am_cv_langinfo_codeset = yes; then ++ AC_DEFINE([HAVE_LANGINFO_CODESET], [1], ++ [Define if you have <langinfo.h> and nl_langinfo(CODESET).]) ++ fi ++]) ++ +-- +2.20.1 + diff -Nru gnokii-0.6.30+dfsg/debian/patches/series gnokii-0.6.30+dfsg/debian/patches/series --- gnokii-0.6.30+dfsg/debian/patches/series 2011-04-24 01:08:43.000000000 +0300 +++ gnokii-0.6.30+dfsg/debian/patches/series 2021-02-08 22:53:34.000000000 +0200 @@ -1,2 +1,3 @@ change_configfile_order.patch debian-changes-0.6.30+dfsg-1 +0001-Add-codeset.m4-to-m4-to-prevent-build-failure-with-g.patch
