On Thu, Dec 26, 2024 at 04:07:44PM +0100, Andreas Tille wrote: > I intended to fix blktool as Bug of the Day and tried to follow your > hint. Unfortunately I seem to have messed it up as you can see in Salsa > CI[1]. For whatever reason the configure file is syntactically broken. > Any hint would be welcome See patch that fixes this below.
From e384991da8a910196e2f22356d970063dfaf4ecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= <[email protected]> Date: Thu, 26 Dec 2024 16:29:03 +0100 Subject: [PATCH] dh_autoreconf correctly X-Mutt-PGP: OS
--- debian/patches/0005-fix-autoreconf.patch | 16 +++++++++++++--- debian/rules | 5 ++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/debian/patches/0005-fix-autoreconf.patch b/debian/patches/0005-fix-autoreconf.patch index 8ead349..ae508ab 100644 --- a/debian/patches/0005-fix-autoreconf.patch +++ b/debian/patches/0005-fix-autoreconf.patch @@ -1,12 +1,22 @@ -Author: Andreas Tille <[email protected]> +From: Andreas Tille <[email protected]> +Date: Thu, 26 Dec 2024 16:29:29 +0100 +Subject: Drop invalid statements from configure.ac + Last-Update: 2024-12-26 Bug-Debian: https://bugs.debian.org/894918 -Description: Drop invalid statements from configure.ac +--- + configure.ac | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +diff --git a/configure.ac b/configure.ac +index 11cdd91..4e6d61e 100644 --- a/configure.ac +++ b/configure.ac -@@ -20,11 +20,9 @@ dnl Foundation, Inc., 59 Temple Place, S +@@ -18,13 +18,12 @@ dnl along with this program; if not, write to the Free Software + dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + AC_INIT(blktool, 4, [Jeff Garzik <[email protected]>]) ++AM_INIT_AUTOMAKE AC_PREREQ(2.52) AC_CONFIG_SRCDIR([blktool.c]) -AM_INIT_AUTOMAKE([gnu]) diff --git a/debian/rules b/debian/rules index 75065ca..99e65b1 100755 --- a/debian/rules +++ b/debian/rules @@ -9,10 +9,9 @@ override_dh_auto_clean: dh_auto_clean if [ -e .aclocal.m4 ] ; then rm -f aclocal.m4; mv .aclocal.m4 aclocal.m4 ; fi -override_dh_update_autotools_config: +override_dh_autoreconf: mv aclocal.m4 .aclocal.m4 - ln -s /usr/share/aclocal/glib-2.0.m4 aclocal.m4 - dh_update_autotools_config + dh_autoreconf override_dh_installchangelogs: dh_installchangelogs ChangeLog -- 2.39.5
signature.asc
Description: PGP signature
