merge patched into master

9 files changed, 14 insertions, 14 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 08434200a..399c9e88a 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-6d7d5c82fffa36cc309646f37bc21f3692784df0
-6d7d5c82fffa36cc309646f37bc21f3692784df0
+25995151a62e62ba1d3c6a73c9c1cc328e7daa6e
+25995151a62e62ba1d3c6a73c9c1cc328e7daa6e
 20616817f225df6d98aba27a8d18ec0993da4c8f
 20616817f225df6d98aba27a8d18ec0993da4c8f
 krb5_1.16.orig.tar.gz
diff --git a/debian/patches/debian-local/0002-debian-Handle-multi-arch-paths-in-krb5-config.patch b/debian/patches/debian-local/0002-debian-Handle-multi-arch-paths-in-krb5-config.patch
index 019d26bdc..20c6fe95e 100644
--- a/debian/patches/debian-local/0002-debian-Handle-multi-arch-paths-in-krb5-config.patch
+++ b/debian/patches/debian-local/0002-debian-Handle-multi-arch-paths-in-krb5-config.patch
@@ -1,9 +1,9 @@
-From 0bcb4b15431994431e3ad7c743277b43a679a99b Mon Sep 17 00:00:00 2001
+From 10b35fd48040926898a33523248402a6e61597ff Mon Sep 17 00:00:00 2001
 From: Sam Hartman <hartmans@debian.org>
 Date: Mon, 26 Dec 2011 18:19:53 -0500
 Subject: debian: Handle multi-arch paths in krb5-config
 
-We cannot use @libdir@ or @includedir@ because that will include the
+We cannot use @libdir@ because that will include the
 multi-arch prefix in the built krb5-config, but we want krb5-config to
 be identical on all arches so that krb5-multidev can be multi-arch:
 same.  So, instead, figure out our multi-arch tripple by calling CC
@@ -19,7 +19,7 @@ Patch-Category: debian-local
  1 file changed, 10 insertions(+), 7 deletions(-)
 
 diff --git a/src/build-tools/krb5-config.in b/src/build-tools/krb5-config.in
-index f6184da3fb..7fdab42128 100755
+index f6184da3fb..ac2f5827d3 100755
 --- a/src/build-tools/krb5-config.in
 +++ b/src/build-tools/krb5-config.in
 @@ -26,11 +26,18 @@
@@ -38,7 +38,7 @@ index f6184da3fb..7fdab42128 100755
  exec_prefix=@exec_prefix@
 -includedir=@includedir@
 -libdir=@libdir@
-+includedir=@prefix@/include/${tripple}/mit-krb5
++includedir=@prefix@/include/mit-krb5
 +libdir=@prefix@/lib/${tripple}/mit-krb5
  CC_LINK='@CC_LINK@'
  KDB5_DB_LIB=@KDB5_DB_LIB@
diff --git a/debian/patches/debian-local/0003-debian-osconf.hin-path-changes.patch b/debian/patches/debian-local/0003-debian-osconf.hin-path-changes.patch
index 40a4d5784..a904a743a 100644
--- a/debian/patches/debian-local/0003-debian-osconf.hin-path-changes.patch
+++ b/debian/patches/debian-local/0003-debian-osconf.hin-path-changes.patch
@@ -1,4 +1,4 @@
-From fa77652a72c699a2bd68ee083bbb53ff78c3efe2 Mon Sep 17 00:00:00 2001
+From 3465392efce7b1c4a0d0eadca8b1323436a6c640 Mon Sep 17 00:00:00 2001
 From: Sam Hartman <hartmans@debian.org>
 Date: Mon, 26 Dec 2011 18:20:11 -0500
 Subject: debian: osconf.hin path changes
diff --git a/debian/patches/debian-local/0004-debian-install-ldap-library-in-subdirectory.patch b/debian/patches/debian-local/0004-debian-install-ldap-library-in-subdirectory.patch
index b510669af..5e92c6b93 100644
--- a/debian/patches/debian-local/0004-debian-install-ldap-library-in-subdirectory.patch
+++ b/debian/patches/debian-local/0004-debian-install-ldap-library-in-subdirectory.patch
@@ -1,4 +1,4 @@
-From 2d6a5de51730ae3eec6012888d67e7180c0051bd Mon Sep 17 00:00:00 2001
+From ab122f7a7654f725b6f198ce9856581abbcba029 Mon Sep 17 00:00:00 2001
 From: Sam Hartman <hartmans@debian.org>
 Date: Mon, 26 Dec 2011 18:12:39 -0500
 Subject: debian: install ldap library in subdirectory
