[Pkg-privacy-commits] [seahorse-nautilus] 02/08: Add cross.patch from Helmut Grohne to fix FTCBFS (Closes: #870511)

Clement Hermann nodens at nodens.org
Sun Nov 5 17:43:38 UTC 2017


This is an automated email from the git hooks/post-receive script.

nodens-guest pushed a commit to branch master
in repository seahorse-nautilus.

commit dcc5f7e1a0782b8e63fe9ddbdbdca23ba5bc0810
Author: Clément Hermann <nodens at nodens.org>
Date:   Sun Nov 5 14:53:30 2017 +0100

    Add cross.patch from Helmut Grohne to fix FTCBFS (Closes: #870511)
---
 debian/patches/cross.patch | 16 ++++++++++++++++
 debian/patches/series      |  1 +
 debian/rules               |  2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch
new file mode 100644
index 0000000..0ad1f89
--- /dev/null
+++ b/debian/patches/cross.patch
@@ -0,0 +1,16 @@
+From: Helmut Grohne <helmut at subdivi.de>
+Subject: configure $ac_tool_prefix when discovering pkg-config
+
+Index: seahorse-nautilus-3.11.92/configure.ac
+===================================================================
+--- seahorse-nautilus-3.11.92.orig/configure.ac
++++ seahorse-nautilus-3.11.92/configure.ac
+@@ -26,7 +26,7 @@
+ AM_DISABLE_STATIC
+ AM_PROG_LIBTOOL
+ IT_PROG_INTLTOOL([0.35.0])
+-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++PKG_PROG_PKG_CONFIG
+ 
+ AC_SYS_LARGEFILE
+ AC_TYPE_OFF_T
diff --git a/debian/patches/series b/debian/patches/series
index ce9d90c..cb0c161 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 gpg2.patch
+cross.patch
 update-Makefile-am.patch
 fix-warnings.patch
 fix-desktop-files.patch
diff --git a/debian/rules b/debian/rules
index a87f272..eca08ea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ MUTABLE_FILES := \
 	tool/seahorse-pgp-signature.desktop.in
 
 %:
-	dh $@
+	dh $@ --with=autoreconf
 
 override_dh_autoreconf:
 	for f in $(MUTABLE_FILES); do \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/seahorse-nautilus.git



More information about the Pkg-privacy-commits mailing list