Package: ap-utils
Version: 1.5-4
Followup-For: Bug #978372
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch
Dear Maintainer,
AM_GNU_GETTEXT is not supported without the 'external' parameter
anymore. For this to work, the 'intl' directory must be removed from the
SUBDIRS variable in Makefile.{am,in}
The attached patch fixes this and fixes the FTBFS issue.
Thanks for considering the patch.
Lukas
-- System Information:
Debian Release: bullseye/sid
APT prefers groovy-updates
APT policy: (500, 'groovy-updates'), (500, 'groovy-security'), (500,
'groovy'), (100, 'groovy-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.8.0-49-generic (SMP w/4 CPU threads)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_WARN, TAINT_OOT_MODULE,
TAINT_UNSIGNED_MODULE
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru ap-utils-1.5/debian/patches/fix-autotools.diff
ap-utils-1.5/debian/patches/fix-autotools.diff
--- ap-utils-1.5/debian/patches/fix-autotools.diff 1970-01-01
01:00:00.000000000 +0100
+++ ap-utils-1.5/debian/patches/fix-autotools.diff 2021-04-22
14:43:54.000000000 +0200
@@ -0,0 +1,42 @@
+Description: AM_GNU_GETTEXT requires 'external'
+ AM_GNU_GETTEXT requires the 'external' parameter and it does not allow
+ 'intl' to be listed in the SUBDIRS variable.
+ .
+Author: Lukas Märdian <sl...@ubuntu.com>
+Bug-Debian: https://bugs.debian.org/978372
+Forwarded: no
+Last-Update: 2021-04-22
+---
+--- ap-utils-1.5.orig/Makefile.am
++++ ap-utils-1.5/Makefile.am
+@@ -19,7 +19,7 @@
+
+ ## Process this file with automake to produce Makefile.in
+
+-SUBDIRS = lib src ap-gl Documentation intl po
++SUBDIRS = lib src ap-gl Documentation po
+
+ AUTOMAKE_OPTIONS = gnu
+
+--- ap-utils-1.5.orig/Makefile.in
++++ ap-utils-1.5/Makefile.in
+@@ -158,7 +158,7 @@ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+
+-SUBDIRS = lib src ap-gl Documentation intl po
++SUBDIRS = lib src ap-gl Documentation po
+
+ AUTOMAKE_OPTIONS = gnu
+
+--- ap-utils-1.5.orig/configure.in
++++ ap-utils-1.5/configure.in
+@@ -53,7 +53,7 @@ AC_CHECK_FUNCS([alarm inet_ntoa socket s
+
+ ALL_LINGUAS="uk fr pl ro nl tr"
+
+-AM_GNU_GETTEXT
++AM_GNU_GETTEXT([external])
+
+ aputils_save_LIBS="$LIBS"
+ AC_CHECK_LIB(ncurses, initscr, CURSESLIBS="-lncurses", NOCURSES=yes)
diff -Nru ap-utils-1.5/debian/patches/series ap-utils-1.5/debian/patches/series
--- ap-utils-1.5/debian/patches/series 2020-04-05 02:29:36.000000000 +0200
+++ ap-utils-1.5/debian/patches/series 2021-04-22 14:39:10.000000000 +0200
@@ -1,2 +1,3 @@
101_fix-man-page-spelling.diff
102_man-page-for-ap-rrd.diff
+fix-autotools.diff
