Merge tag 'upstream/3.15.1' into experimental

Upstream version 3.15.1

# gpg: Signature made Mo 27 Okt 2014 20:14:03 CET
# gpg:                using RSA key 0x07B8B7B0EA98120B
# gpg: please do a --check-trustdb
# gpg: Good signature from "Guido Günther <agx@sigxcpu.org>"
# gpg:                 aka "Guido Günther <gg@godiug.net>"
# gpg:                 aka "Guido Günther <agx@debian.org>"

1 files changed, 15 insertions, 11 deletions

diff --git a/configure b/configure
index 4280f8f..24f9494 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for krb5-auth-dialog 3.12.0.
+# Generated by GNU Autoconf 2.69 for krb5-auth-dialog 3.15.1.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='krb5-auth-dialog'
 PACKAGE_TARNAME='krb5-auth-dialog'
-PACKAGE_VERSION='3.12.0'
-PACKAGE_STRING='krb5-auth-dialog 3.12.0'
+PACKAGE_VERSION='3.15.1'
+PACKAGE_STRING='krb5-auth-dialog 3.15.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -651,6 +651,7 @@ KRB5_LIBS
 KRB5_CFLAGS
 KRB5_CONFIG
 SC_PKCS11
+GLIB_COMPILE_RESOURCES
 GSETTINGS_RULES
 GLIB_COMPILE_SCHEMAS
 gsettingsschemadir
@@ -1437,7 +1438,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures krb5-auth-dialog 3.12.0 to adapt to many kinds of systems.
+\`configure' configures krb5-auth-dialog 3.15.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1508,7 +1509,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of krb5-auth-dialog 3.12.0:";;
+     short | recursive ) echo "Configuration of krb5-auth-dialog 3.15.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1663,7 +1664,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-krb5-auth-dialog configure 3.12.0
+krb5-auth-dialog configure 3.15.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2085,7 +2086,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by krb5-auth-dialog $as_me 3.12.0, which was
+It was created by krb5-auth-dialog $as_me 3.15.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2949,7 +2950,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='krb5-auth-dialog'
- VERSION='3.12.0'
+ VERSION='3.15.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14491,7 +14492,7 @@ fi
 
 
 
-GTK_REQUIRED=3.0
+GTK_REQUIRED=3.14
 GLIB_REQUIRED=2.28
 LIBNOTIFY_REQUIRED=0.7.0
 
@@ -15094,6 +15095,9 @@ endif
 
 
 
+GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
+
+
 # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then :
   enableval=$enable_debug;
@@ -16589,7 +16593,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by krb5-auth-dialog $as_me 3.12.0, which was
+This file was extended by krb5-auth-dialog $as_me 3.15.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16655,7 +16659,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-krb5-auth-dialog config.status 3.12.0
+krb5-auth-dialog config.status 3.15.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"