Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package update-desktop-files for
openSUSE:Factory checked in at 2026-03-03 15:30:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/update-desktop-files (Old)
and /work/SRC/openSUSE:Factory/.update-desktop-files.new.29461 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "update-desktop-files"
Tue Mar 3 15:30:12 2026 rev:107 rq:1335769 version:84.87
Changes:
--------
---
/work/SRC/openSUSE:Factory/update-desktop-files/update-desktop-files.changes
2026-02-02 14:55:40.807750286 +0100
+++
/work/SRC/openSUSE:Factory/.update-desktop-files.new.29461/update-desktop-files.changes
2026-03-03 15:30:21.363621393 +0100
@@ -1,0 +2,7 @@
+Mon Mar 2 09:15:56 UTC 2026 - Stanislav Brabec <[email protected]>
+
+- Add support for upstreaming of desktop files translated by
+ msgfmt.
+- Do not update the installed desktop file by the upstreaming code.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suse_update_desktop_file.sh ++++++
--- /var/tmp/diff_new_pack.l0PWO3/_old 2026-03-03 15:30:22.443665933 +0100
+++ /var/tmp/diff_new_pack.l0PWO3/_new 2026-03-03 15:30:22.451666263 +0100
@@ -378,16 +378,16 @@
TRANSLATION_CHANGES=false
DEADPACKAGE_SUCCESS=false
shopt -s nullglob
-cp -v "$FILE"
$SUDF_DIR/suse_update_desktop_file/update-desktop-files/$DESKTOP_NAME/$DESKTOP_NAME-downstream-no-translation.desktop
+sed '/^\(Name\|GenericName\|Comment\|Keywords\)\[/d' "$FILE"
>$SUDF_DIR/suse_update_desktop_file/update-desktop-files/$DESKTOP_NAME/$DESKTOP_NAME-downstream-no-translation.desktop
# Insert translations from the downstream
ORIG_DIR=$PWD
cd $SUDF_DIR/suse_update_desktop_file/update-desktop-files/$DESKTOP_NAME
+sed '/^\(Name\|GenericName\|Comment\|Keywords\)\[/d'
$DESKTOP_NAME-upstream.desktop >$DESKTOP_NAME-upstream-no-translation.desktop
if [ "$I18N" != "no" ]; then
sed "s@^Name=@_&Name($DESKTOP_NAME.desktop):
@;s@^GenericName=@_&GenericName($DESKTOP_NAME.desktop):
@;s@^Comment=@_&Comment($DESKTOP_NAME.desktop):
@;s@^Keywords=@_&Keywords($DESKTOP_NAME.desktop): @" $FILE
>$DESKTOP_NAME-downstream-no-translation-desktop_translations.desktop
intltool-merge /usr/share/desktop-translations/desktop_translations
$DESKTOP_NAME-downstream-no-translation-desktop_translations.desktop
$DESKTOP_NAME-downstream-translated-raw.desktop -d -u
sed -i "s@^Name=Name($DESKTOP_NAME.desktop):
@Name=@;s@^GenericName=GenericName($DESKTOP_NAME.desktop):
@GenericName=@;s@^Comment=Comment($DESKTOP_NAME.desktop):
@Comment=@;s@^Keywords=Keywords($DESKTOP_NAME.desktop): @Keywords=@"
$DESKTOP_NAME-downstream-translated-raw.desktop
${0%.sh}_process_translations.py $DESKTOP_NAME
- cp -a -v $DESKTOP_NAME-downstream-translated.desktop $FILE
if ! diff -u $DESKTOP_NAME-upstream.desktop
$DESKTOP_NAME-downstream-translated.desktop
>$DESKTOP_NAME-downstream-directly-translated.diff ; then
TRANSLATION_CHANGES=true
fi
@@ -398,7 +398,11 @@
if ! diff -u $DESKTOP_NAME-upstream.desktop.in
$DESKTOP_NAME-downstream-no-translation.desktop.in
>$DESKTOP_NAME-downstream-in-translated.diff ; then
GENERIC_CHANGES=true
fi
+ if ! diff -u $DESKTOP_NAME-upstream-no-translation.desktop
$DESKTOP_NAME-downstream-no-translation.desktop
>$DESKTOP_NAME-downstream-msgfmt-translated.diff ; then
+ GENERIC_CHANGES=true
+ fi
sed -i
"1,2s/$DESKTOP_NAME-\(upstream\|downstream-no-translation\).desktop.in/$DESKTOP_NAME.desktop.in/"
$DESKTOP_NAME-downstream-in-translated.diff
+ sed -i
"1,2s/$DESKTOP_NAME-\(upstream\|downstream\)-no-translation.desktop/$DESKTOP_NAME.desktop/"
$DESKTOP_NAME-downstream-msgfmt-translated.diff
mkdir po
intltool-extract --type=gettext/ini
$DESKTOP_NAME-downstream-no-translation-desktop_translations.desktop
xgettext --default-domain=$DESKTOP_NAME --add-comments --keyword=_
--keyword=N_ --keyword=U_
$DESKTOP_NAME-downstream-no-translation-desktop_translations.desktop.h -o
po/$DESKTOP_NAME.pot
