Source: abiword
Version: 3.0.7~dfsg-3
Tags: patch
User: [email protected]
Usertags: ftcbfs

We would like to remove the libtool-bin package from Debian. abiword
presently Build-Depends on it. It does so, because one of its tests
invokes bare "libtool", which really is part of libtool-bin. abiword
also libtoolizes and configures a libtool, so it really could be using
its own libtool. I'm attaching a patch that makes the one place that
still uses /usr/bin/libtool use the build-time libtool. Once doing so,
the libtool-bin dependency can be reduced to libtool and it really is
required even when not testing. Please consider applying it.

Helmut
diff -Nru abiword-3.0.7~dfsg/debian/changelog 
abiword-3.0.7~dfsg/debian/changelog
--- abiword-3.0.7~dfsg/debian/changelog 2025-10-25 16:33:02.000000000 +0200
+++ abiword-3.0.7~dfsg/debian/changelog 2025-12-07 14:22:36.000000000 +0100
@@ -1,3 +1,10 @@
+abiword (3.0.7~dfsg-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Stop using libtool-bin. (Closes: #-1)
+
+ -- Helmut Grohne <[email protected]>  Sun, 07 Dec 2025 14:22:36 +0100
+
 abiword (3.0.7~dfsg-3) unstable; urgency=medium
 
   * build-depend on gir1.2-gobject-2.0 gir1.2-gsf-1 gir1.2-gtk-3.0
diff -Nru abiword-3.0.7~dfsg/debian/control abiword-3.0.7~dfsg/debian/control
--- abiword-3.0.7~dfsg/debian/control   2025-10-25 16:22:41.000000000 +0200
+++ abiword-3.0.7~dfsg/debian/control   2025-12-07 14:22:36.000000000 +0100
@@ -32,7 +32,7 @@
  librevenge-dev,
  librsvg2-dev,
  libtidy-dev,
- libtool-bin <!nocheck>,
+ libtool,
  libwmf-dev,
  libwpd-dev,
  libwpg-dev,
diff -Nru abiword-3.0.7~dfsg/debian/patches/libtool.patch 
abiword-3.0.7~dfsg/debian/patches/libtool.patch
--- abiword-3.0.7~dfsg/debian/patches/libtool.patch     1970-01-01 
01:00:00.000000000 +0100
+++ abiword-3.0.7~dfsg/debian/patches/libtool.patch     2025-12-07 
14:22:36.000000000 +0100
@@ -0,0 +1,25 @@
+Index: abiword-3.0.7~dfsg/src/wp/test/unix/testwrap.sh.in
+===================================================================
+--- abiword-3.0.7~dfsg.orig/src/wp/test/unix/testwrap.sh.in
++++ abiword-3.0.7~dfsg/src/wp/test/unix/testwrap.sh.in
+@@ -5,5 +5,5 @@ export G_DEBUG
+ G_SLICE=always-malloc
+ export G_SLICE
+ 
+-exec libtool --mode=execute @VALGRIND@ --leak-check=full --log-file=tf-vgdump 
./AbiWord-test
++exec ${LIBTOOL:-libtool} --mode=execute @VALGRIND@ --leak-check=full 
--log-file=tf-vgdump ./AbiWord-test
+ 
+Index: abiword-3.0.7~dfsg/src/wp/test/unix/Makefile.am
+===================================================================
+--- abiword-3.0.7~dfsg.orig/src/wp/test/unix/Makefile.am
++++ abiword-3.0.7~dfsg/src/wp/test/unix/Makefile.am
+@@ -16,6 +16,9 @@
+ ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
+ ## 02110-1301 USA.
+ 
++# used by testwrap.sh
++export LIBTOOL
++
+ TESTS = testwrap.sh
+ 
+ check_SCRIPTS = testwrap.sh-stamp testwrap.sh
diff -Nru abiword-3.0.7~dfsg/debian/patches/series 
abiword-3.0.7~dfsg/debian/patches/series
--- abiword-3.0.7~dfsg/debian/patches/series    2024-11-05 16:24:12.000000000 
+0100
+++ abiword-3.0.7~dfsg/debian/patches/series    2025-12-07 14:22:36.000000000 
+0100
@@ -10,3 +10,4 @@
 disable-some-unix-test.patch
 drop-outdated-libgcrypt.m4.diff
 abiword-disable-unix-test-for-loong64.patch
+libtool.patch

Reply via email to