Hello community,
here is the log from the commit of package intltool
checked in at Wed Aug 29 22:04:37 CEST 2007.
--------
--- GNOME/intltool/intltool.changes 2007-03-22 18:16:09.000000000 +0100
+++ /mounts/work_src_done/NOARCH/intltool/intltool.changes 2007-08-29 17:14:55.999259000 +0200
@@ -1,0 +2,8 @@
+Wed Aug 29 17:12:43 CEST 2007 - maw@suse.de
+
+- Update to version 0.36.1:
+ + Bugs (bugzilla.gnome.org) fixed: #464846, #464474, #464121,
+ #349560, #462312, and #449938.
+- Refresh intltool-extract-check-hack.patch
+
+-------------------------------------------------------------------
Old:
----
intltool-0.35.5.tar.bz2
New:
----
intltool-0.36.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ intltool.spec ++++++
--- /var/tmp/diff_new_pack.E19005/_old 2007-08-29 22:02:25.000000000 +0200
+++ /var/tmp/diff_new_pack.E19005/_new 2007-08-29 22:02:25.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package intltool (Version 0.35.5)
+# spec file for package intltool (Version 0.36.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,14 +13,14 @@
Name: intltool
BuildRequires: perl-XML-Parser
Summary: Internationalization Tool Collection
-Version: 0.35.5
-Release: 2
+Version: 0.36.1
+Release: 1
Group: Development/Tools/Other
BuildArchitectures: noarch
Requires: gettext-devel perl-XML-Parser
Provides: xml-i18n-tools
Obsoletes: xml-i18n-tools
-License: GNU General Public License (GPL)
+License: GPL v2 or later
URL: http://www.gnome.org
Source: ftp://ftp.gnome.org/pub/gnome/sources/intltool/%{version}/%{name}-%{version}.tar.bz2
Patch: intltool-extract-check-hack.patch
@@ -67,6 +67,11 @@
%doc %{_mandir}/man8/*.*
%changelog
+* Wed Aug 29 2007 - maw@suse.de
+- Update to version 0.36.1:
+ + Bugs (bugzilla.gnome.org) fixed: #464846, #464474, #464121,
+ [#349560], #462312, and #449938.
+- Refresh intltool-extract-check-hack.patch
* Thu Mar 22 2007 - sbrabec@suse.cz
- Worked around bad intltool-extract check.
* Wed Mar 21 2007 - maw@suse.de
++++++ intltool-0.35.5.tar.bz2 -> intltool-0.36.1.tar.bz2 ++++++
++++ 3618 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/intltool-0.35.5/ChangeLog new/intltool-0.36.1/ChangeLog
--- old/intltool-0.35.5/ChangeLog 2007-02-23 20:45:18.000000000 +0100
+++ new/intltool-0.36.1/ChangeLog 2007-08-13 15:34:36.000000000 +0200
@@ -1,3 +1,162 @@
+2007-08-13 Rodney Dawes
+
+ * configure.in: Up version to 0.36.1 for release
+
+2007-08-09 Rodney Dawes
+
+ * intltool-merge.in.in:
+ Get rid of isGNUGettextTool as we don't really need it here
+ Only check if iconv is in the path
+
+ Fixes #464846
+
+2007-08-07 Rodney Dawes
+
+ * intltool-update.in.in (FindLeftoutFiles):
+ Strip _build/ from the path name, to ignore some files during distcheck
+
+ Fixes #464474
+
+2007-08-07 Rodney Dawes
+
+ * intltool-update.in.in (CONF_Handle_Open):
+ Check for the conf_in file in $SRCDIR/../ instead of just ../
+
+ Fixes #464474
+
+2007-08-06 Rodney Dawes
+
+ * intltool-update.in.in (Console_Write_CoverageReport):
+ Print the locale id and Current translation status message to STDERR
+
+ Fixes #464121
+
+2007-08-02 Rodney Dawes
+
+ * configure.in: Up version to 0.36.0 for release
+
+ * intltool.m4: Up serial to 36
+
+2007-08-02 Rodney Dawes
+
+ * configure.in:
+ * Makefile.am:
+ * intltool.m4:
+ Don't need the xgettext/msgfmt/msgmerge/iconv checks any more
+ Don't need to substitute xgettext/msgfmt/msgmerge/iconv variables
+
+ * intltool-merge.in.in: Add isProgramInPath and isGNUGettextTool
+ methods and check for GNU iconv here
+
+ * intltool-update.in.in (Get_Program_Path):
+ Rename to isProgramInPath
+ Use $devnull to redirect
+ Pass --version to $file to avoid "no input file" errors
+ (isGNUGettextTool): New method to check for GNU gettext tools
+ (GenerateHeaders, GeneratePOTemplate, POFile_Update):
+ (Console_Write_TranslationStatus, Console_Write_CoverateReport):
+ Update to use isGNUGettextTool to ensure we use GNU gettext tools
+
+ Fixes #301364 and #311936
+
+2007-08-02 Rodney Dawes
+
+ * intltool-update.in.in (isIntltoolExtractInPath):
+ Rename to Get_Program_Path
+ (GenerateHeaders, GeneratePOTemplate): Use Get_Program_Path method
+ to find the path for $EXTRACT and $XGETTEXT
+
+ Fixes #349560
+
+2007-08-01 David Zeuthen
+
+ * intltool-update.in.in, intltool.m4: Add support for PolicyKit
+ policy XML files (extension .policy).
+
+ Fixes #462312
+
+2007-08-01 Rodney Dawes
+
+ Patch from Wouter Bolsterlee
+
+ * intltool-update.in.in. (FindLeftoutFiles):
+ Don't need to strip $SRCDIR from filenames when adding to hash table
+ Gettext doesn't require the reference to not have the leading ../
+
+ Fixes #449938
+
+2007-07-20 Danilo Šegan
+
+ Patch from Leonardo Boshell
+
+ * intltool-extract.in.in (entity_decode): Decode & after all the
+ other entities to avoid double decoding.
+ * intltool-merge.in.in (entity_decode): Decode & at the end and
+ decode > as well so strings are decoded exactly the same by the
+ extract and merge tools.
+ * tests/cases/extract14.xml.in:
+ * tests/cases/merge12.xml.in:
+ * tests/cases/test.po:
+ * tests/results/extract14.xml.in.h:
+ * tests/results/merge12.xml:
+ * tests/selftest.pl.in: New tests to check that entities in XML files
+ are decoded in the proper order.
+
+ Fixes #411698.
+
+2007-06-30 Rodney Dawes
+
+ * intltool-update.in.in (FindLeftoutFiles):
+ Look for files in $SRCDIR/.. as well as ..
+ Strip $SRCDIR from the filenames when adding to the hash table
+ Strip $SRCDIR from the filenames when looking up in the hash table
+ Strip $SRCDIR from the filenames when listing in missing
+
+ Fixes #438722
+
+2007-06-30 Rodney Dawes
+
+ * intltool-update.in.in (GeneratePOTemplate):
+ Don't write $SRCDIR/../ or ../ to POTFILES.in.temp
+ Pass .. as the --directory argument to xgettext
+ Pass --default-domain to xgettext
+ Pass --flag arguments for glib functions to xgettext
+
+ Fixes #449938
+
+2007-06-28 Rodney Dawes
+
+ * intltool.m4: Fix autoconf warnings
+ Patch from Guillem Jover
+
+ Fixes #430093
+
+2007-06-27 Rodney Dawes
+
+ * Makefile.in.in: Add dummy install-exec
+
+ Fixes #448200
+
+2007-03-17 Thomas Andersen
+
+ * tests/cases/extract13.desktop.in
+ Remove invalid category "Application"
+
+ Fixes #417659
+
+2007-03-02 Danilo Šegan
+
+ Fix #413461 (resulting from #399476 fix).
+
+ * intltool-update.in.in (isIntltoolExtractInPath): Added.
+ (GenerateHeaders): Use isIntltoolExtractInPath instead of -x.
+
+2007-02-28 Tor Lillqvist
+
+ * tests/selftest.pl.in: Use --strip-trailing-cr on Windows. (This
+ requires a reasonably new GNU diff. The 2.8.7 one from gnuwin32
+ seems to work fine.) Fixes make check on Windows.
+
2007-02-23 Rodney Dawes
* NEWS:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/intltool-0.35.5/configure.in new/intltool-0.36.1/configure.in
--- old/intltool-0.35.5/configure.in 2007-02-23 20:41:29.000000000 +0100
+++ new/intltool-0.36.1/configure.in 2007-08-13 15:34:04.000000000 +0200
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to create configure.
AC_INIT(intltoolize.in)
-INTLTOOL_VERSION=0.35.5
+INTLTOOL_VERSION=0.36.1
AM_INIT_AUTOMAKE(intltool, $INTLTOOL_VERSION)
@@ -23,12 +23,6 @@
AC_MSG_ERROR([XML::Parser perl module is required for intltool])
fi
-AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv)
-AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt)
-AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
-AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
-
-
AC_OUTPUT([
Makefile
doc/Makefile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/intltool-0.35.5/intltool-extract.in.in new/intltool-0.36.1/intltool-extract.in.in
--- old/intltool-0.35.5/intltool-extract.in.in 2007-01-10 16:51:00.000000000 +0100
+++ new/intltool-0.36.1/intltool-extract.in.in 2007-08-01 14:52:18.000000000 +0200
@@ -237,9 +237,9 @@
s/'/'/g; # '
s/"/"/g; # "
- s/&/&/g;
s/<//g;
+ s/&/&/g;
return $_;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/intltool-0.35.5/intltool.m4 new/intltool-0.36.1/intltool.m4
--- old/intltool-0.35.5/intltool.m4 2007-01-03 22:05:42.000000000 +0100
+++ new/intltool-0.36.1/intltool.m4 2007-08-03 02:18:13.000000000 +0200
@@ -23,7 +23,7 @@
## the same distribution terms that you use for the rest of that program.
dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 35 IT_PROG_INTLTOOL
+# serial 36 IT_PROG_INTLTOOL
AC_DEFUN([IT_PROG_INTLTOOL],
[AC_PREREQ([2.50])dnl
@@ -36,7 +36,7 @@
esac
if test -n "$1"; then
- AC_MSG_CHECKING(for intltool >= $1)
+ AC_MSG_CHECKING([for intltool >= $1])
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
@@ -65,6 +65,7 @@
INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
AC_SUBST(INTLTOOL_DESKTOP_RULE)
AC_SUBST(INTLTOOL_DIRECTORY_RULE)
@@ -84,6 +85,7 @@
AC_SUBST(INTLTOOL_SCHEMAS_RULE)
AC_SUBST(INTLTOOL_THEME_RULE)
AC_SUBST(INTLTOOL_SERVICE_RULE)
+AC_SUBST(INTLTOOL_POLICY_RULE)
# Use the tools built into the package, not the ones that are installed.
AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
@@ -106,19 +108,16 @@
fi
fi
-AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv)
-AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt)
-AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
-AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
-
# Substitute ALL_LINGUAS so we can use it in po/Makefile
AC_SUBST(ALL_LINGUAS)
# Set DATADIRNAME correctly if it is not set yet
# (copied from glib-gettext.m4)
if test -z "$DATADIRNAME"; then
- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
- return _nl_msg_cat_cntr],
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[]],
+ [[extern int _nl_msg_cat_cntr;
+ return _nl_msg_cat_cntr]])],
[DATADIRNAME=share],
[case $host in
*-*-solaris*)
@@ -159,10 +158,6 @@
for file in intltool-extract intltool-merge intltool-update; do
sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
-e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
- -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
- -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
- -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
- -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
-e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
< ${ac_aux_dir}/${file}.in > ${file}.out
if cmp -s ${file} ${file}.out 2>/dev/null; then
@@ -177,9 +172,7 @@
],
[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
-INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
-INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'])
+INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'])
])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/intltool-0.35.5/intltool-merge.in.in new/intltool-0.36.1/intltool-merge.in.in
--- old/intltool-0.35.5/intltool-merge.in.in 2007-02-14 05:01:00.000000000 +0100
+++ new/intltool-0.36.1/intltool-merge.in.in 2007-08-10 00:13:52.000000000 +0200
@@ -93,9 +93,24 @@
my %po_files_by_lang = ();
my %translations = ();
-my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@";
+my $iconv = $ENV{"ICONV"} || "iconv";
my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
+sub isProgramInPath
+{
+ my ($file) = @_;
+ # If either a file exists, or when run it returns 0 exit status
+ return 1 if ((-x $file) or (system("$file --version >$devnull") == 0));
+ return 0;
+}
+
+if (! isProgramInPath ("$iconv"))
+{
+ print STDERR " *** iconv is not found on this system!\n".
+ " *** Without it, intltool-merge can not convert encodings.\n";
+ exit;
+}
+
# Use this instead of \w for XML files to handle more possible characters.
my $w = "[-A-Za-z0-9._:]";
@@ -494,16 +509,15 @@
return $string;
}
-## NOTE: deal with < - < but not > - > because it seems its ok to have
-## > in the entity. For further info please look at #84738.
sub entity_decode
{
local ($_) = @_;
s/'/'/g; # '
s/"/"/g; # "
- s/&/&/g;
s/<//g;
+ s/&/&/g;
return $_;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/intltool-0.35.5/intltool.spec new/intltool-0.36.1/intltool.spec
--- old/intltool-0.35.5/intltool.spec 2007-02-23 20:45:29.000000000 +0100
+++ new/intltool-0.36.1/intltool.spec 2007-08-13 15:36:23.000000000 +0200
@@ -1,6 +1,6 @@
# Note this is NOT a relocatable thing :)
%define name intltool
-%define ver 0.35.5
+%define ver 0.36.1
%define RELEASE 1
%define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/intltool-0.35.5/intltool-update.in.in new/intltool-0.36.1/intltool-update.in.in
--- old/intltool-0.35.5/intltool-update.in.in 2007-02-14 05:08:40.000000000 +0100
+++ new/intltool-0.36.1/intltool-update.in.in 2007-08-08 01:17:36.000000000 +0200
@@ -71,7 +71,8 @@
"sheet(?:\\.in)+|". # ?
"schemas(?:\\.in)+|". # GConf specific
"pong(?:\\.in)+|". # DEPRECATED: PONG is not used [by GNOME] any longer.
-"kbd(?:\\.in)+"; # GOK specific.
+"kbd(?:\\.in)+|". # GOK specific.
+"policy(?:\\.in)+"; # PolicyKit files
my $ini_support =
"icon(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec
@@ -328,7 +329,12 @@
push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/;
push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
}, "..";
-
+ find sub {
+ push @buf_i18n_plain, "$File::Find::name" if /\.($buildin_gettext_support)$/;
+ push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/;
+ push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/;
+ push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
+ }, "$SRCDIR/..";
open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n";
@buf_potfiles = grep !/^(#|\s*$)/, <POTFILES>;
@@ -489,11 +495,15 @@
my %in2;
foreach (@buf_potfiles_sorted)
{
+ s#^$SRCDIR/../##;
+ s#^$SRCDIR/##;
$in2{$_} = 1;
}
foreach (@buf_potfiles_ignore_sorted)
{
+ s#^$SRCDIR/../##;
+ s#^$SRCDIR/##;
$in2{$_} = 1;
}
@@ -501,9 +511,16 @@
foreach (@buf_allfiles_sorted)
{
- if (!exists($in2{$_}))
+ my $dummy = $_;
+ my $srcdir = $SRCDIR;
+
+ $srcdir =~ s#^../##;
+ $dummy =~ s#^$srcdir/../##;
+ $dummy =~ s#^$srcdir/##;
+ $dummy =~ s#_build/##;
+ if (!exists($in2{$dummy}))
{
- push @result, $_
+ push @result, $dummy
}
}
@@ -563,13 +580,33 @@
exit 1;
}
+sub isProgramInPath
+{
+ my ($file) = @_;
+ # If either a file exists, or when run it returns 0 exit status
+ return 1 if ((-x $file) or (system("$file --version >$devnull") == 0));
+ return 0;
+}
+
+sub isGNUGettextTool
+{
+ my ($file) = @_;
+ # Check that we are using GNU gettext tools
+ if (isProgramInPath ($file))
+ {
+ my $version = `$file --version`;
+ return 1 if ($version =~ m/.*\(GNU .*\).*/);
+ }
+ return 0;
+}
+
sub GenerateHeaders
{
my $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} || "intltool-extract";
## Generate the .h header files, so we can allow glade and
## xml translation support
- if (! -x "$EXTRACT")
+ if (! isProgramInPath ("$EXTRACT"))
{
print STDERR "\n *** The intltool-extract script wasn't found!"
."\n *** Without it, intltool-update can not generate files.\n";
@@ -616,13 +653,13 @@
#
sub GeneratePOTemplate
{
- my $XGETTEXT = $ENV{"XGETTEXT"} || "@INTLTOOL_XGETTEXT@";
+ my $XGETTEXT = $ENV{"XGETTEXT"} || "xgettext";
my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || '';
chomp $XGETTEXT;
- if (! -x $XGETTEXT)
+ if (! isGNUGettextTool ("$XGETTEXT"))
{
- print STDERR " *** xgettext is not found on this system!\n".
+ print STDERR " *** GNU xgettext is not found on this system!\n".
" *** Without it, intltool-update can not extract strings.\n";
exit;
}
@@ -718,7 +755,23 @@
unlink "$MODULE.pot";
my @xgettext_argument=("$XGETTEXT",
"--add-comments",
- "--directory\=\.",
+ "--directory\=.",
+ "--default-domain\=$MODULE",
+ "--flag\=g_strdup_printf:1:c-format",
+ "--flag\=g_string_printf:2:c-format",
+ "--flag\=g_string_append_printf:2:c-format",
+ "--flag\=g_error_new:3:c-format",
+ "--flag\=g_set_error:4:c-format",
+ "--flag\=g_markup_printf_escaped:1:c-format",
+ "--flag\=g_log:3:c-format",
+ "--flag\=g_print:1:c-format",
+ "--flag\=g_printerr:1:c-format",
+ "--flag\=g_printf:1:c-format",
+ "--flag\=g_fprintf:2:c-format",
+ "--flag\=g_sprintf:2:c-format",
+ "--flag\=g_snprintf:3:c-format",
+ "--flag\=g_scanner_error:2:c-format",
+ "--flag\=g_scanner_warn:2:c-format",
"--output\=$MODULE\.pot",
"--files-from\=\.\/POTFILES\.in\.temp");
my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
@@ -785,9 +838,16 @@
{
-f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n";
- my $MSGMERGE = $ENV{"MSGMERGE"} || "@INTLTOOL_MSGMERGE@";
+ my $MSGMERGE = $ENV{"MSGMERGE"} || "msgmerge";
my ($lang, $outfile) = @_;
+ if (! isGNUGettextTool ("$MSGMERGE"))
+ {
+ print STDERR " *** GNU msgmerge is not found on this system!\n".
+ " *** Without it, intltool-update can not extract strings.\n";
+ exit;
+ }
+
print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE;
my $infile = "$SRCDIR/$lang.po";
@@ -828,7 +888,14 @@
sub Console_Write_TranslationStatus
{
my ($lang, $output_file) = @_;
- my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
+ my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt";
+
+ if (! isGNUGettextTool ("$MSGFMT"))
+ {
+ print STDERR " *** GNU msgfmt is not found on this system!\n".
+ " *** Without it, intltool-update can not extract strings.\n";
+ exit;
+ }
$output_file = "$SRCDIR/$lang.po" if ($output_file eq "");
@@ -837,21 +904,28 @@
sub Console_Write_CoverageReport
{
- my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
+ my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt";
+
+ if (! isGNUGettextTool ("$MSGFMT"))
+ {
+ print STDERR " *** GNU msgfmt is not found on this system!\n".
+ " *** Without it, intltool-update can not extract strings.\n";
+ exit;
+ }
&GatherPOFiles;
foreach my $lang (@languages)
{
- print "$lang: ";
+ print STDERR "$lang: ";
&POFile_Update ($lang, "");
}
- print "\n\n * Current translation support in $MODULE \n\n";
+ print STDERR "\n\n * Current translation support in $MODULE \n\n";
foreach my $lang (@languages)
{
- print "$lang: ";
+ print STDERR "$lang: ";
system ("$MSGFMT", "-o", "$devnull", "--verbose", "$SRCDIR/$lang.po");
}
}
@@ -925,13 +999,13 @@
$conf_in || die "Cannot find top_builddir in Makevars.";
}
- elsif (-f "../configure.ac")
+ elsif (-f "$SRCDIR/../configure.ac")
{
- $conf_in = "../configure.ac";
+ $conf_in = "$SRCDIR/../configure.ac";
}
- elsif (-f "../configure.in")
+ elsif (-f "$SRCDIR/../configure.in")
{
- $conf_in = "../configure.in";
+ $conf_in = "$SRCDIR/../configure.in";
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/intltool-0.35.5/Makefile.am new/intltool-0.36.1/Makefile.am
--- old/intltool-0.35.5/Makefile.am 2007-02-14 05:12:37.000000000 +0100
+++ new/intltool-0.36.1/Makefile.am 2007-08-03 01:08:20.000000000 +0200
@@ -39,10 +39,6 @@
-e 's|[@]VERSION@|$(VERSION)|g'
edit = $(edit_in_in) -e "s|[@]INTLTOOL_PERL@|$(PERL)|g" \
- -e "s|[@]INTLTOOL_ICONV@|$(INTLTOOL_ICONV)|g" \
- -e "s|[@]INTLTOOL_MSGFMT@|$(INTLTOOL_MSGFMT)|g" \
- -e "s|[@]INTLTOOL_MSGMERGE@|$(INTLTOOL_MSGMERGE)|g" \
- -e "s|[@]INTLTOOL_XGETTEXT@|$(INTLTOOL_XGETTEXT)|g" \
-e "s|[@]INTLTOOL_LIBDIR@|$(libdir)|g"
intltool-extract.in: intltool-extract.in.in Makefile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/intltool-0.35.5/Makefile.in.in new/intltool-0.36.1/Makefile.in.in
--- old/intltool-0.35.5/Makefile.in.in 2007-01-03 22:05:42.000000000 +0100
+++ new/intltool-0.36.1/Makefile.in.in 2007-08-07 22:40:52.000000000 +0200
@@ -133,7 +133,7 @@
dvi info tags TAGS ID:
# Define this as empty until I found a useful application.
-installcheck:
+install-exec installcheck:
uninstall:
linguas="$(USE_LINGUAS)"; \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/intltool-0.35.5/missing new/intltool-0.36.1/missing
--- old/intltool-0.35.5/missing 2007-02-23 20:45:26.000000000 +0100
+++ new/intltool-0.36.1/missing 2007-08-13 15:36:21.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/intltool-0.35.5/tests/cases/extract13.desktop.in new/intltool-0.36.1/tests/cases/extract13.desktop.in
--- old/intltool-0.35.5/tests/cases/extract13.desktop.in 2007-01-10 16:51:00.000000000 +0100
+++ new/intltool-0.36.1/tests/cases/extract13.desktop.in 2007-03-23 20:03:00.000000000 +0100
@@ -17,7 +17,7 @@
# 9. This comment should NOT be extracted.
StartupNotify=true
# 10. This comment should NOT be extracted.
-Categories=GNOME;GTK;Application;Core;
+Categories=GNOME;GTK;Core;
# 11. This comment should NOT be extracted.
X-GNOME-DocPath=gnome-search-tool/gnome-search-tool.xml
X-GNOME-Bugzilla-Bugzilla=GNOME
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/intltool-0.35.5/tests/cases/extract14.xml.in new/intltool-0.36.1/tests/cases/extract14.xml.in
--- old/intltool-0.35.5/tests/cases/extract14.xml.in 1970-01-01 01:00:00.000000000 +0100
+++ new/intltool-0.36.1/tests/cases/extract14.xml.in 2007-08-01 14:52:18.000000000 +0200
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<messages>
+ <attrmsg _value="The &lt; entity produces the < character" />
+ <attrmsg _value="The &gt; entity produces the > character" />
+
+ <_childmsg>
+ The < entity produces the < character
+
+ <_childmsg>
+ The > entity produces the > character
+
+</messages>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/intltool-0.35.5/tests/cases/Makefile.am new/intltool-0.36.1/tests/cases/Makefile.am
--- old/intltool-0.35.5/tests/cases/Makefile.am 2007-01-10 16:51:00.000000000 +0100
+++ new/intltool-0.36.1/tests/cases/Makefile.am 2007-08-03 02:22:21.000000000 +0200
@@ -13,6 +13,7 @@
extract9.po \
extract9.xml.in \
extract12.xml.in \
+ extract14.xml.in \
fr.po \
fr_BE.po \
fr_FR.po \
@@ -22,6 +23,7 @@
merge1.xml.in \
merge10.templates_ \
merge11.xml.in \
+ merge12.xml.in \
merge4.xml.in \
merge5p.sheet.in \
merge5u.sheet.in \
@@ -46,6 +48,7 @@
extract10.templates_.h \
extract12.xml.in.h \
extract13.desktop.in.h \
+ extract14.xml.in.h \
extract9.xml \
extract9.xml.in.h \
iso88591text.xml.in.h \
@@ -53,6 +56,7 @@
merge-deepattr.xml \
merge10.templates \
merge11.xml \
+ merge12.xml \
space-preserve.xml.in.h \
space-preserve.xml \
test-quoted.dtd.h \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/intltool-0.35.5/tests/cases/merge12.xml.in new/intltool-0.36.1/tests/cases/merge12.xml.in
--- old/intltool-0.35.5/tests/cases/merge12.xml.in 1970-01-01 01:00:00.000000000 +0100
+++ new/intltool-0.36.1/tests/cases/merge12.xml.in 2007-08-01 14:52:18.000000000 +0200
@@ -0,0 +1,11 @@
+<messages>
+ <attrmsg _value="The &lt; entity produces the < character" />
+ <attrmsg _value="The &gt; entity produces the > character" />
+
+ <_childmsg>
+ The < entity produces the < character
+
+ <_childmsg>
+ The > entity produces the > character
+
+</messages>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/intltool-0.35.5/tests/cases/test.po new/intltool-0.36.1/tests/cases/test.po
--- old/intltool-0.35.5/tests/cases/test.po 2007-01-03 22:05:42.000000000 +0100
+++ new/intltool-0.36.1/tests/cases/test.po 2007-08-01 14:52:18.000000000 +0200
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: Test file - DON'T CHANGE\n"
"POT-Creation-Date: 2001-01-31 17:45+0100\n"
-"PO-Revision-Date: 2000-05-29 02:16+01:00\n"
+"PO-Revision-Date: 2007-02-24 16:02-0500\n"
"Last-Translator: Kenneth Christiansen \n"
"Language-Team: NONE \n"
"MIME-Version: 1.0\n"
@@ -126,6 +126,18 @@
msgid "Sample <i>xml</i> data."
msgstr "Invalid <i>XML data."
+msgid "The > entity produces the > character"
+msgstr "The following entity: > produces: >"
+
+msgid "The < entity produces the < character"
+msgstr "The following entity: < produces: <"
+
+msgid "The > entity produces the > character"
+msgstr "The following entity: > produces: >"
+
+msgid "The < entity produces the < character"
+msgstr "The following entity: < produces: <"
+
#~ msgid " Auto Update"
#~ msgstr " Opdat�r automatisk"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/intltool-0.35.5/tests/results/extract14.xml.in.h new/intltool-0.36.1/tests/results/extract14.xml.in.h
--- old/intltool-0.35.5/tests/results/extract14.xml.in.h 1970-01-01 01:00:00.000000000 +0100
+++ new/intltool-0.36.1/tests/results/extract14.xml.in.h 2007-08-01 14:52:18.000000000 +0200
@@ -0,0 +1,4 @@
+char *s = N_("The > entity produces the > character");
+char *s = N_("The < entity produces the < character");
+char *s = N_("The > entity produces the > character");
+char *s = N_("The < entity produces the < character");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/intltool-0.35.5/tests/results/Makefile.am new/intltool-0.36.1/tests/results/Makefile.am
--- old/intltool-0.35.5/tests/results/Makefile.am 2007-01-10 16:51:00.000000000 +0100
+++ new/intltool-0.36.1/tests/results/Makefile.am 2007-08-03 02:23:40.000000000 +0200
@@ -12,12 +12,14 @@
extract9.xml \
extract9.xml.in.h \
extract12.xml.in.h \
+ extract14.xml.in.h \
iso88591text.xml.in.h \
merge-cdata.xml \
merge-deepattr.xml \
merge1.xml \
merge10.templates \
merge11.xml \
+ merge12.xml \
merge4.xml \
merge5p.sheet \
merge5u.sheet \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/intltool-0.35.5/tests/results/merge12.xml new/intltool-0.36.1/tests/results/merge12.xml
--- old/intltool-0.35.5/tests/results/merge12.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/intltool-0.36.1/tests/results/merge12.xml 2007-08-01 14:52:18.000000000 +0200
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<messages>
+ <attrmsg value="The &lt; entity produces the < character"></attrmsg>
+ <attrmsg xml:lang="az" value="The &lt; entity produces the < character"></attrmsg>
+ <attrmsg xml:lang="extract9" value="The &lt; entity produces the < character"></attrmsg>
+ <attrmsg xml:lang="fr" value="The &lt; entity produces the < character"></attrmsg>
+ <attrmsg xml:lang="fr_BE" value="The &lt; entity produces the < character"></attrmsg>
+ <attrmsg xml:lang="fr_FR" value="The &lt; entity produces the < character"></attrmsg>
+ <attrmsg xml:lang="merge6" value="The &lt; entity produces the < character"></attrmsg>
+ <attrmsg xml:lang="schemasmerge1" value="The &lt; entity produces the < character"></attrmsg>
+ <attrmsg xml:lang="schemasmerge2" value="The &lt; entity produces the < character"></attrmsg>
+ <attrmsg xml:lang="spacepreserve" value="The &lt; entity produces the < character"></attrmsg>
+ <attrmsg xml:lang="test" value="The following entity: &lt; produces: <"></attrmsg>
+ <attrmsg xml:lang="test-quoted" value="The &lt; entity produces the < character"></attrmsg>
+ <attrmsg value="The &gt; entity produces the > character"></attrmsg>
+ <attrmsg xml:lang="az" value="The &gt; entity produces the > character"></attrmsg>
+ <attrmsg xml:lang="extract9" value="The &gt; entity produces the > character"></attrmsg>
+ <attrmsg xml:lang="fr" value="The &gt; entity produces the > character"></attrmsg>
+ <attrmsg xml:lang="fr_BE" value="The &gt; entity produces the > character"></attrmsg>
+ <attrmsg xml:lang="fr_FR" value="The &gt; entity produces the > character"></attrmsg>
+ <attrmsg xml:lang="merge6" value="The &gt; entity produces the > character"></attrmsg>
+ <attrmsg xml:lang="schemasmerge1" value="The &gt; entity produces the > character"></attrmsg>
+ <attrmsg xml:lang="schemasmerge2" value="The &gt; entity produces the > character"></attrmsg>
+ <attrmsg xml:lang="spacepreserve" value="The &gt; entity produces the > character"></attrmsg>
+ <attrmsg xml:lang="test" value="The following entity: &gt; produces: >"></attrmsg>
+ <attrmsg xml:lang="test-quoted" value="The &gt; entity produces the > character"></attrmsg>
+
+ <childmsg>The < entity produces the < character</childmsg>
+ <childmsg xml:lang="test">The following entity: < produces: <</childmsg>
+ <childmsg>The > entity produces the > character</childmsg>
+ <childmsg xml:lang="test">The following entity: > produces: ></childmsg>
+</messages>
\ No newline at end of file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/intltool-0.35.5/tests/selftest.pl.in new/intltool-0.36.1/tests/selftest.pl.in
--- old/intltool-0.35.5/tests/selftest.pl.in 2007-02-14 04:36:10.000000000 +0100
+++ new/intltool-0.36.1/tests/selftest.pl.in 2007-08-01 14:52:18.000000000 +0200
@@ -36,6 +36,7 @@
my $srcdir = $ENV{"srcdir"} || ".";
+my $strip_trailing_cr = ($^O eq 'MSWin32' || $^O eq 'msys') ? '--strip-trailing-cr' : '';
sub check_command_result
{
@@ -58,7 +59,7 @@
sub check_extract_result($)
{
my ($testcase) = @_;
- check_command_result("diff -u $srcdir/results/$testcase.h cases/$testcase.h", $testcase);
+ check_command_result("diff -u $strip_trailing_cr $srcdir/results/$testcase.h cases/$testcase.h", $testcase);
}
sub check_merge_result($)
@@ -66,7 +67,7 @@
my ($testcase) = @_;
$testcase =~ s/\.in$//;
- check_command_result("diff -u $srcdir/results/$testcase cases/$testcase", $testcase);
+ check_command_result("diff -u $strip_trailing_cr $srcdir/results/$testcase cases/$testcase", $testcase);
}
@@ -76,7 +77,7 @@
my ($language) = shift;
$testcase =~ s/\.in$//;
- check_command_result("diff -u $srcdir/results/multi.$testcase $language/$testcase", $testcase);
+ check_command_result("diff -u $strip_trailing_cr $srcdir/results/multi.$testcase $language/$testcase", $testcase);
}
@@ -252,6 +253,16 @@
system("$INTLTOOL_EXTRACT --type=gettext/ini --quiet --update cases/$case") == 0 or $failed = 1;
check_extract_result($case);
+print "33. Decode XML entities in the right order when extracting: ";
+$case = "extract14.xml.in";
+system("$INTLTOOL_EXTRACT --type=gettext/xml --quiet --update cases/$case") == 0 or $failed = 1;
+check_extract_result($case);
+
+print "34. Merge XML translations, decoding entities in the right order: ";
+$case = "merge12.xml";
+system("$INTLTOOL_MERGE -x --quiet cases cases/$case.in cases/$case") == 0 or $failed = 1;
+check_merge_result($case);
+
system("rm -f cases/*.*") if $srcdir ne ".";
system("rm -rf az extract9 fr fr_BE fr_FR merge6 schemasmerge1 schemasmerge2 spacepreserve test test-quoted merge6.xml");
++++++ intltool-extract-check-hack.patch ++++++
--- /var/tmp/diff_new_pack.E19005/_old 2007-08-29 22:02:25.000000000 +0200
+++ /var/tmp/diff_new_pack.E19005/_new 2007-08-29 22:02:25.000000000 +0200
@@ -1,10 +1,12 @@
---- intltool-update.in.in
+Index: intltool-update.in.in
+===================================================================
+--- intltool-update.in.in.orig
+++ intltool-update.in.in
-@@ -569,7 +569,7 @@
+@@ -606,7 +606,7 @@ sub GenerateHeaders
## Generate the .h header files, so we can allow glade and
## xml translation support
-- if (! -x "$EXTRACT")
+- if (! isProgramInPath ("$EXTRACT"))
+ if (0)
{
print STDERR "\n *** The intltool-extract script wasn't found!"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
