Hello community,
here is the log from the commit of package translation-update-upstream for openSUSE:Factory
checked in at Tue Oct 27 17:18:09 CET 2009.
--------
--- translation-update-upstream/translation-update-upstream.changes 2009-10-16 16:33:36.000000000 +0200
+++ /mounts/work_src_done/STABLE/translation-update-upstream/translation-update-upstream.changes 2009-10-27 16:25:33.000000000 +0100
@@ -1,0 +2,8 @@
+Tue Oct 27 16:21:20 CET 2009 - sbrabec@suse.cz
+
+- Added several more packages.
+- Fixed errors if one package has updates on more servers.
+- Do not interfere with gnome-patch-translation (bnc#517629#c17).
+- Added translation-update-upstream-embedded script (src rpm only).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
translation-update-upstream-20091015.tar.bz2
New:
----
translation-update-upstream-20091026.tar.bz2
translation-update-upstream-embedded-README
translation-update-upstream-embedded.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ translation-update-upstream.spec ++++++
--- /var/tmp/diff_new_pack.Otbclu/_old 2009-10-27 17:18:01.000000000 +0100
+++ /var/tmp/diff_new_pack.Otbclu/_new 2009-10-27 17:18:01.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package translation-update-upstream (Version 20091015)
+# spec file for package translation-update-upstream (Version 20091026)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -21,7 +21,7 @@
Name: translation-update-upstream
License: GPL v2 or later
Group: System/Localization
-Version: 20091015
+Version: 20091026
Release: 1
Summary: Tool for Translation Update from Upstream
Source: %{name}-%{version}.tar.bz2
@@ -34,6 +34,8 @@
Source7: msgheadermerge-compose
Source8: msgheadermerge-parse
Source9: msgheadermerge-empty.pot
+Source10: %{name}-embedded-README
+Patch: %{name}-embedded.patch
# Files below are package maintainer tools, not used for package build:
Source50: upstream-collect.sh
Source51: upstream-collect.conf
@@ -74,6 +76,11 @@
cp -a %{S:4} README
cp -a %{S:5} HOWTO
cp -a %{S:6} %{S:7} %{S:8} %{S:9} .
+cp -a %{S:10} translation-update-upstream-embedded.README
+sed 's:@DATADIR@:%{_datadir}:g;s:@LIBEXECDIR@:%{_prefix}/lib:g' translation-update-upstream
+sed 's/@LIBEXECDIR@/\$BASE_DIR/g;s:@DATADIR@/translation-update-upstream:\$BASE_DIR/translation-update-upstream/po:g;s/translation-update-upstream\./translation-update-upstream-embedded./g' translation-update-upstream-embedded.sh
+%patch
+chmod +x translation-update-upstream-embedded.sh
%build
@@ -81,7 +88,6 @@
mkdir -p $RPM_BUILD_ROOT%{_datadir} $RPM_BUILD_ROOT%{_prefix}/lib/translation-update-upstream
cp -a po $RPM_BUILD_ROOT%{_datadir}/%{name}
install -d $RPM_BUILD_ROOT%{_bindir}
-sed 's:@DATADIR@:%{_datadir}:g;s:@LIBEXECDIR@:%{_prefix}/lib:g' translation-update-upstream
install translation-update-upstream $RPM_BUILD_ROOT%{_bindir}/
install -m0755 msgheadermerge msgheadermerge-compose msgheadermerge-parse $RPM_BUILD_ROOT%{_prefix}/lib/translation-update-upstream/
install -m0644 msgheadermerge-empty.pot $RPM_BUILD_ROOT%{_prefix}/lib/translation-update-upstream/
++++++ create-tlst-step2-create-gnome_gtp.sh ++++++
--- /var/tmp/diff_new_pack.Otbclu/_old 2009-10-27 17:18:01.000000000 +0100
+++ /var/tmp/diff_new_pack.Otbclu/_new 2009-10-27 17:18:01.000000000 +0100
@@ -17,7 +17,7 @@
# branches tried for all apps:
KNOWN_BRANCHES="gnome-2-28"
# branches tried apps with the same name base:
-APP_BRANCHES="|gimp-2-6"
+APP_BRANCHES="|gimp-2-6|gtk-2-18|glib-2-22"
# FIXME: support for libgda:release-3-0-branch gnome-background:gnome-2-22
echo "# This file was generated $(LANG=C LC_ALL=C date) by create-tlst-step2-create-gnome_gtp.sh." >upstream-gnome_gtp.tlst
@@ -40,6 +40,14 @@
done
done
# Packages known to have special name in GTP:
+ for LBRANCH in $KNOWN_BRANCHES master ; do
+ echo gconf gconf2 GConf2 $LBRANCH
+ done
+ echo glib glib2 glib20 master
+ echo gtk+ gtk2 gtk20 gtk-2-18
+ echo gtk+ gtk2 gtk20 master
+ echo gtk+ gtk2 gtk20-properties gtk-2-18
+ echo gtk+ gtk2 gtk20-properties master
echo gnome-phone-manager phonemgr gnome-phone-manager master
echo network-manager-applet NetworkManager-gnome nm-applet master
# For other versions than sles10:
@@ -74,9 +82,25 @@
gimp20-tips )
PO_DIR=po-tips
;;
+ gtk20-properties )
+ PO_DIR=po-properties
+ ;;
gnumeric-functions )
PO_DIR=po-functions
;;
+ # FIXME: Only some teams use GTP for gstreamer. Run 'find -name "*-fixes.po"' on processed downstream to find possible regressions.
+ gst-plugins-base-0.10 )
+ PROJECT=gst-plugins-base
+ ;;
+ gst-plugins-good-0.10 )
+ PROJECT=gst-plugins-good
+ ;;
+ gst-plugins-bad-0.10 )
+ PROJECT=gst-plugins-bad
+ ;;
+ gst-plugins-ugly-0.10 )
+ PROJECT=gst-plugins-ugly
+ ;;
* )
PO_DIR=po
;;
++++++ translation-update-upstream-20091015.tar.bz2 -> translation-update-upstream-20091026.tar.bz2 ++++++
++++ 127526 lines of diff (skipped)
++++++ translation-update-upstream-embedded-README ++++++
translation-update-upstream-embedded.sh is a script that can be used
without translation-update-upstream package.
How to use it:
1. Create .tlst and .hook files and rin ./upstream-collect.sh as you do
with translation-update-upstream.
2. Create an archive that contains:
- directory translation-update-upstream with:
- translation-update-upstream-embedded.sh
- msgheadermerge*
- directory po that contains contents of the archive created in step 1.
3. Instead of call of translation-update-upstream in the spec file use
translation-update-upstream/translation-update-upstream-embedded.sh.
Arguments and style of use are the same.
++++++ translation-update-upstream-embedded.patch ++++++
--- translation-update-upstream-embedded.sh
+++ translation-update-upstream-embedded.sh
@@ -34,6 +34,7 @@
fi
}
+BASE_DIR=$PWD
DIR=${1:-po}
DOMAIN=$2
@@ -91,7 +92,7 @@
echo "WARNING: Missing $DOMAIN in translation-update-upstream configuration! No updates available."
fi
else
- echo "ERROR: Package translation-update-upstream is not installed. Please update your BuildRequires!"
+ echo "ERROR: Incorrect use of translation-update-upstream-embedded!"
exit 1
fi
fi
++++++ upstream-collect.sh ++++++
--- /var/tmp/diff_new_pack.Otbclu/_old 2009-10-27 17:18:03.000000000 +0100
+++ /var/tmp/diff_new_pack.Otbclu/_new 2009-10-27 17:18:03.000000000 +0100
@@ -67,6 +67,19 @@
fi
EOF
chmod +x ~/.upstream-collect.tmp/translation-update-upstream
+
+# Strings in installed instance of gnome-patch-translation may interfere
+# with upstream-collect.sh. Use of dummies allows to import upstream
+# strings, that are part of openSUSE patches.
+for FILE in gnome-patch-translation-prepare gnome-patch-translation-update ; do
+ cat >~/.upstream-collect.tmp/$FILE <http://$REPO/${REPODIR%%/*}.${BRANCH:-master}/ | sed -n 's:^.*href="\([^"]*\.po\)".*$:\1:p' |
while read ; do
@@ -299,9 +313,9 @@
fi
# Do the magic:
# step 2: Merge new po and previous updates (if any).
- if test -f $RPMPODIR/${PO%.po}-updates.po ; then
- $WORK_DIR/msgheadermerge $RPMPODIR/${PO%.po}-updates.po $PO ${PO%.po}-uheader.po
- msgcat --force-po --use-first ${PO%.po}-uheader.po ${PO%.po}-backport.po $RPMPODIR/${PO%.po}-updates.po -o ${PO%.po}-join.po
+ if test -f $WORK_DIR/UPDATE/po/$DOMAIN/$PO ; then
+ $WORK_DIR/msgheadermerge $WORK_DIR/UPDATE/po/$DOMAIN/$PO $PO ${PO%.po}-uheader.po
+ msgcat --force-po --use-first ${PO%.po}-uheader.po ${PO%.po}-backport.po $WORK_DIR/UPDATE/po/$DOMAIN/$PO -o ${PO%.po}-join.po
else
cp -a ${PO%.po}-backport.po ${PO%.po}-join.po
fi
@@ -354,7 +368,7 @@
if ! $DEBUG ; then
if test -n "$RPMPKGDIR" ; then
- rm -rf $RPMPKGDIR
+ rm -rf $RPMPKGDIR $WORK_DIR/STAMPS/$PACKAGE/.builddir_ok
fi
fi
++++++ upstream-gnome-generic.tlst ++++++
--- /var/tmp/diff_new_pack.Otbclu/_old 2009-10-27 17:18:03.000000000 +0100
+++ /var/tmp/diff_new_pack.Otbclu/_new 2009-10-27 17:18:03.000000000 +0100
@@ -4,4 +4,4 @@
gstreamer-0_10-plugins-good gst-plugins-good-0.10 cgit git://anongit.freedesktop.org/gstreamer/gst-plugins-good gst-plugins-good/po
gstreamer-0_10-plugins-bad gst-plugins-bad-0.10 cgit git://anongit.freedesktop.org/gstreamer/gst-plugins-bad gst-plugins-bad/po
gstreamer-0_10-plugins-ugly gst-plugins-ugly-0.10 cgit git://anongit.freedesktop.org/gstreamer/gst-plugins-ugly gst-plugins-ugly/po
-pidgin pidgin tbz http://downloads.sourceforge.net/pidgin/pidgin-2.6.2.tar.bz2 pidgin-2.6.2/po
+pidgin pidgin tbz http://downloads.sourceforge.net/pidgin/pidgin-2.6.3.tar.bz2 pidgin-2.6.3/po
++++++ upstream-gnome_gtp.tlst ++++++
--- /var/tmp/diff_new_pack.Otbclu/_old 2009-10-27 17:18:03.000000000 +0100
+++ /var/tmp/diff_new_pack.Otbclu/_new 2009-10-27 17:18:03.000000000 +0100
@@ -1,4 +1,4 @@
-# This file was generated Wed Oct 14 17:02:43 CEST 2009 by create-tlst-step2-create-gnome_gtp.sh.
+# This file was generated Tue Oct 27 15:31:01 CET 2009 by create-tlst-step2-create-gnome_gtp.sh.
# package domain method repository dir branch
NetworkManager NetworkManager gtp l10n.gnome.org/POT NetworkManager/po
NetworkManager-gnome nm-applet gtp l10n.gnome.org/POT network-manager-applet/po
@@ -36,6 +36,7 @@
ekiga ekiga gtp l10n.gnome.org/POT ekiga/po
empathy empathy gtp l10n.gnome.org/POT empathy/po gnome-2-28
empathy empathy gtp l10n.gnome.org/POT empathy/po
+eog eog gtp l10n.gnome.org/POT eog/po gnome-2-28
eog eog gtp l10n.gnome.org/POT eog/po
epiphany epiphany gtp l10n.gnome.org/POT epiphany/po gnome-2-28
epiphany epiphany gtp l10n.gnome.org/POT epiphany/po
@@ -51,6 +52,7 @@
evolution-exchange evolution-exchange-2.28 gtp l10n.gnome.org/POT evolution-exchange/po
evolution-webcal evolution-webcal gtp l10n.gnome.org/POT evolution-webcal/po
f-spot f-spot gtp l10n.gnome.org/POT f-spot/po
+file-roller file-roller gtp l10n.gnome.org/POT file-roller/po gnome-2-28
file-roller file-roller gtp l10n.gnome.org/POT file-roller/po
gDesklets gdesklets gtp l10n.gnome.org/POT gdesklets/po
gbrainy gbrainy gtp l10n.gnome.org/POT gbrainy/po
@@ -58,8 +60,10 @@
gcalctool gcalctool gtp l10n.gnome.org/POT gcalctool/po
gconf-editor gconf-editor gtp l10n.gnome.org/POT gconf-editor/po gnome-2-28
gconf-editor gconf-editor gtp l10n.gnome.org/POT gconf-editor/po
+gconf2 GConf2 gtp l10n.gnome.org/POT gconf/po gnome-2-28
gdl gdl-1 gtp l10n.gnome.org/POT gdl/po gnome-2-28
gdl gdl-1 gtp l10n.gnome.org/POT gdl/po
+gdm gdm gtp l10n.gnome.org/POT gdm/po gnome-2-28
gdm gdm gtp l10n.gnome.org/POT gdm/po
gedit gedit gtp l10n.gnome.org/POT gedit/po gnome-2-28
gedit gedit gtp l10n.gnome.org/POT gedit/po
@@ -77,11 +81,11 @@
gimp gimp20-std-plug-ins gtp l10n.gnome.org/POT gimp/po-plug-ins
gimp gimp20-tips gtp l10n.gnome.org/POT gimp/po-tips gimp-2-6
gimp gimp20-tips gtp l10n.gnome.org/POT gimp/po-tips
-# broken:
-#gimp-gap gimp20-gap gtp l10n.gnome.org/POT gimp-gap/po
+gimp-gap gimp20-gap gtp l10n.gnome.org/POT gimp-gap/po
glabels glabels gtp l10n.gnome.org/POT glabels/po
glade3 glade3 gtp l10n.gnome.org/POT glade3/po gnome-2-28
glade3 glade3 gtp l10n.gnome.org/POT glade3/po
+glib2 glib20 gtp l10n.gnome.org/POT glib/po
gnome-applets gnome-applets-2.0 gtp l10n.gnome.org/POT gnome-applets/po gnome-2-28
gnome-applets gnome-applets-2.0 gtp l10n.gnome.org/POT gnome-applets/po
gnome-backgrounds gnome-backgrounds gtp l10n.gnome.org/POT gnome-backgrounds/po
@@ -89,6 +93,7 @@
gnome-bluetooth gnome-bluetooth2 gtp l10n.gnome.org/POT gnome-bluetooth/po gnome-2-28
gnome-bluetooth gnome-bluetooth2 gtp l10n.gnome.org/POT gnome-bluetooth/po
gnome-commander gnome-commander gtp l10n.gnome.org/POT gnome-commander/po
+gnome-control-center gnome-control-center-2.0 gtp l10n.gnome.org/POT gnome-control-center/po gnome-2-28
gnome-control-center gnome-control-center-2.0 gtp l10n.gnome.org/POT gnome-control-center/po
gnome-desktop gnome-desktop-2.0 gtp l10n.gnome.org/POT gnome-desktop/po
gnome-doc-utils gnome-doc-utils gtp l10n.gnome.org/POT gnome-doc-utils/po gnome-2-28
@@ -96,6 +101,7 @@
gnome-games gnome-games gtp l10n.gnome.org/POT gnome-games/po gnome-2-28
gnome-games gnome-games gtp l10n.gnome.org/POT gnome-games/po
gnome-keyring gnome-keyring gtp l10n.gnome.org/POT gnome-keyring/po
+gnome-mag gnome-mag gtp l10n.gnome.org/POT gnome-mag/po gnome-2-28
gnome-mag gnome-mag gtp l10n.gnome.org/POT gnome-mag/po
gnome-main-menu gnome-main-menu gtp l10n.gnome.org/POT gnome-main-menu/po
gnome-media gnome-media-2.0 gtp l10n.gnome.org/POT gnome-media/po
@@ -119,6 +125,7 @@
gnome-themes gnome-themes gtp l10n.gnome.org/POT gnome-themes/po gnome-2-28
gnome-themes gnome-themes gtp l10n.gnome.org/POT gnome-themes/po
gnome-themes-extras gnome-themes-extras gtp l10n.gnome.org/POT gnome-themes-extras/po
+gnome-user-share gnome-user-share gtp l10n.gnome.org/POT gnome-user-share/po gnome-2-28
gnome-user-share gnome-user-share gtp l10n.gnome.org/POT gnome-user-share/po
gnome-utils gnome-utils-2.0 gtp l10n.gnome.org/POT gnome-utils/po gnome-2-28
gnome-utils gnome-utils-2.0 gtp l10n.gnome.org/POT gnome-utils/po
@@ -131,13 +138,17 @@
gok gok gtp l10n.gnome.org/POT gok/po
goobox goobox gtp l10n.gnome.org/POT goobox/po
gstreamer-0_10 gstreamer-0.10 gtp l10n.gnome.org/POT gstreamer/po
-gstreamer-0_10-plugins-bad gst-plugins-bad-0.10 gtp l10n.gnome.org/POT gstreamer/po
-gstreamer-0_10-plugins-base gst-plugins-base-0.10 gtp l10n.gnome.org/POT gstreamer/po
-gstreamer-0_10-plugins-good gst-plugins-good-0.10 gtp l10n.gnome.org/POT gstreamer/po
-gstreamer-0_10-plugins-ugly gst-plugins-ugly-0.10 gtp l10n.gnome.org/POT gstreamer/po
+gstreamer-0_10-plugins-bad gst-plugins-bad-0.10 gtp l10n.gnome.org/POT gst-plugins-bad/po
+gstreamer-0_10-plugins-base gst-plugins-base-0.10 gtp l10n.gnome.org/POT gst-plugins-base/po
+gstreamer-0_10-plugins-good gst-plugins-good-0.10 gtp l10n.gnome.org/POT gst-plugins-good/po
+gstreamer-0_10-plugins-ugly gst-plugins-ugly-0.10 gtp l10n.gnome.org/POT gst-plugins-ugly/po
# broken:
#gtetrinet gtetrinet gtp l10n.gnome.org/POT gtetrinet/po
gthumb gthumb gtp l10n.gnome.org/POT gthumb/po
+gtk2 gtk20 gtp l10n.gnome.org/POT gtk+/po gtk-2-18
+gtk2 gtk20 gtp l10n.gnome.org/POT gtk+/po
+gtk2 gtk20-properties gtp l10n.gnome.org/POT gtk+/po-properties gtk-2-18
+gtk2 gtk20-properties gtp l10n.gnome.org/POT gtk+/po-properties
gtksourceview gtksourceview-2.0 gtp l10n.gnome.org/POT gtksourceview/po gnome-2-28
gtksourceview gtksourceview-2.0 gtp l10n.gnome.org/POT gtksourceview/po
gucharmap gucharmap gtp l10n.gnome.org/POT gucharmap/po gnome-2-28
@@ -168,6 +179,7 @@
libwnck libwnck gtp l10n.gnome.org/POT libwnck/po
memprof memprof gtp l10n.gnome.org/POT memprof/po
mergeant mergeant gtp l10n.gnome.org/POT mergeant/po
+metacity metacity gtp l10n.gnome.org/POT metacity/po gnome-2-28
metacity metacity gtp l10n.gnome.org/POT metacity/po
mousetweaks mousetweaks gtp l10n.gnome.org/POT mousetweaks/po gnome-2-28
mousetweaks mousetweaks gtp l10n.gnome.org/POT mousetweaks/po
@@ -187,6 +199,7 @@
planner planner gtp l10n.gnome.org/POT planner/po
pybliographer pybliographer gtp l10n.gnome.org/POT pybliographer/po
rhythmbox rhythmbox gtp l10n.gnome.org/POT rhythmbox/po
+sabayon sabayon gtp l10n.gnome.org/POT sabayon/po gnome-2-28
sabayon sabayon gtp l10n.gnome.org/POT sabayon/po
seahorse seahorse gtp l10n.gnome.org/POT seahorse/po
seahorse-plugins seahorse-plugins gtp l10n.gnome.org/POT seahorse-plugins/po
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org