From: Ian Beckwith <ianb@erislabs.net>
Date: Mon, 3 Feb 2014 00:57:26 +0000 (+0000)
Subject: Merge branch 'stable'
X-Git-Tag: debian/20140202+stable-1~7
X-Git-Url: http://erislabs.net/gitweb/?p=gnulib.git;a=commitdiff_plain;h=e1c466d11a91615c413789ea8bc3ec358f2c6aa9

Merge branch 'stable'
---

e1c466d11a91615c413789ea8bc3ec358f2c6aa9
diff --cc debian/patches/01-gnulib-directory.patch
index 9cb8c4889,000000000..57ebbf77e
mode 100644,000000..100644
--- a/debian/patches/01-gnulib-directory.patch
+++ b/debian/patches/01-gnulib-directory.patch
@@@ -1,33 -1,0 +1,33 @@@
 +Author: Daniel Baumann <daniel@debian.org>
 +Description: Sets the gnulib directory.
 +
 +Index: gnulib/gnulib-tool
 +===================================================================
- --- gnulib.orig/gnulib-tool	2013-08-11 12:33:21.000000000 +0100
- +++ gnulib/gnulib-tool	2013-08-11 15:05:06.000000000 +0100
++--- gnulib.orig/gnulib-tool	2014-02-03 00:56:56.000000000 +0000
+++++ gnulib/gnulib-tool	2014-02-03 00:57:02.000000000 +0000
 +@@ -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.
 +@@ -453,7 +454,7 @@
 +       * ) 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
diff --cc debian/patches/02-shebang.patch
index e99750370,000000000..019206047
mode 100644,000000..100644
--- a/debian/patches/02-shebang.patch
+++ b/debian/patches/02-shebang.patch
@@@ -1,13 -1,0 +1,13 @@@
 +Author: Daniel Baumann <daniel@debian.org>
 +Description: Adjusts shebang.
 +
 +Index: gnulib/lib/uniname/gen-uninames.lisp
 +===================================================================
- --- gnulib.orig/lib/uniname/gen-uninames.lisp	2011-06-10 02:20:10.000000000 +0100
- +++ gnulib/lib/uniname/gen-uninames.lisp	2011-06-10 02:20:14.000000000 +0100
++--- gnulib.orig/lib/uniname/gen-uninames.lisp	2014-02-03 00:56:56.000000000 +0000
+++++ gnulib/lib/uniname/gen-uninames.lisp	2014-02-03 00:57:09.000000000 +0000
 +@@ -1,4 +1,4 @@
 +-#!/usr/local/bin/clisp -C
 ++#!/usr/bin/clisp -C
 + 
 + ;;; Creation of gnulib's uninames.h from the UnicodeData.txt table.
 + ;;; Bruno Haible 2000-12-28
diff --cc gnulib-tool
index 13aac1ab9,4e7d45e4e..84be8a713
--- a/gnulib-tool
+++ b/gnulib-tool
@@@ -1,6 -1,6 +1,6 @@@
  #! /bin/sh
  #
--# Copyright (C) 2002-2014 Free Software Foundation, Inc.
++# Copyright (C) 2002-2013 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
@@@ -899,9 -898,9 +899,6 @@@ if test "X$1" = "X--no-reexec"; the
    shift
  fi
  
--# Unset CDPATH.  Otherwise, output from 'cd dir' can surprise callers.
--(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
--
  # Command-line option processing.
  # Removes the OPTIONS from the arguments. Sets the variables:
  # - mode            one of: list, find, import, add-import, remove-import,