Accepting request 85482 from home:vuntz:branches:X11:common:Factory

Use NoDisplay=true instead of X-SuSE-Unimportant=true

OBS-URL: https://build.opensuse.org/request/show/85482
OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/update-desktop-files?expand=0&rev=27
This commit is contained in:
Vincent Untz 2011-09-29 21:41:55 +00:00 committed by Git OBS Bridge
parent b3a7e39d66
commit a733f33e7b
2 changed files with 15 additions and 3 deletions

View File

@ -45,7 +45,7 @@ function usage() {
echo " Example: use \"%suse_update_desktop_file \\"
echo " %{buildroot}%{_datadir}/susehelp/meta/%name/%name.desktop\""
echo " to edit the susehelp desktop entry file instead."
echo " -u|--unimportant : add \"X-SuSE-Unimportant=true\" to the resulting desktop"
echo " -u|--unimportant : add \"NoDisplay=true\" to the resulting desktop"
echo " file."
echo " -n|--no-i18n : Do not prepare the desktop file for translators (obsoletes -t)."
echo " (adds X-SuSE-translate=false to the desktop file)"
@ -314,8 +314,13 @@ else
fi
fi
if [ "$UNIMPORTANT" = "yes" ]; then
sed -e '/^\[Desktop Entry\]/a \
X-SuSE-Unimportant=true' $FILE > ${FILE}_ && mv ${FILE}_ $FILE
if grep -q ^NoDisplay= $FILE; then
sed -e '/^\[Desktop Entry\]/,/(\[.*|$)/ s,^NoDisplay=.*,NoDisplay=true,' "$FILE" > "${FILE}.new" &&
mv "${FILE}.new" "${FILE}"
else
sed -e '/^\[Desktop Entry\]/a \
NoDisplay=true' $FILE > ${FILE}_ && mv ${FILE}_ $FILE
fi
fi
if [ "$DOCID" ]; then
sed -e '/^\[Desktop Entry\]/a \

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Sep 29 14:58:16 UTC 2011 - vuntz@opensuse.org
- Update suse_update_desktop_file.sh: when -u is used, do not add
the non-standard X-SuSE-Unimportant=true anymore, but
NoDisplay=true.
-------------------------------------------------------------------
Mon Jun 6 14:13:56 UTC 2011 - coolo@novell.com