From fbd5ac7240a1742409b319de3dbbdcd9bd1f4085 Mon Sep 17 00:00:00 2001 From: ThierryFR Date: Thu, 5 Jun 2025 20:20:06 +0000 Subject: [PATCH] Fix ci --- .gitlab-ci.yml | 8 ++++---- configure.ac | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7b6e8da..1948ec7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,13 +14,13 @@ archive: image: $REGISTRY_HUB:debian-buster-full before_script: - apt-get update --quiet - - apt-get install --quiet --assume-yes libsane-dev + - apt-get install --quiet --assume-yes libsane-dev autoconf automake libtool gettext libgtk-3-dev libgimp2.0-dev script: - build=$(git describe --match '1.*' | sed 's/.*\.//; s/-.*//'); - sed -i "/^V_BUILD/s/=.*/=$build/" configure.in; + sed -i "/^V_BUILD/s/=.*/=$build/" configure.ac; extra=$(git describe --dirty --match '1.*' | sed 's/^[^-]*//'); - sed -i "/^V_EXTRA/s/=.*/=$extra/" configure.in - - autoconf --force + sed -i "/^V_EXTRA/s/=.*/=$extra/" configure.ac + - autoreconf --install --force --verbose - ./configure - make dist artifacts: diff --git a/configure.ac b/configure.ac index bf973b6..606c272 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_PREREQ([2.71]) +AC_PREREQ([2.69]) AC_INIT([sane-frontends], [1.1.0], [sane-devel@alioth-lists.debian.net]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([src/xscanimage.c]) @@ -15,7 +15,7 @@ AC_PROG_RANLIB AM_PROG_AR # Language -AM_GNU_GETTEXT_VERSION([0.21]) +AM_GNU_GETTEXT_VERSION([0.19]) AM_GNU_GETTEXT([external]) # Options