Package: gsmlib
Version: 1.10+20120414.gita5e5ae9a-0.3
Followup-For: Bug #978339
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 gsmlib-1.10+20120414.gita5e5ae9a/debian/control
gsmlib-1.10+20120414.gita5e5ae9a/debian/control
--- gsmlib-1.10+20120414.gita5e5ae9a/debian/control 2018-04-03
14:26:57.000000000 +0200
+++ gsmlib-1.10+20120414.gita5e5ae9a/debian/control 2021-04-22
15:07:39.000000000 +0200
@@ -1,8 +1,7 @@
Source: gsmlib
Section: comm
Priority: extra
-Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
-XSBC-Original-Maintainer: Mark Purcell <m...@debian.org>
+Maintainer: Mark Purcell <m...@debian.org>
Build-Depends: debhelper (>= 9), dh-autoreconf, autotools-dev
Standards-Version: 3.9.4
Homepage: https://github.com/vbouchaud/gsmlib
diff -Nru gsmlib-1.10+20120414.gita5e5ae9a/debian/patches/gettext-external.diff
gsmlib-1.10+20120414.gita5e5ae9a/debian/patches/gettext-external.diff
--- gsmlib-1.10+20120414.gita5e5ae9a/debian/patches/gettext-external.diff
1970-01-01 01:00:00.000000000 +0100
+++ gsmlib-1.10+20120414.gita5e5ae9a/debian/patches/gettext-external.diff
2021-04-22 15:07:24.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/978339
+Forwarded: no
+Last-Update: 2021-04-22
+---
+--- gsmlib-1.10+20120414.gita5e5ae9a.orig/Makefile.am
++++ gsmlib-1.10+20120414.gita5e5ae9a/Makefile.am
+@@ -18,7 +18,7 @@ SUBDIRS_ = po gsmlib apps tests doc scri
+ EXTRA_DIST = gsmlib.spec
+
+ if COMPILE_INTL
+-SUBDIRS = intl $(SUBDIRS_) # po - make automake happy
++SUBDIRS = $(SUBDIRS_) # po - make automake happy
+ else
+ SUBDIRS = $(SUBDIRS_) # po intl - make automake happy
+ endif
+--- gsmlib-1.10+20120414.gita5e5ae9a.orig/Makefile.in
++++ gsmlib-1.10+20120414.gita5e5ae9a/Makefile.in
+@@ -127,7 +127,7 @@ VERSION = @VERSION@
+ SUBDIRS_ = po gsmlib apps tests doc scripts win32 ext
+
+ EXTRA_DIST = gsmlib.spec
+-@COMPILE_INTL_TRUE@SUBDIRS = intl $(SUBDIRS_) # po - make automake happy
++@COMPILE_INTL_TRUE@SUBDIRS = $(SUBDIRS_) # po - make automake happy
+ @COMPILE_INTL_FALSE@SUBDIRS = $(SUBDIRS_) # po intl - make automake happy
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+--- gsmlib-1.10+20120414.gita5e5ae9a.orig/configure.in
++++ gsmlib-1.10+20120414.gita5e5ae9a/configure.in
+@@ -111,7 +111,7 @@ AC_SUBST(GSM_VERSION)
+ dnl national language support (NLS)
+ LINGUAS="de"
+ ALL_LINGUAS=$LINGUAS
+-AM_GNU_GETTEXT
++AM_GNU_GETTEXT([external])
+ dnl AM_GLIB_GNU_GETTEXT
+
+ dnl set locale dir (FIXME there must be a better way)
diff -Nru gsmlib-1.10+20120414.gita5e5ae9a/debian/patches/series
gsmlib-1.10+20120414.gita5e5ae9a/debian/patches/series
--- gsmlib-1.10+20120414.gita5e5ae9a/debian/patches/series 2014-10-09
13:15:39.000000000 +0200
+++ gsmlib-1.10+20120414.gita5e5ae9a/debian/patches/series 2021-04-22
15:05:37.000000000 +0200
@@ -2,3 +2,4 @@
02-fix-csms.diff
03-fix-cops.diff
04-parseint2.patch
+gettext-external.diff