diff --git a/debian/patches/debian-local/0005-gssapi-never-unload-mechanisms.patch b/debian/patches/debian-local/0005-gssapi-never-unload-mechanisms.patch
index bf0a0dd15..d8ba0e9a9 100644
--- a/debian/patches/debian-local/0005-gssapi-never-unload-mechanisms.patch
+++ b/debian/patches/debian-local/0005-gssapi-never-unload-mechanisms.patch
@@ -1,4 +1,4 @@
-From 40b4a99cc50340341487e52e7c01d8a65d446485 Mon Sep 17 00:00:00 2001
+From f7a1474334f4afb9b4d53dd79e0363982b158a42 Mon Sep 17 00:00:00 2001
 From: Benjamin Kaduk <kaduk@mit.edu>
 Date: Fri, 29 Mar 2013 17:18:40 -0400
 Subject: gssapi: never unload mechanisms
diff --git a/debian/patches/debian-local/0006-Add-substpdf-target.patch b/debian/patches/debian-local/0006-Add-substpdf-target.patch
index 5c2c91e60..c22c8bc14 100644
--- a/debian/patches/debian-local/0006-Add-substpdf-target.patch
+++ b/debian/patches/debian-local/0006-Add-substpdf-target.patch
@@ -1,4 +1,4 @@
-From 4e8b0f1763a11cfb9566b1958800b2ee00289c38 Mon Sep 17 00:00:00 2001
+From 3148ff86b7489eea936c740953245a8afbd4cfd3 Mon Sep 17 00:00:00 2001
 From: Ben Kaduk <kaduk@mit.edu>
 Date: Fri, 29 Mar 2013 20:53:37 -0400
 Subject: Add substpdf target
diff --git a/debian/patches/debian-local/0007-Fix-pkg-config-library-include-paths.patch b/debian/patches/debian-local/0007-Fix-pkg-config-library-include-paths.patch
index 50d821549..c753c1719 100644
--- a/debian/patches/debian-local/0007-Fix-pkg-config-library-include-paths.patch
+++ b/debian/patches/debian-local/0007-Fix-pkg-config-library-include-paths.patch
@@ -1,4 +1,4 @@
-From 342c1141c7ccf52ca5c9eee270ff45c087bea239 Mon Sep 17 00:00:00 2001
+From d45e25f793816720a457c5675f88e066891f1843 Mon Sep 17 00:00:00 2001
 From: Jelmer Vernooij <jelmer@debian.org>
 Date: Wed, 27 Aug 2014 16:40:29 -0400
 Subject: Fix pkg-config library/include paths
diff --git a/debian/patches/debian-local/0008-Use-isystem-for-include-paths.patch b/debian/patches/debian-local/0008-Use-isystem-for-include-paths.patch
index 251684e25..4d07627e2 100644
--- a/debian/patches/debian-local/0008-Use-isystem-for-include-paths.patch
+++ b/debian/patches/debian-local/0008-Use-isystem-for-include-paths.patch
@@ -1,4 +1,4 @@
-From 6d7d5c82fffa36cc309646f37bc21f3692784df0 Mon Sep 17 00:00:00 2001
+From 25995151a62e62ba1d3c6a73c9c1cc328e7daa6e Mon Sep 17 00:00:00 2001
 From: Jelmer Vernooij <jelmer@debian.org>
 Date: Wed, 3 Sep 2014 22:41:55 -0400
 Subject: Use -isystem for include paths
@@ -72,7 +72,7 @@ index 356501d38c..d39eeef889 100644
  Libs: -L${libdir} -lkdb5
  Libs.private: ${KDB5_DB_LIB}
 diff --git a/src/build-tools/krb5-config.in b/src/build-tools/krb5-config.in
-index 7fdab42128..113713cb1a 100755
+index ac2f5827d3..010457e153 100755
 --- a/src/build-tools/krb5-config.in
 +++ b/src/build-tools/krb5-config.in
 @@ -208,7 +208,7 @@ fi
diff --git a/src/build-tools/krb5-config.in b/src/build-tools/krb5-config.in
index 113713cb1..010457e15 100755
--- a/src/build-tools/krb5-config.in
+++ b/src/build-tools/krb5-config.in
@@ -36,7 +36,7 @@ fi
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-includedir=@prefix@/include/${tripple}/mit-krb5
+includedir=@prefix@/include/mit-krb5
 libdir=@prefix@/lib/${tripple}/mit-krb5
 CC_LINK='@CC_LINK@'
 KDB5_DB_LIB=@KDB5_DB_LIB@