Merge branch 'release/debian/1.0.14-18.1'HEADdebian/1.0.14-18.1master

9 files changed, 213 insertions, 6 deletions

diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000..027271b
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1 @@
+files
diff --git a/debian/changelog b/debian/changelog
index 7e066e2..e2b5ebb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+sane-frontends (1.0.14-18.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop b-d on libgimp2.0-dev, copy gimp-2.0.m4 from
+    libgimp2.0-dev_2.10.38-2, set export ACLOCAL_PATH = $(CURDIR) in
+    debian/rules to let autoreconf find the m4 file and let dh_autoreconf
+    continue working. Closes: #1088081
+
+ -- Andreas Metzler <ametzler@debian.org>  Sat, 26 Jul 2025 16:35:40 +0200
+
 sane-frontends (1.0.14-18) unstable; urgency=medium
 
   * New debian/patches/0145-ftbfs-impfuncdef.patch.
diff --git a/debian/control b/debian/control
index 31eb67c..8d8830f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,14 @@ Source: sane-frontends
 Section: graphics
 Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
-Standards-Version: 4.6.2.0
+Standards-Version: 4.7.0.1
 Rules-Requires-Root: no
 Build-Depends:
  debhelper-compat (= 13),
- libgimp2.0-dev,
  libgtk2.0-dev,
  libsane-dev
 Homepage: http://www.sane-project.org
-Vcs-Git: git://git.jff.email/sane-frontends.git
+Vcs-Git: https://git.jff.email/cgit/sane-frontends.git
 Vcs-Browser: https://git.jff.email/cgit/sane-frontends.git
 
 Package: sane
diff --git a/debian/files b/debian/files
deleted file mode 100644
index e7f01b4..0000000
--- a/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-sane-frontends_1.0.14-18_source.buildinfo graphics optional
diff --git a/debian/patches/0700-add-gimp-2.0.m4.diff b/debian/patches/0700-add-gimp-2.0.m4.diff
new file mode 100644
index 0000000..5a69642
--- /dev/null
+++ b/debian/patches/0700-add-gimp-2.0.m4.diff
@@ -0,0 +1,189 @@
+Description: Add gimp-2.0.m4 from libgimp2.0-dev_2.10.38-2
+ Needed for autoreconf.
+Author: andreas Metzler <ametzler@debian.org>
+Origin: vendor
+Last-Update: 2025-07-26
+
+--- /dev/null
++++ sane-frontends-1.0.14/gimp-2.0.m4
+@@ -0,0 +1,180 @@
++# Configure paths for GIMP-2.0
++# Manish Singh, Sven Neumann
++# Large parts shamelessly stolen from Owen Taylor
++
++dnl AM_PATH_GIMP_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
++dnl Test for GIMP, and define GIMP_CFLAGS and GIMP_LIBS
++dnl
++AC_DEFUN([AM_PATH_GIMP_2_0],
++[dnl 
++dnl Get the cflags and libraries from pkg-config
++dnl
++
++AC_ARG_ENABLE(gimptest, [  --disable-gimptest      do not try to compile and run a test GIMP program],, enable_gimptest=yes)
++
++  pkg_name=gimp-2.0
++  pkg_config_args="$pkg_name gimpui-2.0"
++
++  no_gimp=""
++
++  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++
++  if test x$PKG_CONFIG != xno ; then
++    if pkg-config --atleast-pkgconfig-version 0.7 ; then
++      :
++    else
++      echo *** pkg-config too old; version 0.7 or better required.
++      no_gimp=yes
++      PKG_CONFIG=no
++    fi
++  else
++    no_gimp=yes
++  fi
++
++  min_gimp_version=ifelse([$1], ,2.0.0,$1)
++  AC_MSG_CHECKING(for GIMP - version >= $min_gimp_version)
++
++  if test x$PKG_CONFIG != xno ; then
++    ## don't try to run the test against uninstalled libtool libs
++    if $PKG_CONFIG --uninstalled $pkg_config_args; then
++	  echo "Will use uninstalled version of GIMP found in PKG_CONFIG_PATH"
++	  enable_gimptest=no
++    fi
++
++    if $PKG_CONFIG --atleast-version $min_gimp_version $pkg_config_args; then
++	  :
++    else
++	  no_gimp=yes
++    fi
++  fi
++
++  if test x"$no_gimp" = x ; then
++    GIMP_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
++    GIMP_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
++    GIMP_CFLAGS_NOUI=`$PKG_CONFIG $pkg_name --cflags`
++    GIMP_LIBS_NOUI=`$PKG_CONFIG $pkg_name --libs`
++    GIMP_DATA_DIR=`$PKG_CONFIG $pkg_name --variable=gimpdatadir`
++    GIMP_PLUGIN_DIR=`$PKG_CONFIG $pkg_name --variable=gimplibdir`
++
++    gimp_pkg_major_version=`$PKG_CONFIG --modversion $pkg_name | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++    gimp_pkg_minor_version=`$PKG_CONFIG --modversion $pkg_name | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++    gimp_pkg_micro_version=`$PKG_CONFIG --modversion $pkg_name | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++    if test "x$enable_gimptest" = "xyes" ; then
++      ac_save_CFLAGS="$CFLAGS"
++      ac_save_LIBS="$LIBS"
++      CFLAGS="$CFLAGS $GIMP_CFLAGS"
++      LIBS="$GIMP_LIBS $LIBS"
++
++dnl
++dnl Now check if the installed GIMP is sufficiently new. (Also sanity
++dnl checks the results of pkg-config to some extent
++dnl
++      rm -f conf.gimptest
++      AC_TRY_RUN([
++#include <stdio.h>
++#include <stdlib.h>
++
++#include <libgimp/gimp.h>
++
++GimpPlugInInfo PLUG_IN_INFO =
++{
++  NULL,  /* init_proc */
++  NULL,  /* quit_proc */
++  NULL,  /* query_proc */
++  NULL   /* run_proc */
++};
++
++int main ()
++{
++  int major, minor, micro;
++  char *tmp_version;
++
++  system ("touch conf.gimptest");
++
++  /* HP/UX 9 (%@#!) writes to sscanf strings */
++  tmp_version = g_strdup("$min_gimp_version");
++  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
++     printf("%s, bad version string\n", "$min_gimp_version");
++     exit(1);
++   }
++
++    if (($gimp_pkg_major_version > major) ||
++        (($gimp_pkg_major_version == major) && ($gimp_pkg_minor_version > minor)) ||
++        (($gimp_pkg_major_version == major) && ($gimp_pkg_minor_version == minor) && ($gimp_pkg_micro_version >= micro)))
++    {
++      return 0;
++    }
++  else
++    {
++      printf("\n*** 'pkg-config --modversion %s' returned %d.%d.%d, but the minimum version\n", "$pkg_name", $gimp_pkg_major_version, $gimp_pkg_minor_version, $gimp_pkg_micro_version);
++      printf("*** of GIMP required is %d.%d.%d. If pkg-config is correct, then it is\n", major, minor, micro);
++      printf("*** best to upgrade to the required version.\n");
++      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
++      printf("*** to point to the correct the correct configuration files\n");
++      return 1;
++    }
++}
++
++],, no_gimp=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++       CFLAGS="$ac_save_CFLAGS"
++       LIBS="$ac_save_LIBS"
++     fi
++  fi
++  if test "x$no_gimp" = x ; then
++     AC_MSG_RESULT(yes (version $gimp_pkg_major_version.$gimp_pkg_minor_version.$gimp_pkg_micro_version))
++     ifelse([$2], , :, [$2])     
++  else
++     if test "$PKG_CONFIG" = "no" ; then
++       echo "*** A new enough version of pkg-config was not found."
++       echo "*** See http://www.freedesktop.org/software/pkgconfig/"
++     else
++       if test -f conf.gimptest ; then
++        :
++       else
++          echo "*** Could not run GIMP test program, checking why..."
++          CFLAGS="$CFLAGS $GIMP_CFLAGS"
++          LIBS="$LIBS $GIMP_LIBS"
++          AC_TRY_LINK([
++#include <stdio.h>
++#include <libgimp/gimp.h>
++
++GimpPlugInInfo PLUG_IN_INFO =
++{
++  NULL,  /* init_proc */
++  NULL,  /* quit_proc */
++  NULL,  /* query_proc */
++  NULL   /* run_proc */
++};
++],      [ return 0; ],
++        [ echo "*** The test program compiled, but did not run. This usually means"
++          echo "*** that the run-time linker is not finding GIMP or finding the wrong"
++          echo "*** version of GIMP. If it is not finding GIMP, you'll need to set your"
++          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
++          echo "*** is required on your system"
++	  echo "***"
++          echo "*** If you have an old version installed, it is best to remove it, although"
++          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
++        [ echo "*** The test program failed to compile or link. See the file config.log for the"
++          echo "*** exact error that occurred. This usually means GIMP is incorrectly installed."])
++          CFLAGS="$ac_save_CFLAGS"
++          LIBS="$ac_save_LIBS"
++       fi
++     fi
++     GIMP_CFLAGS=""
++     GIMP_LIBS=""
++     GIMP_CFLAGS_NOUI=""
++     GIMP_LIBS_NOUI=""
++     ifelse([$3], , :, [$3])
++  fi
++  AC_SUBST(GIMP_CFLAGS)
++  AC_SUBST(GIMP_LIBS)
++  AC_SUBST(GIMP_CFLAGS_NOUI)
++  AC_SUBST(GIMP_LIBS_NOUI)
++  AC_SUBST(GIMP_DATA_DIR)
++  AC_SUBST(GIMP_PLUGIN_DIR)
++  rm -f conf.gimptest
++])
diff --git a/debian/patches/series b/debian/patches/series
index fb328b5..c75bcea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 0135-xscanimage_c-out-of-bounds.patch
 0600-xcam_man_typo.patch
 0605-manpages-typo.patch
+0700-add-gimp-2.0.m4.diff
diff --git a/debian/rules b/debian/rules
index e3a8c6e..433e7d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,15 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+export ACLOCAL_PATH = $(CURDIR)
+
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
 	dh  $@
+
+override_dh_auto_configure:
+#	autoconf
+	dh_auto_configure -- \
+		--disable-gimp \
+		--disable-gimptest
diff --git a/debian/sane.dirs b/debian/sane.dirs
index a356f1d..a18ebb9 100644
--- a/debian/sane.dirs
+++ b/debian/sane.dirs
@@ -1 +1 @@
-usr/lib/gimp/2.0/plug-ins
+#usr/lib/gimp/2.0/plug-ins
diff --git a/debian/sane.install b/debian/sane.install
index 25e252c..7a5e2cc 100644
--- a/debian/sane.install
+++ b/debian/sane.install
@@ -1,2 +1,2 @@
 debian/xscanimage-icon-32x32-2.xpm usr/share/sane
-debian/sane/usr/bin/xscanimage usr/lib/gimp/2.0/plug-ins/xscanimage
+#debian/sane/usr/bin/xscanimage usr/lib/gimp/2.0/plug-ins/xscanimage