Skip to content

Commit

Permalink
Update to gettext 0.19.7. Update NEWS.
Browse files Browse the repository at this point in the history
  • Loading branch information
arnoldrobbins committed Feb 23, 2016
1 parent 062e6b0 commit 2c80dd3
Show file tree
Hide file tree
Showing 16 changed files with 1,309 additions and 1,176 deletions.
2,393 changes: 1,245 additions & 1,148 deletions ABOUT-NLS

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
2016-02-23 Arnold D. Robbins <[email protected]>

* NEWS: Update full list of infrastructure tools.

2016-02-22 gettextize <[email protected]>

* configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.19.7.

2016-02-21 Arnold D. Robbins <[email protected]>

* regexec.c (prune_impossible_nodes): Remove attribute that
Expand Down
6 changes: 3 additions & 3 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015,
Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016,
Free Software Foundation, Inc.

Copying and distribution of this file, with or without modification,
Expand All @@ -8,8 +8,8 @@
Changes from 4.1.3 to 4.1.x
---------------------------

1. Updated to GNU autoconf 2.69, automake 1.15, gettext 0.19.5.1,
texinfo 6.1, texinfo.tex 2016-02-05.07.
1. Updated to GNU autoconf 2.69, automake 1.15, gettext 0.19.7,
texinfo 6.1, texinfo.tex 2016-02-05.07, libtool 2.4.6.

2. z/OS support updated.

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ AC_LANG([C])

dnl initialize GNU gettext
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION([0.19.4])
AM_GNU_GETTEXT_VERSION([0.19.7])
AM_LANGINFO_CODESET
gt_LC_MESSAGES

Expand Down
3 changes: 2 additions & 1 deletion gettext.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* Convenience header for conditional use of GNU <libintl.h>.
Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2013 Free Software Foundation, Inc.
Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2011, 2015 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
Expand Down
10 changes: 10 additions & 0 deletions m4/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
2016-02-22 gettextize <[email protected]>

* gettext.m4: Upgrade to gettext-0.19.7.
* lib-ld.m4: Upgrade to gettext-0.19.7.
* lib-link.m4: Upgrade to gettext-0.19.7.
* lib-prefix.m4: Upgrade to gettext-0.19.7.
* nls.m4: Upgrade to gettext-0.19.7.
* po.m4: Upgrade to gettext-0.19.7.
* progtest.m4: Upgrade to gettext-0.19.7.

2015-09-11 Daniel Richard G. <[email protected]>

* arch.m4: Rework again. In particular, provide a wrapper
Expand Down
10 changes: 7 additions & 3 deletions m4/gettext.m4
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# gettext.m4 serial 66 (gettext-0.18.2)
# gettext.m4 serial 67 (gettext-0.19.6)
dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl
dnl This file can can be used in projects which are not available under
dnl This file can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
dnl License but which still want to provide support for the GNU gettext
dnl functionality.
dnl Please note that the actual code of the GNU gettext library is covered
dnl by the GNU Library General Public License, and the rest of the GNU
dnl gettext package package is covered by the GNU General Public License.
dnl gettext package is covered by the GNU General Public License.
dnl They are *not* in the public domain.

dnl Authors:
Expand Down Expand Up @@ -399,3 +399,7 @@ AC_DEFUN([AM_GNU_GETTEXT_NEED],

dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])


dnl Usage: AM_GNU_GETTEXT_REQUIRE_VERSION([gettext-version])
AC_DEFUN([AM_GNU_GETTEXT_REQUIRE_VERSION], [])
2 changes: 1 addition & 1 deletion m4/lib-ld.m4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# lib-ld.m4 serial 6
dnl Copyright (C) 1996-2003, 2009-2014 Free Software Foundation, Inc.
dnl Copyright (C) 1996-2003, 2009-2015 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
Expand Down
2 changes: 1 addition & 1 deletion m4/lib-link.m4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# lib-link.m4 serial 26 (gettext-0.18.2)
dnl Copyright (C) 2001-2014 Free Software Foundation, Inc.
dnl Copyright (C) 2001-2015 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
Expand Down
2 changes: 1 addition & 1 deletion m4/lib-prefix.m4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# lib-prefix.m4 serial 7 (gettext-0.18)
dnl Copyright (C) 2001-2005, 2008-2014 Free Software Foundation, Inc.
dnl Copyright (C) 2001-2005, 2008-2015 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
Expand Down
4 changes: 2 additions & 2 deletions m4/nls.m4
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl
dnl This file can can be used in projects which are not available under
dnl This file can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
dnl License but which still want to provide support for the GNU gettext
dnl functionality.
dnl Please note that the actual code of the GNU gettext library is covered
dnl by the GNU Library General Public License, and the rest of the GNU
dnl gettext package package is covered by the GNU General Public License.
dnl gettext package is covered by the GNU General Public License.
dnl They are *not* in the public domain.

