>From e1e70e45ec8d8ddf929f803b50f624ee5381dc32 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 22 Nov 2017 08:28:00 +0000 Subject: [PATCH 2/4] Run gtkdocize via debian/autogen.sh This is passed as a parameter to dh_autoreconf, so that the changed gtk-doc.make will be detected by dh_autoreconf and deleted in dh_autoreconf_clean. Use gtkdocize --copy so that it doesn't replace plain files with symlinks, which dh_autoreconf_clean doesn't currently know how to undo. --- debian/autogen.sh | 4 ++++ debian/changelog | 9 +++++++++ debian/rules | 4 +--- 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100755 debian/autogen.sh diff --git a/debian/autogen.sh b/debian/autogen.sh new file mode 100755 index 0000000..38ef0ff --- /dev/null +++ b/debian/autogen.sh @@ -0,0 +1,4 @@ +#!/bin/sh +set -e +gtkdocize --copy +autoreconf -fi diff --git a/debian/changelog b/debian/changelog index 607178a..3cf9420 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,17 @@ libidn2 (2.0.4-1.1) UNRELEASED; urgency=medium * Non-maintainer upload. + + [ Helmut Grohne ] * Fix FTBFS: gtkdocize and add dblatex to Build-Depends. (Closes: #881915) + [ Simon McVittie ] + * Run gtkdocize via a script debian/autogen.sh passed as a parameter + to dh_autoreconf, so that the changed gtk-doc.make will be recorded + by dh_autoreconf and deleted by dh_autoreconf_clean + - Use gtkdocize --copy to avoid gtk-doc.make becoming a symlink, which + dh_autoreconf doesn't currently handle + -- Helmut Grohne Fri, 17 Nov 2017 22:43:07 +0100 libidn2 (2.0.4-1) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index 5790fa3..e013df1 100755 --- a/debian/rules +++ b/debian/rules @@ -6,9 +6,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all dh $@ --parallel --with autoreconf --fail-missing -O--dbgsym-migration="libidn2-0-dbg (<< 2.0.2-1~)" -X.la override_dh_autoreconf: - rm -f gtk-doc.make - gtkdocize - dh_autoreconf + dh_autoreconf debian/autogen.sh override_dh_auto_configure: dh_auto_configure -- \ -- 2.15.0