Mailinglist Archive: opensuse-commit (1469 mails)
| < Previous | Next > |
commit intltool for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 01 Mar 2012 17:20:27 +0100
- Message-id: <20120301162027.6AD8020367@hilbert.suse.de>
Hello community,
here is the log from the commit of package intltool for openSUSE:Factory
checked in at 2012-03-01 17:20:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/intltool (Old)
and /work/SRC/openSUSE:Factory/.intltool.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "intltool", Maintainer is "gnome-maintainers@xxxxxxx"
Changes:
--------
--- /work/SRC/openSUSE:Factory/intltool/intltool.changes 2012-02-16
16:16:49.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.intltool.new/intltool.changes 2012-03-01
17:20:25.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Feb 27 08:07:15 UTC 2012 - vuntz@xxxxxxxxxxxx
+
+- Update to version 0.50.2:
+ + Use --no-translations only if intltool >= 0.50 is available
+ (lp#903340).
+
+-------------------------------------------------------------------
Old:
----
intltool-0.50.1.tar.gz
New:
----
intltool-0.50.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ intltool.spec ++++++
--- /var/tmp/diff_new_pack.Erm2EH/_old 2012-03-01 17:20:27.000000000 +0100
+++ /var/tmp/diff_new_pack.Erm2EH/_new 2012-03-01 17:20:27.000000000 +0100
@@ -21,7 +21,7 @@
Summary: Internationalization Tool Collection
License: GPL-2.0+
Group: Development/Tools/Other
-Version: 0.50.1
+Version: 0.50.2
Release: 0
BuildArch: noarch
Requires: gettext-tools
++++++ intltool-0.50.1.tar.gz -> intltool-0.50.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/intltool-0.50.1/ChangeLog
new/intltool-0.50.2/ChangeLog
--- old/intltool-0.50.1/ChangeLog 2012-02-05 10:20:31.000000000 +0100
+++ new/intltool-0.50.2/ChangeLog 2012-02-26 19:47:53.000000000 +0100
@@ -1,3 +1,15 @@
+ 735 Danilo Šegan 2012-02-26
+ Up the version number to 0.50.2.
+
+ 734 Danilo Šegan 2012-02-26 [merge]
+ Fix #903340: Use --no-translations only if detected intltool on the
system is 0.50 or better. Patch by Hib Eric.
+
+ 733 Danilo Šegan 2012-02-05
+ Update NEWS: Include a missed contribution by doko in 0.50.1 and
reconstruct 0.50.0 stuff from the release notes on LP.
+
+ 732 Danilo Šegan 2012-02-05
+ Up the version to 0.50.1.
+
731 Danilo Šegan 2012-02-05 [merge]
Fix #924386: include ChangeLog in dist tarballs and create a NEWS file.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/intltool-0.50.1/NEWS new/intltool-0.50.2/NEWS
--- old/intltool-0.50.1/NEWS 2012-02-05 10:18:28.000000000 +0100
+++ new/intltool-0.50.2/NEWS 2012-02-26 19:38:05.000000000 +0100
@@ -1,3 +1,12 @@
+intltool 0.50.2
+===============
+
+intltool 0.50.2 is another minor release improving backwards compatibility.
+Only one bug is fixed in this release:
+
+ * Use --no-translations only if intltool >= 0.50 is available (#903340).
+ Patch contributed by Hib Eris (https://launchpad.net/~hiberis).
+
intltool 0.50.1
===============
@@ -15,3 +24,35 @@
* Start including a ChangeLog in tarballs and provide a NEWS file (#924386).
This introduces a soft dependency on "bzr": it's only required for
maintainers who wish to regenerate a ChangeLog file from the bzr checkout.
+
+ * Fix quoting of XGETTEXT variable when setting MSGMERGE and GENPOT
+ in Makefile (#900738).
+ Patch contributed by Matthias Klose (https://launchpad.net/~doko).
+
+
+intltool 0.50.0
+===============
+
+intltool 0.50.0 is a major bug fix release.
+
+Among the fixes, the following stand out:
+
+ * Bug #580526
+ Finally, support for gsettings gschema.xml files is merged in, which
+ should enable maintainers to get a slightly simpler build setup
+ (i.e. no need to use NOMERGE rule anymore, and you can have intltool
+ directly extract translations from .gschema.xml files).
+
+ * Bug #790574:
+ Let xgettext extract Scheme strings out, and add support for
+ `intltool-update -m` to find files with marked strings.
+
+ * Bug #806006:
+ Improve handling of quotes in `intltool-update -m` so you get less
+ (no?) warnings about mismatched quotes, and Python processing doesn't
+ get messed up with docstrings and similar.
+
+ * Bug #520986:
+ One for the translators—messages are extracted in the order they appear
+ in original files now, thus allowing translators to infer more of the
+ context from the ordering.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/intltool-0.50.1/configure
new/intltool-0.50.2/configure
--- old/intltool-0.50.1/configure 2012-02-05 10:20:29.000000000 +0100
+++ new/intltool-0.50.2/configure 2012-02-26 19:42:22.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for intltool 0.50.1.
+# Generated by GNU Autoconf 2.68 for intltool 0.50.2.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@
# Identity of this package.
PACKAGE_NAME='intltool'
PACKAGE_TARNAME='intltool'
-PACKAGE_VERSION='0.50.1'
-PACKAGE_STRING='intltool 0.50.1'
+PACKAGE_VERSION='0.50.2'
+PACKAGE_STRING='intltool 0.50.2'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1178,7 +1178,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures intltool 0.50.1 to adapt to many kinds of systems.
+\`configure' configures intltool 0.50.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1244,7 +1244,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of intltool 0.50.1:";;
+ short | recursive ) echo "Configuration of intltool 0.50.2:";;
esac
cat <<\_ACEOF
@@ -1311,7 +1311,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-intltool configure 0.50.1
+intltool configure 0.50.2
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1328,7 +1328,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by intltool $as_me 0.50.1, which was
+It was created by intltool $as_me 0.50.2, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2145,7 +2145,7 @@
# Define the identity of the package.
PACKAGE='intltool'
- VERSION='0.50.1'
+ VERSION='0.50.2'
cat >>confdefs.h <<_ACEOF
@@ -2851,7 +2851,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by intltool $as_me 0.50.1, which was
+This file was extended by intltool $as_me 0.50.2, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2904,7 +2904,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-intltool config.status 0.50.1
+intltool config.status 0.50.2
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/intltool-0.50.1/configure.ac
new/intltool-0.50.2/configure.ac
--- old/intltool-0.50.1/configure.ac 2012-02-05 10:20:07.000000000 +0100
+++ new/intltool-0.50.2/configure.ac 2012-02-26 19:41:48.000000000 +0100
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.53])
-AC_INIT([intltool], [0.50.1])
+AC_INIT([intltool], [0.50.2])
AC_CONFIG_SRCDIR([intltoolize.in])
AM_INIT_AUTOMAKE([foreign])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/intltool-0.50.1/intltool.m4
new/intltool-0.50.2/intltool.m4
--- old/intltool-0.50.1/intltool.m4 2012-02-05 09:28:34.000000000 +0100
+++ new/intltool-0.50.2/intltool.m4 2012-02-26 19:31:06.000000000 +0100
@@ -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 41 IT_PROG_INTLTOOL
+# serial 42 IT_PROG_INTLTOOL
AC_DEFUN([IT_PROG_INTLTOOL], [
AC_PREREQ([2.50])dnl
AC_REQUIRE([AM_NLS])dnl
@@ -36,13 +36,11 @@
;;
esac
+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2
* 100 + $ 3; }'`
+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{
print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
if test -n "$1"; then
AC_MSG_CHECKING([for intltool >= $1])
-
- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 +
$ 2 * 100 + $ 3; }'`
- INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" "
-f3`
- [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F.
'{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- ]
AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge
"$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or
later.])
@@ -85,7 +83,11 @@
INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE)
; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x
-u --no-translations $< [$]@'
+else
+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE)
; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir
[$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x
-u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir'
+fi
INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
here is the log from the commit of package intltool for openSUSE:Factory
checked in at 2012-03-01 17:20:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/intltool (Old)
and /work/SRC/openSUSE:Factory/.intltool.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "intltool", Maintainer is "gnome-maintainers@xxxxxxx"
Changes:
--------
--- /work/SRC/openSUSE:Factory/intltool/intltool.changes 2012-02-16
16:16:49.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.intltool.new/intltool.changes 2012-03-01
17:20:25.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Feb 27 08:07:15 UTC 2012 - vuntz@xxxxxxxxxxxx
+
+- Update to version 0.50.2:
+ + Use --no-translations only if intltool >= 0.50 is available
+ (lp#903340).
+
+-------------------------------------------------------------------
Old:
----
intltool-0.50.1.tar.gz
New:
----
intltool-0.50.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ intltool.spec ++++++
--- /var/tmp/diff_new_pack.Erm2EH/_old 2012-03-01 17:20:27.000000000 +0100
+++ /var/tmp/diff_new_pack.Erm2EH/_new 2012-03-01 17:20:27.000000000 +0100
@@ -21,7 +21,7 @@
Summary: Internationalization Tool Collection
License: GPL-2.0+
Group: Development/Tools/Other
-Version: 0.50.1
+Version: 0.50.2
Release: 0
BuildArch: noarch
Requires: gettext-tools
++++++ intltool-0.50.1.tar.gz -> intltool-0.50.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/intltool-0.50.1/ChangeLog
new/intltool-0.50.2/ChangeLog
--- old/intltool-0.50.1/ChangeLog 2012-02-05 10:20:31.000000000 +0100
+++ new/intltool-0.50.2/ChangeLog 2012-02-26 19:47:53.000000000 +0100
@@ -1,3 +1,15 @@
+ 735 Danilo Šegan 2012-02-26
+ Up the version number to 0.50.2.
+
+ 734 Danilo Šegan 2012-02-26 [merge]
+ Fix #903340: Use --no-translations only if detected intltool on the
system is 0.50 or better. Patch by Hib Eric.
+
+ 733 Danilo Šegan 2012-02-05
+ Update NEWS: Include a missed contribution by doko in 0.50.1 and
reconstruct 0.50.0 stuff from the release notes on LP.
+
+ 732 Danilo Šegan 2012-02-05
+ Up the version to 0.50.1.
+
731 Danilo Šegan 2012-02-05 [merge]
Fix #924386: include ChangeLog in dist tarballs and create a NEWS file.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/intltool-0.50.1/NEWS new/intltool-0.50.2/NEWS
--- old/intltool-0.50.1/NEWS 2012-02-05 10:18:28.000000000 +0100
+++ new/intltool-0.50.2/NEWS 2012-02-26 19:38:05.000000000 +0100
@@ -1,3 +1,12 @@
+intltool 0.50.2
+===============
+
+intltool 0.50.2 is another minor release improving backwards compatibility.
+Only one bug is fixed in this release:
+
+ * Use --no-translations only if intltool >= 0.50 is available (#903340).
+ Patch contributed by Hib Eris (https://launchpad.net/~hiberis).
+
intltool 0.50.1
===============
@@ -15,3 +24,35 @@
* Start including a ChangeLog in tarballs and provide a NEWS file (#924386).
This introduces a soft dependency on "bzr": it's only required for
maintainers who wish to regenerate a ChangeLog file from the bzr checkout.
+
+ * Fix quoting of XGETTEXT variable when setting MSGMERGE and GENPOT
+ in Makefile (#900738).
+ Patch contributed by Matthias Klose (https://launchpad.net/~doko).
+
+
+intltool 0.50.0
+===============
+
+intltool 0.50.0 is a major bug fix release.
+
+Among the fixes, the following stand out:
+
+ * Bug #580526
+ Finally, support for gsettings gschema.xml files is merged in, which
+ should enable maintainers to get a slightly simpler build setup
+ (i.e. no need to use NOMERGE rule anymore, and you can have intltool
+ directly extract translations from .gschema.xml files).
+
+ * Bug #790574:
+ Let xgettext extract Scheme strings out, and add support for
+ `intltool-update -m` to find files with marked strings.
+
+ * Bug #806006:
+ Improve handling of quotes in `intltool-update -m` so you get less
+ (no?) warnings about mismatched quotes, and Python processing doesn't
+ get messed up with docstrings and similar.
+
+ * Bug #520986:
+ One for the translators—messages are extracted in the order they appear
+ in original files now, thus allowing translators to infer more of the
+ context from the ordering.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/intltool-0.50.1/configure
new/intltool-0.50.2/configure
--- old/intltool-0.50.1/configure 2012-02-05 10:20:29.000000000 +0100
+++ new/intltool-0.50.2/configure 2012-02-26 19:42:22.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for intltool 0.50.1.
+# Generated by GNU Autoconf 2.68 for intltool 0.50.2.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@
# Identity of this package.
PACKAGE_NAME='intltool'
PACKAGE_TARNAME='intltool'
-PACKAGE_VERSION='0.50.1'
-PACKAGE_STRING='intltool 0.50.1'
+PACKAGE_VERSION='0.50.2'
+PACKAGE_STRING='intltool 0.50.2'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1178,7 +1178,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures intltool 0.50.1 to adapt to many kinds of systems.
+\`configure' configures intltool 0.50.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1244,7 +1244,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of intltool 0.50.1:";;
+ short | recursive ) echo "Configuration of intltool 0.50.2:";;
esac
cat <<\_ACEOF
@@ -1311,7 +1311,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-intltool configure 0.50.1
+intltool configure 0.50.2
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1328,7 +1328,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by intltool $as_me 0.50.1, which was
+It was created by intltool $as_me 0.50.2, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2145,7 +2145,7 @@
# Define the identity of the package.
PACKAGE='intltool'
- VERSION='0.50.1'
+ VERSION='0.50.2'
cat >>confdefs.h <<_ACEOF
@@ -2851,7 +2851,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by intltool $as_me 0.50.1, which was
+This file was extended by intltool $as_me 0.50.2, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2904,7 +2904,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-intltool config.status 0.50.1
+intltool config.status 0.50.2
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/intltool-0.50.1/configure.ac
new/intltool-0.50.2/configure.ac
--- old/intltool-0.50.1/configure.ac 2012-02-05 10:20:07.000000000 +0100
+++ new/intltool-0.50.2/configure.ac 2012-02-26 19:41:48.000000000 +0100
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.53])
-AC_INIT([intltool], [0.50.1])
+AC_INIT([intltool], [0.50.2])
AC_CONFIG_SRCDIR([intltoolize.in])
AM_INIT_AUTOMAKE([foreign])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/intltool-0.50.1/intltool.m4
new/intltool-0.50.2/intltool.m4
--- old/intltool-0.50.1/intltool.m4 2012-02-05 09:28:34.000000000 +0100
+++ new/intltool-0.50.2/intltool.m4 2012-02-26 19:31:06.000000000 +0100
@@ -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 41 IT_PROG_INTLTOOL
+# serial 42 IT_PROG_INTLTOOL
AC_DEFUN([IT_PROG_INTLTOOL], [
AC_PREREQ([2.50])dnl
AC_REQUIRE([AM_NLS])dnl
@@ -36,13 +36,11 @@
;;
esac
+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2
* 100 + $ 3; }'`
+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{
print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
if test -n "$1"; then
AC_MSG_CHECKING([for intltool >= $1])
-
- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 +
$ 2 * 100 + $ 3; }'`
- INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" "
-f3`
- [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F.
'{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- ]
AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge
"$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or
later.])
@@ -85,7 +83,11 @@
INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE)
; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x
-u --no-translations $< [$]@'
+else
+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE)
; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir
[$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x
-u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir'
+fi
INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE)
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |