Hello community,
here is the log from the commit of package update-desktop-files for
openSUSE:Factory checked in at 2014-12-03 22:52:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/update-desktop-files (Old)
and /work/SRC/openSUSE:Factory/.update-desktop-files.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "update-desktop-files"
Changes:
--------
---
/work/SRC/openSUSE:Factory/update-desktop-files/update-desktop-files.changes
2014-11-24 11:14:38.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.update-desktop-files.new/update-desktop-files.changes
2014-12-03 22:52:26.000000000 +0100
@@ -1,0 +2,6 @@
+Sat Nov 22 16:46:15 UTC 2014 - [email protected]
+
+- Fix bad variable access for --genericname
+- replace ^M pattern with \r in sed pattern
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suse_update_desktop_file.sh ++++++
--- /var/tmp/diff_new_pack.SCNEEo/_old 2014-12-03 22:52:27.000000000 +0100
+++ /var/tmp/diff_new_pack.SCNEEo/_new 2014-12-03 22:52:27.000000000 +0100
@@ -217,7 +217,7 @@
sed -e 's/\[KDE Desktop Entry\]/[Desktop Entry]/' "$i" > "${i}_" && mv
"${i}_" "$i"
# dos2unix for the poor
- sed -e 's/
//' "$i" > "${i}_" && mv "${i}_" "$i"
+ sed -e 's/\r//' "$i" > "${i}_" && mv "${i}_" "$i"
if [ "$FILE" ]; then
echo "ERROR: suse_update_desktop_file: $APPLICATION has multiple desktop
files" >&2
@@ -361,7 +361,7 @@
if [ "$GNAME" != "no" ]; then
sed -i -e '/^GenericName\[/d' $FILE
if [ -n "$GNAME" ]; then
- if ! grep -q ^GenericName= ${FILE}_; then
+ if ! grep -q ^GenericName= ${FILE}; then
sed -i -e '/^\[Desktop Entry\]/a '"GenericName=${GNAME//,/\,}" ${FILE}
else
sed -i -e '/^\[Desktop Entry\]/,/(\[.*|$)/
s,^GenericName=.*,GenericName='"${GNAME//,/\,}"',' ${FILE}
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
