diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/patches/0005-m4.patch | 34 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 2 |
5 files changed, 42 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index a684e99..7fb3c99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,12 +3,16 @@ xsane (0.999-4) UNRELEASED; urgency=medium * debian/control: - Remove iceweasel from Recommends. - Bump Standards-Version to 3.9.8, no changes required. - - Change Vcs-* to secure uri. + - Change Vcs-Browswer to secure uri. - Bump requierd version of debhelper to >= 10. * debian/compat: - Change compat level to 10. * debian/copyright: - Add 2016 for packaging. + * Prevent FTBFS: + - debian/rules: Change from autotools_dev to autoreconf. + - debian/control: Remove Build-Depends autotools-dev and add dh_autoreconf. + - New patches/0005-m4.patch to add missing tags. -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sat, 09 Apr 2016 00:12:46 +0200 diff --git a/debian/control b/debian/control index c648cf2..509bf9d 100644 --- a/debian/control +++ b/debian/control @@ -4,8 +4,8 @@ Priority: optional Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net> Standards-Version: 3.9.8 Build-Depends: - autotools-dev, debhelper (>= 10), + dh-autoreconf, gettext, libgimp2.0-dev, libgtk2.0-dev, diff --git a/debian/patches/0005-m4.patch b/debian/patches/0005-m4.patch new file mode 100644 index 0000000..8275718 --- /dev/null +++ b/debian/patches/0005-m4.patch @@ -0,0 +1,34 @@ +Description: add missing m4 tags +Author: Jörg Frings-Fürst <debian@jff-webhosting.net> +Last-Update: 2016-10-03 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/configure.in +=================================================================== +--- trunk.orig/configure.in ++++ trunk/configure.in +@@ -1,6 +1,7 @@ + dnl Process this file with autoconf to produce a configure script. -*-sh-*- + AC_INIT(include/config.h.in) + AC_CONFIG_HEADER(include/config.h) ++AC_CONFIG_MACRO_DIRS([m4]) + # AC_PREREQ(2.10)dnl dnl Minimum Autoconf version required. + # AC_ARG_PROGRAM + +@@ -21,12 +22,15 @@ XSANE_PACKAGE_VERSION="$PACKAGE-$VERSION + AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Define to the name of the distribution]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Define to the version of the distribution]) + AC_DEFINE_UNQUOTED(XSANE_PACKAGE_VERSION, "$XSANE_PACKAGE_VERSION", [Define to name and version of distribution]) ++AC_DEFINE([ENABLE_NLS], [], [Description]) ++AC_DEFINE([HAVE_CATGETS], [], [Description]) ++AC_DEFINE([HAVE_GETTEXT], [], [Description]) ++AC_DEFINE([HAVE_LC_MESSAGES], [], [Description]) + AC_SUBST(PACKAGE) + AC_SUBST(VERSION) + AC_SUBST(XSANE_PACKAGE_VERSION) + AC_SUBST(SANE_MAJOR) + +- + dnl Check args + + echo "" diff --git a/debian/patches/series b/debian/patches/series index 8877516..a90b67e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -20,3 +20,4 @@ 0115-deb_non_working_help_menu.patch 0165-xsane-0.999-lcms2.patch 0001-lcms2_configure.patch +0005-m4.patch diff --git a/debian/rules b/debian/rules index 51d836d..e4abef4 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh $@ --with autotools_dev + dh $@ --with autoreconf override_dh_auto_configure: dh_auto_configure -- --enable-gimp |