dnl Authors:
Expand Down
4 changes: 2 additions & 2 deletions m4/po.m4
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl
dnl This file can can be used in projects which are not available under
dnl This file can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
dnl License but which still want to provide support for the GNU gettext
dnl functionality.
dnl Please note that the actual code of the GNU gettext library is covered
dnl by the GNU Library General Public License, and the rest of the GNU
dnl gettext package package is covered by the GNU General Public License.
dnl gettext package is covered by the GNU General Public License.
dnl They are *not* in the public domain.

dnl Authors:
Expand Down
6 changes: 3 additions & 3 deletions m4/progtest.m4
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# progtest.m4 serial 7 (gettext-0.18.2)
dnl Copyright (C) 1996-2003, 2005, 2008-2014 Free Software Foundation, Inc.
dnl Copyright (C) 1996-2003, 2005, 2008-2015 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl
dnl This file can can be used in projects which are not available under
dnl This file can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
dnl License but which still want to provide support for the GNU gettext
dnl functionality.
dnl Please note that the actual code of the GNU gettext library is covered
dnl by the GNU Library General Public License, and the rest of the GNU
dnl gettext package package is covered by the GNU General Public License.
dnl gettext package is covered by the GNU General Public License.
dnl They are *not* in the public domain.

dnl Authors:
Expand Down
5 changes: 5 additions & 0 deletions po/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2016-02-22 gettextize <[email protected]>

* Makefile.in.in: Upgrade to gettext-0.19.7.
* Rules-quot: Upgrade to gettext-0.19.7.

2015-05-19 Arnold D. Robbins <[email protected]>

* 4.1.3: Release tar ball made.
Expand Down
26 changes: 17 additions & 9 deletions po/Makefile.in.in
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
# Makefile for PO directory in any package using GNU gettext.
# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <[email protected]>
#
# This file can be copied and used freely without restrictions. It can
# be used in projects which are not available under the GNU General Public
# License but which still want to provide support for the GNU gettext
# functionality.
# Please note that the actual code of GNU gettext is covered by the GNU
# General Public License and is *not* in the public domain.
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
# notice and this notice are preserved. This file is offered as-is,
# without any warranty.
#
# Origin: gettext-0.19
# Origin: gettext-0.19.7
GETTEXT_MACRO_VERSION = 0.19

PACKAGE = @PACKAGE@
Expand Down Expand Up @@ -45,6 +43,11 @@ install_sh = $(SHELL) @install_sh@
MKDIR_P = @MKDIR_P@
mkdir_p = @mkdir_p@

# When building gettext-tools, we prefer to use the built programs
# rather than installed programs. However, we can't do that when we
# are cross compiling.
CROSS_COMPILING = @CROSS_COMPILING@

GMSGFMT_ = @GMSGFMT@
GMSGFMT_no = @GMSGFMT@
GMSGFMT_yes = @GMSGFMT_015@
Expand Down Expand Up @@ -197,6 +200,11 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
;; \
esac
test ! -f $(DOMAIN).po || { \
if test -f $(srcdir)/$(DOMAIN).pot-header; then \
sed -e '1,/^#$$/d' < $(DOMAIN).po > $(DOMAIN).1po && \
cat $(srcdir)/$(DOMAIN).pot-header $(DOMAIN).1po > $(DOMAIN).po; \
rm -f $(DOMAIN).1po; \
fi; \
if test -f $(srcdir)/$(DOMAIN).pot; then \
sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
Expand Down Expand Up @@ -226,7 +234,7 @@ $(POFILES): $(POFILESDEPS)
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
cd $(srcdir) \
&& { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
&& { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
'' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
*) \
Expand Down Expand Up @@ -427,7 +435,7 @@ update-po: Makefile

.nop.po-update:
@lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
if test "$(PACKAGE)" = "gettext-tools" && test "$(CROSS_COMPILING)" != "yes"; then PATH=`pwd`/../src:$$PATH; fi; \
tmpdir=`pwd`; \
echo "$$lang:"; \
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
Expand Down
2 changes: 1 addition & 1 deletion po/Rules-quot
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ [email protected]: [email protected]

.insert-header.po-update-en:
@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
if test "$(PACKAGE)" = "gettext-tools" && test "$(CROSS_COMPILING)" != "yes"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
tmpdir=`pwd`; \
echo "$$lang:"; \
ll=`echo $$lang | sed -e 's/@.*//'`; \
Expand Down

0 comments on commit 2c80dd3

Please sign in to comment.