Mercurial > octave-nkf
changeset 15890:44f30dcd87e0
maint: merge in gnulib changes from stable
| author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
|---|---|
| date | Thu, 03 Jan 2013 13:24:14 -0500 |
| parents | fde9297ae074 (current diff) 7f4082b00a99 (diff) |
| children | 1ca9beb2a194 1f076c40c133 |
| files | .hgsub .hgsubstate build-aux/bootstrap_gnulib |
| diffstat | 3 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsub Thu Jan 03 10:06:59 2013 -0800 +++ b/.hgsub Thu Jan 03 13:24:14 2013 -0500 @@ -1,1 +1,1 @@ -gnulib = [git]git://git.sv.gnu.org/gnulib +gnulib-hg = gnulib-hg
--- a/.hgsubstate Thu Jan 03 10:06:59 2013 -0800 +++ b/.hgsubstate Thu Jan 03 13:24:14 2013 -0500 @@ -1,1 +1,1 @@ -e657573866e8aded3b3b1461c346cf9ad02a5148 gnulib +c960be36c9f3f690ceb43057314354e0df736416 gnulib-hg
--- a/build-aux/bootstrap_gnulib Thu Jan 03 10:06:59 2013 -0800 +++ b/build-aux/bootstrap_gnulib Thu Jan 03 13:24:14 2013 -0500 @@ -205,8 +205,10 @@ # default. bootstrap_sync=false -# Use git to update gnulib sources -use_git=true +# Don't use git to update gnulib sources. We keep gnulib under a +# Mercurial subrepository instead +use_git=false +GNULIB_SRCDIR=gnulib-hg # find_tool ENVVAR NAMES... # -------------------------