From: Bruno Haible Date: Sat, 18 Feb 2012 00:45:22 +0000 (+0100) Subject: Update after gnulib changed. X-Git-Tag: v0.18.2~32 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=665a38c8599ede9842a0d88fb784820b5bd1317a;p=thirdparty%2Fgettext.git Update after gnulib changed. --- diff --git a/ChangeLog b/ChangeLog index 70792a3c5..d347e82e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-02-18 Bruno Haible + + * Makefile.am (distcheck-hook): Update after gnulib changed. + 2012-01-26 Bruno Haible Modernize quoting. diff --git a/Makefile.am b/Makefile.am index d555020ed..95890fba5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -61,6 +61,7 @@ distcheck-hook: cmp -s gettext-runtime/m4/longlong.m4 gettext-tools/gnulib-m4/longlong.m4 cmp -s gettext-runtime/m4/nls.m4 gettext-tools/gnulib-m4/nls.m4 cmp -s gettext-runtime/m4/po.m4 gettext-tools/gnulib-m4/po.m4 + cmp -s gettext-runtime/m4/gettext.m4 gettext-tools/gnulib-m4/gettext.m4 cmp -s gettext-runtime/m4/printf-posix.m4 gettext-tools/gnulib-m4/printf-posix.m4 cmp -s gettext-runtime/m4/progtest.m4 gettext-tools/gnulib-m4/progtest.m4 cmp -s gettext-runtime/m4/size_max.m4 gettext-tools/gnulib-m4/size_max.m4 @@ -71,27 +72,27 @@ distcheck-hook: cmp -s gettext-runtime/m4/wchar_t.m4 gettext-tools/gnulib-m4/wchar_t.m4 cmp -s gettext-runtime/m4/wint_t.m4 gettext-tools/gnulib-m4/wint_t.m4 cmp -s gettext-runtime/m4/xsize.m4 gettext-tools/gnulib-m4/xsize.m4 - test "`sed 1,17d gettext-runtime/intl/config.charset | md5sum`" = "`sed 1,18d gettext-tools/gnulib-lib/config.charset | md5sum`" - test "`sed 1,16d gettext-runtime/intl/localcharset.h | md5sum`" = "`sed 1,17d gettext-tools/gnulib-lib/localcharset.h | md5sum`" - test "`sed 1,16d gettext-runtime/intl/localcharset.c | md5sum`" = "`sed 1,17d gettext-tools/gnulib-lib/localcharset.c | md5sum`" - test "`sed 1,17d gettext-runtime/intl/localename.c | md5sum`" = "`sed 1,17d gettext-tools/gnulib-lib/localename.c | md5sum`" - test "`sed 1,15d gettext-runtime/intl/lock.h | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/glthread/lock.h | md5sum`" - test "`sed 1,15d gettext-runtime/intl/lock.c | md5sum`" = "`sed -e 1,16d -e 's,glthread/,,g' gettext-tools/gnulib-lib/glthread/lock.c | md5sum`" + test "`sed 1,17d gettext-runtime/intl/config.charset | md5sum`" = "`sed 1,17d gettext-tools/gnulib-lib/config.charset | md5sum`" + test "`sed 1,16d gettext-runtime/intl/localcharset.h | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/localcharset.h | md5sum`" + test "`sed 1,16d gettext-runtime/intl/localcharset.c | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/localcharset.c | md5sum`" + test "`sed 1,16d gettext-runtime/intl/localename.c | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/localename.c | md5sum`" + test "`sed 1,15d gettext-runtime/intl/lock.h | md5sum`" = "`sed 1,15d gettext-tools/gnulib-lib/glthread/lock.h | md5sum`" + test "`sed 1,15d gettext-runtime/intl/lock.c | md5sum`" = "`sed -e 1,15d -e 's,glthread/,,g' gettext-tools/gnulib-lib/glthread/lock.c | md5sum`" test "`sed 1,16d gettext-runtime/intl/verify.h | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/verify.h | md5sum`" cmp -s gettext-runtime/intl/printf-args.h gettext-runtime/libasprintf/printf-args.h cmp -s gettext-runtime/intl/printf-args.c gettext-runtime/libasprintf/printf-args.c cmp -s gettext-runtime/intl/printf-parse.h gettext-runtime/libasprintf/printf-parse.h cmp -s gettext-runtime/intl/printf-parse.c gettext-runtime/libasprintf/printf-parse.c cmp -s gettext-runtime/intl/verify.h gettext-runtime/libasprintf/verify.h - test "`sed 1,16d gettext-runtime/intl/ref-add.sin | md5sum`" = "`sed 1,17d gettext-tools/gnulib-lib/ref-add.sin | md5sum`" - test "`sed 1,16d gettext-runtime/intl/ref-del.sin | md5sum`" = "`sed 1,17d gettext-tools/gnulib-lib/ref-del.sin | md5sum`" + test "`sed 1,16d gettext-runtime/intl/ref-add.sin | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/ref-add.sin | md5sum`" + test "`sed 1,16d gettext-runtime/intl/ref-del.sin | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/ref-del.sin | md5sum`" test "`sed 1,18d gettext-runtime/intl/relocatable.h | md5sum`" = "`sed 1,18d gettext-tools/gnulib-lib/relocatable.h | md5sum`" test "`sed 1,18d gettext-runtime/intl/relocatable.c | md5sum`" = "`sed 1,18d gettext-tools/gnulib-lib/relocatable.c | md5sum`" cmp -s gettext-runtime/intl/vasnprintf.h gettext-runtime/libasprintf/vasnprintf.h - test "`sed 1,16d gettext-runtime/intl/vasnprintf.c | md5sum`" = "`sed 1,17d gettext-tools/gnulib-lib/vasnprintf.c | md5sum`" + test "`sed 1,16d gettext-runtime/intl/vasnprintf.c | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/vasnprintf.c | md5sum`" cmp -s gettext-runtime/intl/vasnprintf.c gettext-runtime/libasprintf/vasnprintf.c cmp -s gettext-runtime/intl/xsize.h gettext-runtime/libasprintf/xsize.h - test "`sed 1,16d gettext-runtime/intl/xsize.h | md5sum`" = "`sed 1,17d gettext-tools/gnulib-lib/xsize.h | md5sum`" + test "`sed 1,16d gettext-runtime/intl/xsize.h | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/xsize.h | md5sum`" cmp -s gettext-runtime/man/help2man gettext-tools/man/help2man cmp -s gettext-runtime/man/x-to-1.in gettext-tools/man/x-to-1.in cmp -s gettext-runtime/libasprintf/texi2html gettext-tools/doc/texi2html diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog index 6080b2d68..a54928ceb 100644 --- a/gnulib-local/ChangeLog +++ b/gnulib-local/ChangeLog @@ -1,3 +1,8 @@ +2012-02-17 Bruno Haible + + Update after gnulib changed. + * lib/exitfail.h.diff: Update. + 2012-01-26 Bruno Haible Modernize quoting. diff --git a/gnulib-local/lib/exitfail.h.diff b/gnulib-local/lib/exitfail.h.diff index 119c9587c..ffa459e84 100644 --- a/gnulib-local/lib/exitfail.h.diff +++ b/gnulib-local/lib/exitfail.h.diff @@ -1,13 +1,13 @@ *** gnulib/lib/exitfail.h 2005-05-14 08:03:58.000000000 +0200 --- gettext-tools/lib/exitfail.h 2006-07-22 16:35:58.000000000 +0200 *************** -*** 17,20 **** - If not, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +*** 15,18 **** + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ ! extern int volatile exit_failure; ---- 17,20 ---- - If not, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +--- 15,18 ---- + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ ! extern DLL_VARIABLE int volatile exit_failure;