Hello community,
here is the log from the commit of package intltool
checked in at Fri Sep 5 02:45:53 CEST 2008.
--------
--- GNOME/intltool/intltool.changes 2008-07-18 13:05:20.000000000 +0200
+++ intltool/intltool.changes 2008-08-26 15:18:04.000000000 +0200
@@ -1,0 +2,13 @@
+Sun Aug 24 13:13:16 CEST 2008 - mboman@novell.com
+
+- Update to version 0.40.3:
+ * Bugs fixed; bgo#544574, bgo#458794, bgo#544574, bgo#323968,
+ bgo#543665, bgo#531894, bgo#536970
+ * Add new test cases to EXTRA_DIST and CLEANFILES as appropriate
+ * intltoolize.in: Check for symlinks to intltool scripts and remove them
+ * intltool-update.in (GenerateHeaders): If running under ActiveState
+ Perl then prefix the intltool-extract command with the Perl
+ interpreter pathname, as the system() function has no clue about
+ Unixish executable scripts indicated by just a hashbang line.
+
+-------------------------------------------------------------------
Old:
----
intltool-0.40.0.tar.bz2
New:
----
intltool-0.40.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ intltool.spec ++++++
--- /var/tmp/diff_new_pack.oy8368/_old 2008-09-05 02:44:09.000000000 +0200
+++ /var/tmp/diff_new_pack.oy8368/_new 2008-09-05 02:44:09.000000000 +0200
@@ -1,10 +1,17 @@
#
-# spec file for package intltool (Version 0.40.0)
+# spec file for package intltool (Version 0.40.3)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -14,8 +21,8 @@
Name: intltool
BuildRequires: perl-XML-Parser
Summary: Internationalization Tool Collection
-Version: 0.40.0
-Release: 5
+Version: 0.40.3
+Release: 1
Group: Development/Tools/Other
BuildArch: noarch
Requires: gettext-devel perl-XML-Parser
@@ -69,6 +76,16 @@
%doc %{_mandir}/man8/*.*
%changelog
+* Sun Aug 24 2008 mboman@novell.com
+- Update to version 0.40.3:
+ * Bugs fixed; bgo#544574, bgo#458794, bgo#544574, bgo#323968,
+ bgo#543665, bgo#531894, bgo#536970
+ * Add new test cases to EXTRA_DIST and CLEANFILES as appropriate
+ * intltoolize.in: Check for symlinks to intltool scripts and remove them
+ * intltool-update.in (GenerateHeaders): If running under ActiveState
+ Perl then prefix the intltool-extract command with the Perl
+ interpreter pathname, as the system() function has no clue about
+ Unixish executable scripts indicated by just a hashbang line.
* Fri Jul 18 2008 rodrigo@suse.de
- Use PATCH-*-OPENSUSE, not SUSE, in patch tags
* Wed Jun 11 2008 maw@suse.de
++++++ intltool-0.40.0.tar.bz2 -> intltool-0.40.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.40.0/ChangeLog new/intltool-0.40.3/ChangeLog
--- old/intltool-0.40.0/ChangeLog 2008-06-03 20:50:42.000000000 +0200
+++ new/intltool-0.40.3/ChangeLog 2008-07-25 21:37:00.000000000 +0200
@@ -1,3 +1,125 @@
+2008-07-25 Rodney Dawes
+
+ * configure.in:
+ Up version to 0.40.3 for brown-bag release
+
+2008-07-25 Rodney Dawes
+
+ * Makefile.in.in:
+ Change a ^$$lang regex to be ^$$lang$$ as it should have been
+ For bug #544574
+
+2008-07-25 Rodney Dawes
+
+ * configure.in:
+ Up version to 0.40.2 for release
+
+2008-07-25 Rodney Dawes
+
+ * tests/cases/Makefile.am:
+ * tests/results/Makefile.am:
+ Add new test cases to EXTRA_DIST and CLEANFILES as appropriate
+
+2008-07-25 Rodney Dawes
+
+ * tests/cases/context.xml.in:
+ * tests/results/context.xml:
+ * tests/results/context.xml.in.h:
+ Add these files that Wouter forgot to add
+
+2008-07-25 Wouter Bolsterlee
+
+ reviewed by: Rodney Dawes
+
+ * intltool-extract.in:
+ * intltool-merge.in:
+ * tests/cases/az.po:
+ * tests/cases/fr.po:
+ * tests/selftest.pl.in:
+
+ Bug 458794 – Context support works only for single
+ context on a msgid. Patch and test case by Dan Winship
+ .
+
+2008-07-25 Rodney Dawes
+
+ * Makefile.in.in:
+ Redirect errors from grep to /dev/null
+ Use tr to force locale-per-line for passing ALL_LINGUAS to grep
+ Check that $LINGUAS is also non-zero for user-defined locales
+ Remove extraneous mkdir_p usage when installing locale files
+
+ Fixes #544574
+
+2008-07-25 Rodney Dawes
+
+ * intltoolize.in:
+ Check for symlinks to intltool scripts and remove them
+ Touch the script.in files for compatibility
+ We just touch the scripts as we no longer generate executable versions,
+ and the Makefile.in.in uses the installed scripts anyway.
+
+2008-07-23 Rodney Dawes
+
+ * doc/I18N-HOWTO:
+ Remove reference to adding intltool scripts to EXTRA_DIST
+
+2008-07-21 Rodney Dawes
+
+ * configure.in:
+ Up version to 0.40.1 for release
+
+2008-07-21 Rodney Dawes
+
+ * intltoolize.in:
+ Remove the AC_CONFIG_AUX_DIR checks as we no longer need it
+ We do not copy the scripts locally now, only Makefile.in.in
+
+ Fixes #323968
+
+2008-07-20 Rodney Dawes
+
+ * intltool-update.in (FindLeftoutFiles):
+ Check for NC_ as well as C_ N_ Q_ and _
+ (FindPOTKeywords):
+ No need to escape = and _ in a string
+ Add NC_ to the list of keywords
+ Use context and string argument specifiers for C_ and NC_
+
+ Fixes #543665
+
+2008-06-06 Rodney Dawes
+
+ * README:
+ * doc/I18N-HOWTO:
+ Replace AC_PROG_INTLTOOL references with IT_PROG_INTLTOOL
+
+ Fixes #531894
+
+2008-06-06 Rodney Dawes
+
+ * intltool-update.in (FindPOTKeywords):
+ Replace U_ with C_ as keyword argument to xgettext
+ U_ does not exist in gi18n.h
+
+ Fixes #536970
+
+2008-06-06 Tor Lillqvist
+
+ * intltool-update.in (GenerateHeaders): If running under
+ ActiveState Perl then prefix the intltool-extract command with the
+ Perl interpreter pathname, as the system() function has no clue
+ about Unixish executable scripts indicated by just a hashbang
+ line.
+
+ (The MSYS Perl, as it runs on a Unix emulator, would be able to
+ run executable scripts based on their hashbang lines just fine,
+ but then MSYS Perl doesn't come with XML::Parser. Installing
+ XML::Parser for MSYS Perl is somewhat hard. So usually when using
+ mingw+MSYS to build GNOMEish software one wants to use
+ ActicveState's Perl to run the intltool scripts, even if the
+ built-in MSYS Perl is good for other Perl uses.)
+
2008-06-03 Rodney Dawes
* configure.in:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.40.0/configure new/intltool-0.40.3/configure
--- old/intltool-0.40.0/configure 2008-06-03 20:50:50.000000000 +0200
+++ new/intltool-0.40.3/configure 2008-07-25 21:37:14.000000000 +0200
@@ -1634,7 +1634,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-INTLTOOL_VERSION=0.40.0
+INTLTOOL_VERSION=0.40.3
am__api_version='1.10'
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.40.0/configure.in new/intltool-0.40.3/configure.in
--- old/intltool-0.40.0/configure.in 2008-06-03 20:50:09.000000000 +0200
+++ new/intltool-0.40.3/configure.in 2008-07-25 21:37:09.000000000 +0200
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to create configure.
AC_INIT(intltoolize.in)
-INTLTOOL_VERSION=0.40.0
+INTLTOOL_VERSION=0.40.3
AM_INIT_AUTOMAKE(intltool, $INTLTOOL_VERSION)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.40.0/doc/I18N-HOWTO new/intltool-0.40.3/doc/I18N-HOWTO
--- old/intltool-0.40.0/doc/I18N-HOWTO 2008-06-03 20:49:37.000000000 +0200
+++ new/intltool-0.40.3/doc/I18N-HOWTO 2008-07-23 16:25:47.000000000 +0200
@@ -92,7 +92,7 @@
The gettext macros need to be added after the initial checks.
Putting them after the checks for library functions is a good idea.
- AC_PROG_INTLTOOL(0.26)
+ IT_PROG_INTLTOOL(0.26)
AM_GNU_GETTEXT([external]) # Only one of these two macro calls
AM_GLIB_GNU_GETTEXT # is needed to set up your project
@@ -107,7 +107,7 @@
po/Makefile.in
)
- AC_PROG_INTLTOOL checks if a good enough intltool is available.
+ IT_PROG_INTLTOOL checks if a good enough intltool is available.
Please require the latest intltool that exists. Intltool releases
are pretty stable and often only contains bugfixes.
@@ -192,8 +192,6 @@
SUBDIRS = src po
- EXTRA_DIST = intltool-extract.in intltool-merge.in intltool-update.in
-
14. Go into the directory po/ and create POTFILES.in
This file should contain a list of all the files in your distribution
(starting from the top, one level above the po dir) that contain
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.40.0/intltool-extract.in new/intltool-0.40.3/intltool-extract.in
--- old/intltool-0.40.0/intltool-extract.in 2008-06-03 20:49:37.000000000 +0200
+++ new/intltool-0.40.3/intltool-extract.in 2008-07-25 19:51:44.000000000 +0200
@@ -47,6 +47,7 @@
my $UPDATE_ARG = "0";
my $QUIET_ARG = "0";
my $SRCDIR_ARG = ".";
+my $NOMSGCTXT_ARG = "0";
my $FILE;
my $OUTFILE;
@@ -76,6 +77,7 @@
"update" => \$UPDATE_ARG,
"quiet|q" => \$QUIET_ARG,
"srcdir=s" => \$SRCDIR_ARG,
+ "nomsgctxt" => \$NOMSGCTXT_ARG,
) or &error;
&split_on_argument;
@@ -445,6 +447,11 @@
$lookup =~ s/^\s+//s;
$lookup =~ s/\s+$//s;
}
+ if (exists $attrs->{"msgctxt"}) {
+ my $context = entity_decode ($attrs->{"msgctxt"});
+ $context =~ s/^["'](.*)["']/$1/;
+ $lookup = "$context\004$lookup";
+ }
if ($lookup && $translate != 2) {
$comments{$lookup} = $XMLCOMMENT if $XMLCOMMENT;
@@ -833,6 +840,7 @@
for my $message (@msgids)
{
my $offsetlines = 1;
+ my $context = undef;
$offsetlines++ if $message =~ /%/;
if (defined ($comments{$message}))
{
@@ -847,12 +855,30 @@
if defined $comments{$message};
print OUT "/* xgettext:no-c-format */\n" if $message =~ /%/;
+ if ($message =~ /(.*)\004(.*)/) {
+ $context = $1;
+ $message = $2;
+ }
my @lines = split (/\n/, $message, -1);
for (my $n = 0; $n < @lines; $n++)
{
if ($n == 0)
{
- print OUT "char *s = N_(\"";
+ if (defined $context)
+ {
+ if ($NOMSGCTXT_ARG)
+ {
+ print OUT "char *s = N_(\"", $context, "|";
+ }
+ else
+ {
+ print OUT "char *s = C_(\"", $context, "\", \"";
+ }
+ }
+ else
+ {
+ print OUT "char *s = N_(\"";
+ }
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.40.0/intltoolize.in new/intltool-0.40.3/intltoolize.in
--- old/intltool-0.40.0/intltoolize.in 2008-06-03 20:49:37.000000000 +0200
+++ new/intltool-0.40.3/intltoolize.in 2008-07-25 17:45:26.000000000 +0200
@@ -154,41 +154,6 @@
files='po/Makefile.in.in'
-auxdir=.
-auxdirline=`egrep '^AC_CONFIG_AUX_DIR' $configure 2>/dev/null`
-if test -n "$auxdirline"; then
- # Handle explicit AC_CONFIG_AUX_DIR settings.
- auxdir=`echo "$auxdirline" | sed 's/^AC_CONFIG_AUX_DIR(\([^)]*\)).*$/\1/'`
-
- if test "$auxdir" = "$auxdirline"; then
- echo "$progname: invalid AC_CONFIG_AUX_DIR syntax: $auxdirline" 1>&2
- exit 1
- else
- # Strip any quote brackets.
- auxdir=`echo "$auxdir" | sed 's/^\[\(.*\)\]$/\1/g'`
- case "$auxdir" in
- *\$*)
- echo "$progname: cannot handle variables in AC_CONFIG_AUX_DIR" 1>&2
- exit 1
- ;;
- *)
- ;;
- esac
- fi
-else
- # Try to discover auxdir the same way it is discovered by configure.
- # Note that we default to the current directory.
- for dir in . .. ../..; do
- if test -f $dir/install-sh; then
- auxdir=$dir
- break
- elif test -f $dir/install.sh; then
- auxdir=$dir
- break
- fi
- done
-fi
-
if test -z "$automake"; then
if egrep '^(AC|IT)_PROG_INTLTOOL' $configure >/dev/null 2>&1; then :
else
@@ -231,15 +196,8 @@
fi
-
-# Change to the auxiliary directory.
+# Copy or symlink the Makefile.in.in
(
-cur=`pwd`
-if test "$auxdir" != .; then
- test -z "$automake" && echo "Putting files in AC_CONFIG_AUX_DIR, '$auxdir'."
- cd $auxdir || exit 1
-fi
-
for file in $files; do
if test -f "$file" && test -z "$force"; then
test -z "$automake" && echo "$progname: '$file' exists: use '--force' to overwrite" 1>&2
@@ -253,6 +211,11 @@
echo "$progname: cannot copy '$pkgdatadir/`basename $file`' to '$file'" 1>&2
status=1
fi
+# Touch script names for backward compatibility
+ for script in intltool-extract.in intltool-merge.in intltool-update.in; do
+ if test -h $script; then rm -f $script; fi
+ touch $script
+ done
done
exit $status
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.40.0/intltool-merge.in new/intltool-0.40.3/intltool-merge.in
--- old/intltool-0.40.0/intltool-merge.in 2008-06-03 20:49:37.000000000 +0200
+++ new/intltool-0.40.3/intltool-merge.in 2008-07-25 19:51:44.000000000 +0200
@@ -441,6 +441,18 @@
&create_cache;
}
+sub add_translation
+{
+ my ($lang, $msgctxt, $msgid, $msgstr) = @_;
+
+ return if !($msgid && $msgstr);
+
+ if ($msgctxt) {
+ $msgid = "$msgctxt\004$msgid";
+ }
+ $translations{$lang, $msgid} = $msgstr;
+}
+
sub create_translation_database
{
for my $lang (keys %po_files_by_lang)
@@ -468,8 +480,10 @@
}
my $nextfuzzy = 0;
+ my $inmsgctxt = 0;
my $inmsgid = 0;
my $inmsgstr = 0;
+ my $msgctxt = "";
my $msgid = "";
my $msgstr = "";
@@ -477,31 +491,52 @@
{
$nextfuzzy = 1 if /^#, fuzzy/;
+ if (/^msgctxt "((\\.|[^\\]+)*)"/ )
+ {
+ if ($inmsgstr) {
+ add_translation ($lang, $msgctxt, $msgid, $msgstr);
+ $msgctxt = "";
+ $msgid = "";
+ $msgstr = "";
+ }
+
+ $msgctxt = unescape_po_string($1);
+ $inmsgctxt = 1;
+ $inmsgid = 0;
+ $inmsgstr = 0;
+ }
+
if (/^msgid "((\\.|[^\\]+)*)"/ )
{
- $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr;
- $msgid = "";
- $msgstr = "";
+ if ($inmsgstr) {
+ add_translation ($lang, $msgctxt, $msgid, $msgstr);
+ $msgctxt = "";
+ $msgid = "";
+ $msgstr = "";
+ }
if ($nextfuzzy) {
$inmsgid = 0;
+ $nextfuzzy = 0;
} else {
$msgid = unescape_po_string($1);
$inmsgid = 1;
}
+ $inmsgctxt = 0;
$inmsgstr = 0;
- $nextfuzzy = 0;
}
if (/^msgstr "((\\.|[^\\]+)*)"/)
{
$msgstr = unescape_po_string($1);
$inmsgstr = 1;
+ $inmsgctxt = 0;
$inmsgid = 0;
}
if (/^"((\\.|[^\\]+)*)"/)
{
+ $msgctxt .= unescape_po_string($1) if $inmsgctxt;
$msgid .= unescape_po_string($1) if $inmsgid;
$msgstr .= unescape_po_string($1) if $inmsgstr;
}
@@ -814,16 +849,23 @@
print $fh "<$nodename", $outattr;
if ($translate) {
- $lookup = getXMLstring($content, $spacepreserve);
+ $content = getXMLstring($content, $spacepreserve);
if (!$spacepreserve) {
- $lookup =~ s/^\s+//s;
- $lookup =~ s/\s+$//s;
+ $content =~ s/^\s+//s;
+ $content =~ s/\s+$//s;
+ }
+ if (exists $attrs->{"msgctxt"}) {
+ my $context = entity_decode ($attrs->{"msgctxt"});
+ $context =~ s/^["'](.*)["']/$1/;
+ $lookup = "$context\004$content";
+ } else {
+ $lookup = $content;
}
if ($lookup || $translate == 2) {
my $translation = $translations{$language, $lookup} if isWellFormedXmlFragment($translations{$language, $lookup});
if ($MULTIPLE_OUTPUT && ($translation || $translate == 2)) {
- $translation = $lookup if (!$translation);
+ $translation = $content if (!$translation);
print $fh " xml:lang=\"", $language, "\"" if $language;
print $fh ">";
if ($translate == 2) {
@@ -840,7 +882,7 @@
if ($translate == 2) {
translate_subnodes($fh, \@all, $language, 1, $spacepreserve);
} else {
- print $fh $lookup;
+ print $fh $content;
}
print $fh "$nodename>";
}
@@ -859,7 +901,7 @@
my $localattrs = getAttributeString($attrs, 1, $lang, \$translate);
my $translation = $translations{$lang, $lookup} if isWellFormedXmlFragment($translations{$lang, $lookup});
if ($translate && !$translation) {
- $translation = $lookup;
+ $translation = $content;
}
if ($translation || $translate) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.40.0/intltool.spec new/intltool-0.40.3/intltool.spec
--- old/intltool-0.40.0/intltool.spec 2008-06-03 20:50:53.000000000 +0200
+++ new/intltool-0.40.3/intltool.spec 2008-07-25 21:37:16.000000000 +0200
@@ -1,6 +1,6 @@
# Note this is NOT a relocatable thing :)
%define name intltool
-%define ver 0.40.0
+%define ver 0.40.3
%define RELEASE 1
%define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.40.0/intltool-update.in new/intltool-0.40.3/intltool-update.in
--- old/intltool-0.40.0/intltool-update.in 2008-06-03 20:49:37.000000000 +0200
+++ new/intltool-0.40.3/intltool-update.in 2008-07-20 21:56:34.000000000 +0200
@@ -457,8 +457,8 @@
last;
}
- ## C_ N_ Q_ and _ are the macros defined in gi8n.h
- if (/[CNQ]?_ *\(QUOTEDTEXT/)
+ ## C_ N_ NC_ Q_ and _ are the macros defined in gi8n.h
+ if (/(NC|[CNQ]?)_ *\(QUOTEDTEXT/)
{
if (defined isNotValidMissing (unpack("x3 A*", $file))) {
## Remove the first 3 chars and add newline
@@ -627,6 +627,8 @@
{
my $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} || "intltool-extract";
+ $EXTRACT = "$^X $EXTRACT" if ($^O eq 'MSWin32' && !($EXTRACT =~ /perl/));
+
## Generate the .h header files, so we can allow glade and
## xml translation support
if (! isProgramInPath ("$EXTRACT"))
@@ -1137,7 +1139,7 @@
sub FindPOTKeywords
{
- my $keywords = "--keyword\=\_ --keyword\=N\_ --keyword\=U\_ --keyword\=Q\_";
+ my $keywords = "--keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=Q_";
my $varname = "XGETTEXT_OPTIONS";
my $make_source; {
local (*IN);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.40.0/Makefile.in.in new/intltool-0.40.3/Makefile.in.in
--- old/intltool-0.40.0/Makefile.in.in 2008-06-03 20:49:37.000000000 +0200
+++ new/intltool-0.40.3/Makefile.in.in 2008-07-25 21:34:15.000000000 +0200
@@ -56,9 +56,9 @@
PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
@@ -101,7 +101,6 @@
install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
- $(mkdir_p) $(DESTDIR)$(itlocaledir)
linguas="$(USE_LINGUAS)"; \
for lang in $$linguas; do \
dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.40.0/README new/intltool-0.40.3/README
--- old/intltool-0.40.0/README 2008-06-03 20:49:37.000000000 +0200
+++ new/intltool-0.40.3/README 2008-06-06 16:40:34.000000000 +0200
@@ -45,7 +45,7 @@
o Add this line to configure.in near the top
- AC_PROG_INTLTOOL([minimum required version], [no-xml])
+ IT_PROG_INTLTOOL([minimum required version], [no-xml])
o Add intltool-extract.in, intltool-merge.in, and intltool-update.in
to EXTRA_DIST in your top-level Makefile.am and also to the top-level
@@ -66,7 +66,7 @@
Examples of packages that use intltool are listed in the USED file.
-Details of the AC_PROG_INTLTOOL macro
+Details of the IT_PROG_INTLTOOL macro
-------------------------------------------
The first parameter indicates the minimum required version. The
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.40.0/tests/cases/az.po new/intltool-0.40.3/tests/cases/az.po
--- old/intltool-0.40.0/tests/cases/az.po 2008-06-03 20:49:37.000000000 +0200
+++ new/intltool-0.40.3/tests/cases/az.po 2008-07-25 19:51:44.000000000 +0200
@@ -26,3 +26,14 @@
msgid "A cake mixer"
msgstr "Kökə qarışdırıcı"
+#: cases/context.xml.in.h:1
+msgid "Bar"
+msgstr "(not used, because no msgctxt)"
+
+#: cases/context.xml.in.h:2
+msgid "Baz"
+msgstr "az-baz"
+
+#: cases/context.xml.in.h:3
+msgid "Foo"
+msgstr "az-foo"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.40.0/tests/cases/context.xml.in new/intltool-0.40.3/tests/cases/context.xml.in
--- old/intltool-0.40.0/tests/cases/context.xml.in 1970-01-01 01:00:00.000000000 +0100
+++ new/intltool-0.40.3/tests/cases/context.xml.in 2008-07-25 19:51:44.000000000 +0200
@@ -0,0 +1,17 @@
+<test>
+ <entry>
+ <_name>Foo
+ </entry>
+ <entry>
+ <!-- This is the comment on the first Bar -->
+ <_name msgctxt="1">Bar
+ </entry>
+ <entry>
+ <!-- This is the comment on the second Bar -->
+ <_name msgctxt="2">Bar
+ </entry>
+ <entry>
+ <!-- This is the comment on Baz -->
+ <_name>Baz
+ </entry>
+</test>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.40.0/tests/cases/fr.po new/intltool-0.40.3/tests/cases/fr.po
--- old/intltool-0.40.0/tests/cases/fr.po 2008-06-03 20:49:37.000000000 +0200
+++ new/intltool-0.40.3/tests/cases/fr.po 2008-07-25 19:51:44.000000000 +0200
@@ -59,3 +59,21 @@
#: cases/extract10.templates_:20
msgid "Current month?"
msgstr "Mois en cours�?"
+
+#: cases/context.xml.in.h:2
+msgctxt "1"
+msgid "Bar"
+msgstr "bar un"
+
+#: cases/context.xml.in.h:4
+msgctxt "2"
+msgid "Bar"
+msgstr "bar deux"
+
+#: cases/context.xml.in.h:6
+msgid "Baz"
+msgstr "le baz"
+
+#: cases/context.xml.in.h:7
+msgid "Foo"
+msgstr "le foo"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.40.0/tests/cases/Makefile.am new/intltool-0.40.3/tests/cases/Makefile.am
--- old/intltool-0.40.0/tests/cases/Makefile.am 2008-06-03 20:49:37.000000000 +0200
+++ new/intltool-0.40.3/tests/cases/Makefile.am 2008-07-25 21:13:48.000000000 +0200
@@ -2,6 +2,7 @@
EXTRA_DIST = \
az.po \
+ context.xml.in \
extract-comments.xml \
extract1.desktop \
extract10.templates_ \
@@ -44,6 +45,8 @@
$(NULL)
CLEANFILES = \
+ context.xml \
+ context.xml.in.h \
extract-comments.xml.h \
extract10.templates_.h \
extract12.xml.in.h \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.40.0/tests/cases/Makefile.in new/intltool-0.40.3/tests/cases/Makefile.in
--- old/intltool-0.40.0/tests/cases/Makefile.in 2008-06-03 20:50:51.000000000 +0200
+++ new/intltool-0.40.3/tests/cases/Makefile.in 2008-07-25 21:37:14.000000000 +0200
@@ -115,6 +115,7 @@
NULL =
EXTRA_DIST = \
az.po \
+ context.xml.in \
extract-comments.xml \
extract1.desktop \
extract10.templates_ \
@@ -157,6 +158,8 @@
$(NULL)
CLEANFILES = \
+ context.xml \
+ context.xml.in.h \
extract-comments.xml.h \
extract10.templates_.h \
extract12.xml.in.h \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.40.0/tests/results/context.xml new/intltool-0.40.3/tests/results/context.xml
--- old/intltool-0.40.0/tests/results/context.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/intltool-0.40.3/tests/results/context.xml 2008-07-25 19:51:44.000000000 +0200
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<test>
+ <entry>
+ <name>Foo</name>
+ <name xml:lang="az">az-foo</name>
+ <name xml:lang="fr">le foo</name>
+ </entry>
+ <entry>
+
+ <name msgctxt="1">Bar</name>
+ <name xml:lang="fr" msgctxt="1">bar un</name>
+ </entry>
+ <entry>
+
+ <name msgctxt="2">Bar</name>
+ <name xml:lang="fr" msgctxt="2">bar deux</name>
+ </entry>
+ <entry>
+
+ <name>Baz</name>
+ <name xml:lang="az">az-baz</name>
+ <name xml:lang="fr">le baz</name>
+ </entry>
+</test>
\ No newline at end of file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.40.0/tests/results/context.xml.in.h new/intltool-0.40.3/tests/results/context.xml.in.h
--- old/intltool-0.40.0/tests/results/context.xml.in.h 1970-01-01 01:00:00.000000000 +0100
+++ new/intltool-0.40.3/tests/results/context.xml.in.h 2008-07-25 19:51:44.000000000 +0200
@@ -0,0 +1,7 @@
+/* This is the comment on the first Bar */
+char *s = C_("1", "Bar");
+/* This is the comment on the second Bar */
+char *s = C_("2", "Bar");
+/* This is the comment on Baz */
+char *s = N_("Baz");
+char *s = N_("Foo");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.40.0/tests/results/Makefile.am new/intltool-0.40.3/tests/results/Makefile.am
--- old/intltool-0.40.0/tests/results/Makefile.am 2008-06-03 20:49:37.000000000 +0200
+++ new/intltool-0.40.3/tests/results/Makefile.am 2008-07-25 21:13:59.000000000 +0200
@@ -1,6 +1,8 @@
NULL =
EXTRA_DIST = \
+ context.xml \
+ context.xml.in.h \
extract-comments.xml.h \
extract1.desktop.h \
extract10.templates_.h \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.40.0/tests/results/Makefile.in new/intltool-0.40.3/tests/results/Makefile.in
--- old/intltool-0.40.0/tests/results/Makefile.in 2008-06-03 20:50:51.000000000 +0200
+++ new/intltool-0.40.3/tests/results/Makefile.in 2008-07-25 21:37:14.000000000 +0200
@@ -114,6 +114,8 @@
top_srcdir = @top_srcdir@
NULL =
EXTRA_DIST = \
+ context.xml \
+ context.xml.in.h \
extract-comments.xml.h \
extract1.desktop.h \
extract10.templates_.h \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.40.0/tests/selftest.pl.in new/intltool-0.40.3/tests/selftest.pl.in
--- old/intltool-0.40.0/tests/selftest.pl.in 2008-06-03 20:49:37.000000000 +0200
+++ new/intltool-0.40.3/tests/selftest.pl.in 2008-07-25 19:51:44.000000000 +0200
@@ -267,6 +267,16 @@
system("$INTLTOOL_MERGE -x --quiet cases cases/$case.in cases/$case") == 0 or $failed = 1;
check_merge_result($case);
+print "35. Extract messages from an XML file with msgctxts: ";
+$case = "context.xml.in";
+system("$INTLTOOL_EXTRACT --type=gettext/xml --quiet --update cases/$case") == 0 or $failed = 1;
+check_extract_result($case);
+
+print "36. Merge translations into an XML file with msgctxts: ";
+$case = "context.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 C az extract9 fr fr_BE fr_FR merge6 schemasmerge1 schemasmerge2 spacepreserve test test-quoted merge6.xml");
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org