Merge branch 'release'

Second gnugpg test suite fix

diff --cc configure
index d0d8f18acef8a3d2f5cfbbf2c70361b0410e0af0,f17730441298648bcc31a66992ccd38ef259d6bb..fa77eb8fd4b7b406f2b3a097137c4c5001c285f9
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -612,29 -602,6 +612,16 @@@ if [ $WITH_DOCS = "1" ] ; the
      fi
  fi
  
- have_gpgconf_socketdir=0
- printf "Checking for gpgconf --{create,remove}-socketdir... "
- if gpgconf --dump-options > /dev/null ; then
-     if gpgconf --dump-options | grep -q create-socketdir ; then
-       printf "Yes.\n"
-       have_gpgconf_socketdir=1
-     else
-       printf "No.\n"
-     fi
- else
-     printf "No. (missing or broken gpgconf?)\n"
- fi
- 
 +if [ $WITH_DESKTOP = "1" ]; then
 +    printf "Checking if desktop-file-install is available... "
 +    if command -v desktop-file-install > /dev/null; then
 +      printf "Yes.\n"
 +    else
 +      printf "No (so will not install .desktop file).\n"
 +      WITH_DESKTOP=0
 +    fi
 +fi
 +
  libdir_in_ldconfig=0
  
  printf "Checking which platform we are on... "

diff --cc test/test-lib.sh
Simple merge