Control: tags 1088081 + pending Dear maintainer,
I've prepared an NMU for sane-frontends (versioned as 1.0.14-18.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should cancel it. Regards. cu Andreas
diffstat for sane-frontends-1.0.14 sane-frontends-1.0.14 changelog | 10 ++ control | 1 patches/0700-add-gimp-2.0.m4.diff | 189 ++++++++++++++++++++++++++++++++++++++ patches/series | 1 rules | 2 5 files changed, 202 insertions(+), 1 deletion(-) diff -Nru sane-frontends-1.0.14/debian/changelog sane-frontends-1.0.14/debian/changelog --- sane-frontends-1.0.14/debian/changelog 2024-03-13 20:45:20.000000000 +0100 +++ sane-frontends-1.0.14/debian/changelog 2025-07-26 16:35:40.000000000 +0200 @@ -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 <[email protected]> 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 -Nru sane-frontends-1.0.14/debian/control sane-frontends-1.0.14/debian/control --- sane-frontends-1.0.14/debian/control 2024-03-13 20:43:34.000000000 +0100 +++ sane-frontends-1.0.14/debian/control 2025-07-26 16:32:29.000000000 +0200 @@ -6,7 +6,6 @@ Rules-Requires-Root: no Build-Depends: debhelper-compat (= 13), - libgimp2.0-dev, libgtk2.0-dev, libsane-dev Homepage: http://www.sane-project.org diff -Nru sane-frontends-1.0.14/debian/patches/0700-add-gimp-2.0.m4.diff sane-frontends-1.0.14/debian/patches/0700-add-gimp-2.0.m4.diff --- sane-frontends-1.0.14/debian/patches/0700-add-gimp-2.0.m4.diff 1970-01-01 01:00:00.000000000 +0100 +++ sane-frontends-1.0.14/debian/patches/0700-add-gimp-2.0.m4.diff 2025-07-26 16:28:18.000000000 +0200 @@ -0,0 +1,189 @@ +Description: Add gimp-2.0.m4 from libgimp2.0-dev_2.10.38-2 + Needed for autoreconf. +Author: andreas Metzler <[email protected]> +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, µ) != 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 -Nru sane-frontends-1.0.14/debian/patches/series sane-frontends-1.0.14/debian/patches/series --- sane-frontends-1.0.14/debian/patches/series 2024-03-13 18:23:21.000000000 +0100 +++ sane-frontends-1.0.14/debian/patches/series 2025-07-26 16:28:42.000000000 +0200 @@ -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 -Nru sane-frontends-1.0.14/debian/rules sane-frontends-1.0.14/debian/rules --- sane-frontends-1.0.14/debian/rules 2023-02-17 15:39:56.000000000 +0100 +++ sane-frontends-1.0.14/debian/rules 2025-07-26 16:31:20.000000000 +0200 @@ -2,6 +2,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +export ACLOCAL_PATH = $(CURDIR) + export DEB_BUILD_MAINT_OPTIONS = hardening=+all %:
signature.asc
Description: PGP signature
