Merge commit 'a39d4083cab589d7cd6a13e8a4b8db8875261d75'

diff --combined gnulib-tool
index cf22e54,4e7d45e..13aac1a
--- 1/gnulib-tool
--- 2/gnulib-tool
+++ b/gnulib-tool
@@@ -1,6 -1,6 +1,6 @@@
  #! /bin/sh
  #
- # Copyright (C) 2002-2013 Free Software Foundation, Inc.
+ # Copyright (C) 2002-2014 Free Software Foundation, Inc.
  #
  # This program is free software: you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
@@@ -323,13 -323,12 +323,13 @@@
      version=' '`cd "$gnulib_dir" && ./build-aux/git-version-gen /dev/null | sed -e 's/-dirty/-modified/'`
    else
      # gnulib copy without versioning information.
 -    date=`sed -e 's/ .*//;q' "$gnulib_dir"/ChangeLog`
 -    version=
 +    date=`zcat /usr/share/doc/gnulib/changelog.gz | sed -e 's/ .*//;q'`
 +    version=`zcat /usr/share/doc/gnulib/NEWS.stable.gz | grep -o -m 1 ' [0-9]\+-stable'`
 +    debversion=`dpkg-query --show --showformat '${Version}' gnulib`
    fi
    year=`"$gnulib_dir"/build-aux/mdate-sh "$self_abspathname" | sed -e 's,^.* ,,'`
    echo "\
 -gnulib-tool (GNU $package $date)$version
 +gnulib-tool (GNU $package $date)$version Debian: $debversion
  Copyright (C) $year Free Software Foundation, Inc.
  License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
  This is free software: you are free to change and redistribute it.
@@@ -454,7 -453,7 +454,7 @@@ func_gnulib_dir (
        * ) self_abspathname=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`/"$linkval" ;;
      esac
    done
 -  gnulib_dir=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`
 +  gnulib_dir=/usr/share/gnulib
  }
  
  # func_tmpdir