diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-01-28 07:07:12 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-01-28 07:07:12 +0100 |
| commit | e07d695609fdab3184e5999f31b8eee3192b0a59 (patch) | |
| tree | 504200b0141c63513cd610927025563a0252ac56 | |
| parent | 013b5c3d4b4e371a63d591392903656d626ab123 (diff) | |
new debian/patches/0010-fix_missing_sane-config.patch
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/patches/0010-fix_missing_sane-config.patch | 26 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 36 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 16fa7a0..00e1e99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +xsane (0.999-5) UNRELEASED; urgency=medium + + * New debian/patches/0010-fix_missing_sane-config.patch (Closes: #852840): + - Fix FTBFS because of missing sane-config from the package + sane-backends >= 1.25-3. + Thanks to Andreas Metzler <ametzler@bebt.de>. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sat, 28 Jan 2017 06:55:24 +0100 + xsane (0.999-4) unstable; urgency=medium * debian/control: diff --git a/debian/patches/0010-fix_missing_sane-config.patch b/debian/patches/0010-fix_missing_sane-config.patch new file mode 100644 index 0000000..4a9c444 --- /dev/null +++ b/debian/patches/0010-fix_missing_sane-config.patch @@ -0,0 +1,26 @@ +Description: Fix FTBFS against libsane-dev >= 1.0.25-3 + Fix missing sane-config +Author: Andreas Metzler <ametzler@bebt.de> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=852840 +Forwarded: https://github.com/nphilipp/xsane/issues/1 +Reviewed-by: Jörg Frings-Fürst <debian@jff-webhosting.net> +Last-Update: 2017-01-28 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/configure.in +=================================================================== +--- trunk.orig/configure.in ++++ trunk/configure.in +@@ -165,8 +165,10 @@ fi + + AC_SUBST(INTLSUB) + +-AM_PATH_SANE(1.0.0, HAVE_SANE=yes, ) +- ++PKG_CHECK_MODULES([SANE], [sane-backends >= 1.0.0]) ++PKG_CHECK_VAR([SANE_PREFIX], [sane-backends >= 1.0.0], [prefix]) ++PKG_CHECK_VAR([SANE_LDFLAGS], [sane-backends >= 1.0.0], [ldflags], ++ [HAVE_SANE=yes]) + if test "${USE_GIMP}" = "yes"; then + if test "${TRY_GIMP_2}" = "yes"; then + AM_PATH_GIMP_2_0(1.3.23, HAVE_GIMP=yes, ) diff --git a/debian/patches/series b/debian/patches/series index a90b67e..cbf6b1c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -21,3 +21,4 @@ 0165-xsane-0.999-lcms2.patch 0001-lcms2_configure.patch 0005-m4.patch +0010-fix_missing_sane-config.patch |