tags 750041 +patch thanks The attached patch update the pkg-config files to use the krb5-multidev paths.
From 71cf4ca564df07f854173c9592e26b499f0905f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= <jel...@samba.org> Date: Sun, 1 Jun 2014 21:35:21 +0200 Subject: [PATCH 1/2] Provide -L and -I flags from pkg-config files. Closes: #750041 --- debian/changelog | 1 + .../debian-local/0012-Fix-pkg-config-paths.patch | 94 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 96 insertions(+) create mode 100644 debian/patches/debian-local/0012-Fix-pkg-config-paths.patch diff --git a/debian/changelog b/debian/changelog index 3d8fa77..5f6211a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ krb5 (1.12.1+dfsg-2) UNRELEASED; urgency=low * Non-maintainer upload. * Provide -L and -I flags from krb5-config. Closes: #730837 * Ship krb5-config.mit binary in krb5-multidev., Closes: #745322 + * Provide -L and -I flags from pkg-config files. Closes: #750041 [ Sam Hartman ] * Include upstream patch to load gss mechanisms from /etc/gss/mech.d, diff --git a/debian/patches/debian-local/0012-Fix-pkg-config-paths.patch b/debian/patches/debian-local/0012-Fix-pkg-config-paths.patch new file mode 100644 index 0000000..5aae283 --- /dev/null +++ b/debian/patches/debian-local/0012-Fix-pkg-config-paths.patch @@ -0,0 +1,94 @@ +Date: Sun 1 Jun 20:33:00 BST 2014 +From: Jelmer Vernooij <jel...@debian.org> +Subject: Fix pkg-config library/include paths +Bug-Debian: http://bugs.debian.org/750041 + +Include library and include flags in pkg-config files, so they work when the +symlinks provided by libkrb5-dev are not installed. + +Patch-Category: debian-local + +diff --git a/src/build-tools/gssrpc.pc.in b/src/build-tools/gssrpc.pc.in +index ca90921..e08c2e8 100644 +--- a/src/build-tools/gssrpc.pc.in ++++ b/src/build-tools/gssrpc.pc.in +@@ -1,7 +1,7 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-includedir=@includedir@ ++libdir=@libdir@/mit-krb5 ++includedir=@includedir@/mit-krb5 + vendor=MIT + + Name: gssrpc +diff --git a/src/build-tools/kadm-client.pc.in b/src/build-tools/kadm-client.pc.in +index c8d1cd1..de56a75 100644 +--- a/src/build-tools/kadm-client.pc.in ++++ b/src/build-tools/kadm-client.pc.in +@@ -1,7 +1,7 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-includedir=@includedir@ ++libdir=@libdir@/mit-krb5 ++includedir=@includedir@/mit-krb5 + + Name: kadm-client + Description: Kerberos administration client library +diff --git a/src/build-tools/kadm-server.pc.in b/src/build-tools/kadm-server.pc.in +index cd2f86c..a73ff86 100644 +--- a/src/build-tools/kadm-server.pc.in ++++ b/src/build-tools/kadm-server.pc.in +@@ -1,7 +1,7 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-includedir=@includedir@ ++libdir=@libdir@/mit-krb5 ++includedir=@includedir@/mit-krb5 + + Name: kadm-server + Description: Kerberos administration server library +diff --git a/src/build-tools/kdb.pc.in b/src/build-tools/kdb.pc.in +index 461a8d01d0..356501d 100644 +--- a/src/build-tools/kdb.pc.in ++++ b/src/build-tools/kdb.pc.in +@@ -1,7 +1,7 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-includedir=@includedir@ ++libdir=@libdir@/mit-krb5 ++includedir=@includedir@/mit-krb5 + + KDB5_DB_LIB=@KDB5_DB_LIB@ + +diff --git a/src/build-tools/mit-krb5-gssapi.pc.in b/src/build-tools/mit-krb5-gssapi.pc.in +index 7b91b19..b2b2436 100644 +--- a/src/build-tools/mit-krb5-gssapi.pc.in ++++ b/src/build-tools/mit-krb5-gssapi.pc.in +@@ -1,7 +1,7 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-includedir=@includedir@ ++libdir=@libdir@/mit-krb5 ++includedir=@includedir@/mit-krb5 + + Name: mit-krb5-gssapi + Description: Kerberos implementation of the GSSAPI +diff --git a/src/build-tools/mit-krb5.pc.in b/src/build-tools/mit-krb5.pc.in +index 0308815..058e75f 100644 +--- a/src/build-tools/mit-krb5.pc.in ++++ b/src/build-tools/mit-krb5.pc.in +@@ -1,7 +1,7 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-includedir=@includedir@ ++libdir=@libdir@/mit-krb5 ++includedir=@includedir@/mit-krb5 + + defccname=@DEFCCNAME@ + defktname=@DEFKTNAME@ diff --git a/debian/patches/series b/debian/patches/series index ff35369..56ada32 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,4 +9,5 @@ upstream/0008-Move-OTP-sockets-to-KDC_RUN_DIR.patch upstream/0009-Avoid-duplicate-etc-krb5.conf-in-profile-path.patch 0010-autoreconf.patch debian-local/0011-Fix-krb5-config-paths.patch +debian-local/0012-Fix-pkg-config-paths.patch upstream/0012-Load-mechglue-config-files-from-etc-gss-mech.d.patch -- 2.0.0.526.g5318336
signature.asc
Description: Digital signature
