Remove pasted plus signs
authorLuk Claes <luk@debian.org>
Sun, 2 Oct 2011 16:08:42 +0000 (18:08 +0200)
committerLuk Claes <luk@debian.org>
Sun, 2 Oct 2011 16:08:42 +0000 (18:08 +0200)
debian/patches/17-multiarch-kerberos-paths.patch

index 385eb40..6f3365c 100644 (file)
@@ -1,18 +1,18 @@
-+--- trunk.orig/aclocal/kerberos5.m4
-++++ trunk/aclocal/kerberos5.m4
-+@@ -29,6 +29,7 @@
-+     elif test -f "/usr/lib/mit/bin/krb5-config"; then
-+       K5CONFIG="/usr/lib/mit/bin/krb5-config"
-+     fi
-++    MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null || true`
-+     if test "$K5CONFIG" != ""; then
-+       KRBCFLAGS=`$K5CONFIG --cflags`
-+       KRBLIBS=`$K5CONFIG --libs gssapi`
-+@@ -38,6 +39,7 @@
-+                 \( -f $dir/lib/libgssapi_krb5.a -o \
-+                    -f $dir/lib64/libgssapi_krb5.a -o \
-+                    -f $dir/lib64/libgssapi_krb5.so -o \
-++                   -f $dir/lib/$MULTIARCH/libgssapi_krb5.so -o \
-+                    -f $dir/lib/libgssapi_krb5.so \) ; then
-+          AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries])
-+          KRBDIR="$dir"
+--- trunk.orig/aclocal/kerberos5.m4
++++ trunk/aclocal/kerberos5.m4
+@@ -29,6 +29,7 @@
+     elif test -f "/usr/lib/mit/bin/krb5-config"; then
+       K5CONFIG="/usr/lib/mit/bin/krb5-config"
+     fi
++    MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null || true`
+     if test "$K5CONFIG" != ""; then
+       KRBCFLAGS=`$K5CONFIG --cflags`
+       KRBLIBS=`$K5CONFIG --libs gssapi`
+@@ -38,6 +39,7 @@
+                 \( -f $dir/lib/libgssapi_krb5.a -o \
+                    -f $dir/lib64/libgssapi_krb5.a -o \
+                    -f $dir/lib64/libgssapi_krb5.so -o \
++                   -f $dir/lib/$MULTIARCH/libgssapi_krb5.so -o \
+                    -f $dir/lib/libgssapi_krb5.so \) ; then
+          AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries])
+          KRBDIR="$dir"