Hello community,
here is the log from the commit of package intltool
checked in at Thu Mar 22 12:09:00 CET 2007.
--------
--- GNOME/intltool/intltool.changes 2007-02-16 20:27:28.000000000 +0100
+++ /mounts/work_src_done/NOARCH/intltool/intltool.changes 2007-03-22 12:08:29.526868000 +0100
@@ -1,0 +2,10 @@
+Wed Mar 21 13:37:06 CST 2007 - maw@suse.de
+
+- Update to version 0.35.5.
+ * Don't hardcode fallback path to intltool-extract -- bug #399476
+ * Fix mkdir race in inltool-merge.in.in -- bug #400788
+ * Update an additional check to use $SRCDIR properly for POTFILES.skip
+ -- bug #391892
+ * Handle extracting comments from ini-style files -- bug #390271
+
+-------------------------------------------------------------------
@@ -4,0 +15 @@
+ * Fix logic of checking for leftout files in builddir or srcdir
Old:
----
intltool-0.35.4.tar.bz2
New:
----
intltool-0.35.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ intltool.spec ++++++
--- /var/tmp/diff_new_pack.m17208/_old 2007-03-22 12:08:43.000000000 +0100
+++ /var/tmp/diff_new_pack.m17208/_new 2007-03-22 12:08:43.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package intltool (Version 0.35.4)
+# spec file for package intltool (Version 0.35.5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,7 +13,7 @@
Name: intltool
BuildRequires: perl-XML-Parser
Summary: Internationalization Tool Collection
-Version: 0.35.4
+Version: 0.35.5
Release: 1
Group: Development/Tools/Other
BuildArchitectures: noarch
@@ -75,8 +75,16 @@
%{_datadir}/aclocal/*
%changelog
+* Wed Mar 21 2007 - maw@suse.de
+- Update to version 0.35.5.
+ * Don't hardcode fallback path to intltool-extract -- bug #399476
+ * Fix mkdir race in inltool-merge.in.in -- bug #400788
+ * Update an additional check to use $SRCDIR properly for POTFILES.skip
+ -- bug #391892
+ * Handle extracting comments from ini-style files -- bug #390271
* Fri Feb 16 2007 - maw@suse.de
- Update to version 0.35.4.
+ * Fix logic of checking for leftout files in builddir or srcdir
* Fri Dec 22 2006 - sreeves@suse.de
- ver 0.35 of intltool is needed for Fate#301648.
The menu editor we will use is alacarte which requires >=0.35 version
++++++ intltool-0.35.4.tar.bz2 -> intltool-0.35.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.35.4/ChangeLog new/intltool-0.35.5/ChangeLog
--- old/intltool-0.35.4/ChangeLog 2007-01-08 15:51:39.000000000 +0100
+++ new/intltool-0.35.5/ChangeLog 2007-02-23 20:45:18.000000000 +0100
@@ -1,3 +1,48 @@
+2007-02-23 Rodney Dawes
+
+ * NEWS:
+ * configure.in: Up version to 0.35.5 for release
+
+2007-02-13 Rodney Dawes
+
+ * intltool-update.in.in (GenerateHeaders):
+ * Makefile.am:
+ Don't hardcode the fallback path to intltool-extract
+
+ Fixes #399476
+
+2007-02-13 Rodney Dawes
+
+ * intltool-merge.in.in (xml_merge_output, quoted_merge_translations):
+ Check that $lang is a directory, rather than just that it exists
+ Create the directory if it doesn't exist, and check that it is a
+ directory if it gets created by a different thread
+ Original patch from Leonardo Boshell
+
+ Fixes #400788
+
+2007-01-22 Rodney Dawes
+
+ * intltool-update.in.in (FindLeftoutFiles): Update the -s check to
+ use $SRCDIR when looking for POTFILES.{skip,ignore} as well
+
+ Fixes #391892 more completely
+
+2007-01-10 Rodney Dawes
+
+ * intltool-extract.in.in (type_ini): Handle extracting comments as
+ well as messages
+ * tests/cases/Makefile.am: Add extract13.desktop.in appropriately
+ * tests/cases/extract13.desktop.in: New test case for .desktop comments
+ * tests/results/Makefile.am: Add extract13.desktop.in.h
+ * tests/results/extract13.desktop.in.h: Resulting header with strings
+ * tests/selftest.pl.in: Add test case 32 for extracting desktop file
+ comment strings for translators
+
+ Patch from Takao Fujiwara
+
+ Fixes #390271
+
2007-01-08 Rodney Dawes
* NEWS:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.35.4/configure new/intltool-0.35.5/configure
--- old/intltool-0.35.4/configure 2007-01-08 15:50:58.000000000 +0100
+++ new/intltool-0.35.5/configure 2007-02-23 20:45:26.000000000 +0100
@@ -1622,7 +1622,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-INTLTOOL_VERSION=0.35.4
+INTLTOOL_VERSION=0.35.5
am__api_version="1.9"
ac_aux_dir=
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.35.4/configure.in new/intltool-0.35.5/configure.in
--- old/intltool-0.35.4/configure.in 2007-01-08 15:50:05.000000000 +0100
+++ new/intltool-0.35.5/configure.in 2007-02-23 20:41:29.000000000 +0100
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to create configure.
AC_INIT(intltoolize.in)
-INTLTOOL_VERSION=0.35.4
+INTLTOOL_VERSION=0.35.5
AM_INIT_AUTOMAKE(intltool, $INTLTOOL_VERSION)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.35.4/intltool-extract.in.in new/intltool-0.35.5/intltool-extract.in.in
--- old/intltool-0.35.4/intltool-extract.in.in 2007-01-03 22:05:42.000000000 +0100
+++ new/intltool-0.35.5/intltool-extract.in.in 2007-01-10 16:51:00.000000000 +0100
@@ -261,8 +261,11 @@
sub type_ini {
### For generic translatable desktop files ###
- while ($input =~ /^_.*=(.*)$/mg) {
- $messages{$1} = [];
+ while ($input =~ /^(#(.+)\n)?^_.*=(.*)$/mg) {
+ if (defined($2)) {
+ $comments{$3} = $2;
+ }
+ $messages{$3} = [];
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.35.4/intltool-merge.in.in new/intltool-0.35.5/intltool-merge.in.in
--- old/intltool-0.35.4/intltool-merge.in.in 2007-01-03 22:05:42.000000000 +0100
+++ new/intltool-0.35.5/intltool-merge.in.in 2007-02-14 05:01:00.000000000 +0100
@@ -1017,8 +1017,8 @@
if ($MULTIPLE_OUTPUT) {
for my $lang (sort keys %po_files_by_lang) {
- if ( ! -e $lang ) {
- mkdir $lang or die "Cannot create subdirectory $lang: $!\n";
+ if ( ! -d $lang ) {
+ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
}
open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
binmode (OUTPUT) if $^O eq 'MSWin32';
@@ -1386,8 +1386,8 @@
}
for my $lang (sort keys %po_files_by_lang) {
- if ( ! -e $lang ) {
- mkdir $lang or die "Cannot create subdirectory $lang: $!\n";
+ if ( ! -d $lang ) {
+ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
}
open INPUT, "<${FILE}" or die;
open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.35.4/intltool.spec new/intltool-0.35.5/intltool.spec
--- old/intltool-0.35.4/intltool.spec 2007-01-08 15:51:01.000000000 +0100
+++ new/intltool-0.35.5/intltool.spec 2007-02-23 20:45:29.000000000 +0100
@@ -1,6 +1,6 @@
# Note this is NOT a relocatable thing :)
%define name intltool
-%define ver 0.35.4
+%define ver 0.35.5
%define RELEASE 1
%define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.35.4/intltool-update.in.in new/intltool-0.35.5/intltool-update.in.in
--- old/intltool-0.35.4/intltool-update.in.in 2007-01-08 15:46:55.000000000 +0100
+++ new/intltool-0.35.5/intltool-update.in.in 2007-02-14 05:08:40.000000000 +0100
@@ -344,7 +344,7 @@
## comparing with POTFILES.in
foreach my $ignore ("POTFILES.skip", "POTFILES.ignore")
{
- (-s $ignore) or next;
+ (-s "$SRCDIR/$ignore") or next;
if ("$ignore" eq "POTFILES.ignore")
{
@@ -565,10 +565,7 @@
sub GenerateHeaders
{
- my $EXTRACT = "@INTLTOOL_EXTRACT@";
- chomp $EXTRACT;
-
- $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} if $ENV{"INTLTOOL_EXTRACT"};
+ my $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} || "intltool-extract";
## Generate the .h header files, so we can allow glade and
## xml translation support
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.35.4/Makefile.am new/intltool-0.35.5/Makefile.am
--- old/intltool-0.35.4/Makefile.am 2007-01-03 22:05:42.000000000 +0100
+++ new/intltool-0.35.5/Makefile.am 2007-02-14 05:12:37.000000000 +0100
@@ -43,7 +43,6 @@
-e "s|[@]INTLTOOL_MSGFMT@|$(INTLTOOL_MSGFMT)|g" \
-e "s|[@]INTLTOOL_MSGMERGE@|$(INTLTOOL_MSGMERGE)|g" \
-e "s|[@]INTLTOOL_XGETTEXT@|$(INTLTOOL_XGETTEXT)|g" \
- -e "s|[@]INTLTOOL_EXTRACT@|$(bindir)/intltool-extract|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 old/intltool-0.35.4/Makefile.in new/intltool-0.35.5/Makefile.in
--- old/intltool-0.35.4/Makefile.in 2007-01-08 15:50:59.000000000 +0100
+++ new/intltool-0.35.5/Makefile.in 2007-02-23 20:45:27.000000000 +0100
@@ -196,7 +196,6 @@
-e "s|[@]INTLTOOL_MSGFMT@|$(INTLTOOL_MSGFMT)|g" \
-e "s|[@]INTLTOOL_MSGMERGE@|$(INTLTOOL_MSGMERGE)|g" \
-e "s|[@]INTLTOOL_XGETTEXT@|$(INTLTOOL_XGETTEXT)|g" \
- -e "s|[@]INTLTOOL_EXTRACT@|$(bindir)/intltool-extract|g" \
-e "s|[@]INTLTOOL_LIBDIR@|$(libdir)|g"
all: all-recursive
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.35.4/NEWS new/intltool-0.35.5/NEWS
--- old/intltool-0.35.4/NEWS 2007-01-08 15:50:49.000000000 +0100
+++ new/intltool-0.35.5/NEWS 2007-02-23 20:45:05.000000000 +0100
@@ -1,3 +1,14 @@
+Version 0.35.5
+
+* Don't hardcode fallback path to intltool-extract
+ -- bug #399476 (Rodney Dawes)
+* Fix mkdir race in inltool-merge.in.in
+ -- bug #400788 (Rodney Dawes, Leonardo Boshell)
+* Update an additional check to use $SRCDIR properly for POTFILES.skip
+ -- bug #391892 (Rodney Dawes)
+* Handle extracting comments from ini-style files
+ -- bug #390271 (Takao Fujiwara)
+
Version 0.35.4
* Fix logic of checking for leftout files in builddir or srcdir (Rodney Dawes)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.35.4/tests/cases/extract13.desktop.in new/intltool-0.35.5/tests/cases/extract13.desktop.in
--- old/intltool-0.35.4/tests/cases/extract13.desktop.in 1970-01-01 01:00:00.000000000 +0100
+++ new/intltool-0.35.5/tests/cases/extract13.desktop.in 2007-01-10 16:51:00.000000000 +0100
@@ -0,0 +1,25 @@
+[Desktop Entry]
+Encoding=UTF-8
+# 1. This comment should NOT be extracted.
+# 2. This comment should be extracted.
+_Name=Find Files...
+# 3. This comment should NOT be extracted.
+# 4. This comment also should be extracted.
+_Comment=Locate documents and folders on this computer by name or content
+# 5. This comment should NOT be extracted.
+Exec=gnome-search-tool
+# 6. This comment should NOT be extracted.
+Icon=gnome-searchtool
+# 7. This comment should NOT be extracted.
+Terminal=false
+# 8. This comment should NOT be extracted.
+Type=Application
+# 9. This comment should NOT be extracted.
+StartupNotify=true
+# 10. This comment should NOT be extracted.
+Categories=GNOME;GTK;Application;Core;
+# 11. This comment should NOT be extracted.
+X-GNOME-DocPath=gnome-search-tool/gnome-search-tool.xml
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-utils
+X-GNOME-Bugzilla-Component=gsearchtool
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.35.4/tests/cases/Makefile.am new/intltool-0.35.5/tests/cases/Makefile.am
--- old/intltool-0.35.4/tests/cases/Makefile.am 2007-01-03 22:05:42.000000000 +0100
+++ new/intltool-0.35.5/tests/cases/Makefile.am 2007-01-10 16:51:00.000000000 +0100
@@ -5,6 +5,7 @@
extract-comments.xml \
extract1.desktop \
extract10.templates_ \
+ extract13.desktop.in \
extract3.xml.in \
extract6.glade \
extract7.xml \
@@ -44,6 +45,7 @@
extract-comments.xml.h \
extract10.templates_.h \
extract12.xml.in.h \
+ extract13.desktop.in.h \
extract9.xml \
extract9.xml.in.h \
iso88591text.xml.in.h \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.35.4/tests/cases/Makefile.in new/intltool-0.35.5/tests/cases/Makefile.in
--- old/intltool-0.35.4/tests/cases/Makefile.in 2007-01-08 15:50:59.000000000 +0100
+++ new/intltool-0.35.5/tests/cases/Makefile.in 2007-02-23 20:45:26.000000000 +0100
@@ -116,6 +116,7 @@
extract-comments.xml \
extract1.desktop \
extract10.templates_ \
+ extract13.desktop.in \
extract3.xml.in \
extract6.glade \
extract7.xml \
@@ -155,6 +156,7 @@
extract-comments.xml.h \
extract10.templates_.h \
extract12.xml.in.h \
+ extract13.desktop.in.h \
extract9.xml \
extract9.xml.in.h \
iso88591text.xml.in.h \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.35.4/tests/results/extract13.desktop.in.h new/intltool-0.35.5/tests/results/extract13.desktop.in.h
--- old/intltool-0.35.4/tests/results/extract13.desktop.in.h 1970-01-01 01:00:00.000000000 +0100
+++ new/intltool-0.35.5/tests/results/extract13.desktop.in.h 2007-01-10 16:51:00.000000000 +0100
@@ -0,0 +1,4 @@
+/* 2. This comment should be extracted. */
+char *s = N_("Find Files...");
+/* 4. This comment also should be extracted. */
+char *s = N_("Locate documents and folders on this computer by name or content");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.35.4/tests/results/Makefile.am new/intltool-0.35.5/tests/results/Makefile.am
--- old/intltool-0.35.4/tests/results/Makefile.am 2007-01-03 22:05:41.000000000 +0100
+++ new/intltool-0.35.5/tests/results/Makefile.am 2007-01-10 16:51:00.000000000 +0100
@@ -4,6 +4,7 @@
extract-comments.xml.h \
extract1.desktop.h \
extract10.templates_.h \
+ extract13.desktop.in.h \
extract3.xml.in.h \
extract6.glade.h \
extract7.xml.h \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.35.4/tests/results/Makefile.in new/intltool-0.35.5/tests/results/Makefile.in
--- old/intltool-0.35.4/tests/results/Makefile.in 2007-01-08 15:50:59.000000000 +0100
+++ new/intltool-0.35.5/tests/results/Makefile.in 2007-02-23 20:45:27.000000000 +0100
@@ -115,6 +115,7 @@
extract-comments.xml.h \
extract1.desktop.h \
extract10.templates_.h \
+ extract13.desktop.in.h \
extract3.xml.in.h \
extract6.glade.h \
extract7.xml.h \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/intltool-0.35.4/tests/selftest.pl.in new/intltool-0.35.5/tests/selftest.pl.in
--- old/intltool-0.35.4/tests/selftest.pl.in 2007-01-03 22:05:42.000000000 +0100
+++ new/intltool-0.35.5/tests/selftest.pl.in 2007-02-14 04:36:10.000000000 +0100
@@ -247,6 +247,11 @@
system("$INTLTOOL_MERGE --quoted-style --quiet --multiple-output cases cases/$case $case") == 0 or $failed = 1;
check_multimerge_result($case, "test-quoted");
+print "32. Extract comments for translators from a .desktop.in file: ";
+$case = "extract13.desktop.in";
+system("$INTLTOOL_EXTRACT --type=gettext/ini --quiet --update cases/$case") == 0 or $failed = 1;
+check_extract_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");
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org