Hello community,
here is the log from the commit of package translation-update-upstream for
openSUSE:Factory checked in at 2014-09-07 11:11:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/translation-update-upstream (Old)
and /work/SRC/openSUSE:Factory/.translation-update-upstream.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "translation-update-upstream"
Changes:
--------
---
/work/SRC/openSUSE:Factory/translation-update-upstream/translation-update-upstream.changes
2014-05-22 20:37:46.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.translation-update-upstream.new/translation-update-upstream.changes
2014-09-07 11:11:45.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Sep 4 17:32:24 CEST 2014 - [email protected]
+
+- upstream-collect.sh supplementary script: Fixed inverted po file
+ age check (bnc#889513).
+- create-tlst-step2-create-gnome_gtp.sh: Add support for udisks.
+- Reset translation tarballs: use only packaged translations.
+
+-------------------------------------------------------------------
Old:
----
translation-update-mandatory-20130214.tar.bz2
translation-update-upstream-20130214.tar.bz2
New:
----
translation-update-mandatory-20140905.tar.bz2
translation-update-upstream-20140905.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ translation-update-upstream.spec ++++++
--- /var/tmp/diff_new_pack.dEWDoJ/_old 2014-09-07 11:11:47.000000000 +0200
+++ /var/tmp/diff_new_pack.dEWDoJ/_new 2014-09-07 11:11:47.000000000 +0200
@@ -17,7 +17,7 @@
Name: translation-update-upstream
-Version: 20130214
+Version: 20140905
Release: 0
Summary: Tool for Translation Update from Upstream
License: GPL-2.0+
@@ -122,8 +122,8 @@
# short form of these locales should be used
rm -fv $RPM_BUILD_ROOT%{_datadir}/%{name}/po/*/my_MM.po
# these are nonsenses
-rm -v $RPM_BUILD_ROOT%{_datadir}/%{name}/po/glib-networking/master.po
-rm -v $RPM_BUILD_ROOT%{_datadir}/%{name}/po/glib20/glib.glib-2-30.gu.po
+#rm -v $RPM_BUILD_ROOT%{_datadir}/%{name}/po/glib-networking/master.po
+#rm -v $RPM_BUILD_ROOT%{_datadir}/%{name}/po/glib20/glib.glib-2-30.gu.po
#
# go through valid locales and fail in invalid ones
#
++++++ create-tlst-step2-create-gnome_gtp.sh ++++++
--- /var/tmp/diff_new_pack.dEWDoJ/_old 2014-09-07 11:11:47.000000000 +0200
+++ /var/tmp/diff_new_pack.dEWDoJ/_new 2014-09-07 11:11:47.000000000 +0200
@@ -61,6 +61,7 @@
echo gnome-phone-manager phonemgr gnome-phone-manager gnome-3-10
echo gnome-phone-manager phonemgr gnome-phone-manager master
echo network-manager-applet NetworkManager-gnome nm-applet master
+ echo udisks udisks2 udisks2 master
# For other versions than sles10:
# echo network-manager-applet NetworkManager nm-applet
) |
++++++ translation-update-mandatory-20130214.tar.bz2 ->
translation-update-mandatory-20140905.tar.bz2 ++++++
++++++ translation-update-upstream-20130214.tar.bz2 ->
translation-update-upstream-20140905.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/translation-update-upstream/translation-update-upstream-20130214.tar.bz2
/work/SRC/openSUSE:Factory/.translation-update-upstream.new/translation-update-upstream-20140905.tar.bz2
differ: char 11, line 1
++++++ upstream-collect.sh ++++++
--- /var/tmp/diff_new_pack.dEWDoJ/_old 2014-09-07 11:11:47.000000000 +0200
+++ /var/tmp/diff_new_pack.dEWDoJ/_new 2014-09-07 11:11:47.000000000 +0200
@@ -149,6 +149,7 @@
export PATH=~/.upstream-collect.tmp:$PATH
+# FIXME: Even in incremental mode, we should drop all updates that generate
empty update file after the run. These files are obsolete, included into
package, and may even degrade translation quality.
if $INCREMENTAL ; then
# more tarballs are available => use the latest one
# FIXME: Fix 20090213.10 < 20090213.9
@@ -559,10 +560,11 @@
OLD_UPDATE=false
PLURAL_FAILURE=false
if test -f $WORK_DIR/UPDATE/po/$REAL_DOMAIN/$PO ;
then
- if $WORK_DIR/msgheadermerge
$WORK_DIR/UPDATE/po/$REAL_DOMAIN/$PO $PO ${PO%.po}-uheader.po --mergemode
--continue ; then
+ if ! $WORK_DIR/msgheadermerge
$WORK_DIR/UPDATE/po/$REAL_DOMAIN/$PO $PO ${PO%.po}-uheader.po --mergemode
--continue ; then
echo >>$WORK_DIR/upstream-collect.log
"package=$PACKAGE domain=$DOMAIN gettext-package=$REAL_DOMAIN repository=$REPO
directory=$RPMPODIR branch=${BRANCH:(default)} po=$PO: old po file, skipping
fixes"
OLD_UPDATE=true
fi
+ # FIXME: There could be an exotic case, where
obsolete update adds new strings that contain plurals, and plural number
changed. In such case, exclusion of updates may cause plural clash. In such
case we have to validate additions only with the new or old plural-form header,
and if both fails, skip additions as well. (bnc#894913)
msgcat --force-po --use-first
${PO%.po}-uheader.po ${PO%.po}-backport.po~
$WORK_DIR/UPDATE/po/$REAL_DOMAIN/$PO -o ${PO%.po}-upstream.po
if ! validate_po_with_plural_check
${PO%.po}-upstream.po ; then
if $PLURAL_FAILURE ; then
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
