From 9d3b73dd503f03247ae0c7da241a09b38d16e171 Mon Sep 17 00:00:00 2001
From: Luigi Scarso <luigi.scarso@gmail.com>
Date: Tue, 23 Dec 2014 23:30:05 +0000
Subject: [PATCH] sync with TL 35886

---
 source/m4/ChangeLog              | 5 +++++
 source/m4/kpse-pkgs.m4           | 2 +-
 source/texk/README               | 4 +---
 source/texk/kpathsea/Makefile.in | 4 ++--
 source/utils/README              | 4 +++-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/source/m4/ChangeLog b/source/m4/ChangeLog
index dccc3008a..b3399af03 100644
--- a/source/m4/ChangeLog
+++ b/source/m4/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* kpse-pkgs.m4 (kpse_texk_pkgs): Move devnag from here ...
+	(kpse_utils_pkgs): ... to here.
+
 2014-12-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* kpse-pkgs.m4 (kpse_texk_pkgs): Rename ps2pkm => ps2pk.
diff --git a/source/m4/kpse-pkgs.m4 b/source/m4/kpse-pkgs.m4
index cd6377e53..7025d913e 100644
--- a/source/m4/kpse-pkgs.m4
+++ b/source/m4/kpse-pkgs.m4
@@ -80,6 +80,7 @@ AC_REQUIRE([KPSE_HARFBUZZ_SYSTEM_FLAGS])[]dnl
 # Define the list of utility sub-packages, i.e., subdirs 'utils/*'.
 AC_DEFUN([KPSE_UTILS_PKGS], [dnl
 m4_define([kpse_utils_pkgs], [dnl
+devnag
 m-tx
 pmx
 ps2eps
@@ -103,7 +104,6 @@ bibtex-x
 chktex
 cjkutils
 detex
-devnag
 dtl
 dvi2tty
 dvidvi
diff --git a/source/texk/README b/source/texk/README
index 1f23ede75..cdaa11890 100644
--- a/source/texk/README
+++ b/source/texk/README
@@ -1,4 +1,4 @@
-$Id: README 35838 2014-12-16 08:47:28Z peter $
+$Id: README 35886 2014-12-23 09:31:54Z peter $
 Copyright 2006-2012 TeX Users Group.
 You may freely use, modify and/or distribute this file.
 
@@ -37,8 +37,6 @@ cjkutils 4.8.3 - checked 11may12
 detex 2.8 - checked 10may12
   http://www.cs.purdue.edu/homes/trinkle/detex/
 
-devnag - from devnag package installed in texmf-dist.
-
 dtl - ?
 
 dvi2tty 5.3.4 - checked 10may12
diff --git a/source/texk/kpathsea/Makefile.in b/source/texk/kpathsea/Makefile.in
index d6f75e066..56e5e28dd 100644
--- a/source/texk/kpathsea/Makefile.in
+++ b/source/texk/kpathsea/Makefile.in
@@ -110,8 +110,8 @@ DIST_COMMON = $(top_srcdir)/../../am/bin_links.am \
 	$(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
 	$(srcdir)/Makefile.am $(top_srcdir)/configure \
 	$(am__configure_deps) $(srcdir)/c-auto.in \
-	$(srcdir)/kpathsea.pc.in putenv.c strstr.c strcasecmp.c \
-	strtol.c $(dist_noinst_SCRIPTS) $(dist_web2c_SCRIPTS) \
+	$(srcdir)/kpathsea.pc.in strcasecmp.c putenv.c strtol.c \
+	strstr.c $(dist_noinst_SCRIPTS) $(dist_web2c_SCRIPTS) \
 	$(top_srcdir)/../../build-aux/depcomp $(dist_noinst_DATA) \
 	$(dist_web2c_DATA) $(kpseinclude_HEADERS) $(noinst_HEADERS) \
 	$(top_srcdir)/../../build-aux/test-driver AUTHORS ChangeLog \
diff --git a/source/utils/README b/source/utils/README
index 38eb2f507..5a9693807 100644
--- a/source/utils/README
+++ b/source/utils/README
@@ -1,4 +1,4 @@
-$Id: README 35661 2014-11-25 08:47:42Z peter $
+$Id: README 35886 2014-12-23 09:31:54Z peter $
 Public domain.  Originally written 2005 by Karl Berry.
 
 Extra utilities we (optionally) compile for TeX Live.
@@ -9,6 +9,8 @@ asymptote 2.31 - checked 17may14
   see http://tug.org/texlive/build.html#asymptote
   and tlpkg/bin/tl-update-asy
 
+devnag - from devanagari package installed in texmf-dist.
+
 m-tx 0.60d - checked 16apr12
   http://mirror.ctan.org/support/m-tx/
 
-- 
GitLab