[Goodies-commits] r5891 - xfce4-sensors-plugin/trunk/src

[Fabian Nowak]

Author: timystery
Date: 2008-11-01 16:19:13 +0000 (Sat, 01 Nov 2008)
New Revision: 5891

Removed:
   xfce4-sensors-plugin/trunk/src/xfce4-sensors.desktop.in.in
Modified:
   xfce4-sensors-plugin/trunk/src/Makefile.am
   xfce4-sensors-plugin/trunk/src/xfce4-sensors.desktop.in
Log:
changes to desktop files for application and to makefile to not use desktop.in-trickery


Modified: xfce4-sensors-plugin/trunk/src/Makefile.am
===================================================================
--- xfce4-sensors-plugin/trunk/src/Makefile.am	2008-11-01 14:41:17 UTC (rev 5890)
+++ xfce4-sensors-plugin/trunk/src/Makefile.am	2008-11-01 16:19:13 UTC (rev 5891)
@@ -49,21 +49,20 @@
 	$(top_builddir)/lib/libxfce4sensors.la
 
 # .desktop file
-#
-# Some automake trickery here. Because we cannot use $(libexecdir) in the
-# automake stage, we'll use sed to get the full path into the .desktop file.
-# We also need to let intltool merge the translated fields, so we add an
-# additional level of indirection: a <name>.desktop.in.in file.
-#
-desktop_in_in_files = xfce4-sensors.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
+desktop_in_files = xfce4-sensors.desktop.in
+#desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
 
 desktopdir = $(datadir)/applications
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 EXTRA_DIST =														 \
-	$(desktop_in_in_files)
+	$(desktop_in_files)
 
 DISTCLEANFILES =													 \
-	$(desktop_DATA) $(desktop_in_files)
+	$(desktop_DATA)
+
+# get full path into .desktop file
+#%.desktop.in: %.desktop.in.in
+#	sed -e "s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" \
+#		$< > $@

Modified: xfce4-sensors-plugin/trunk/src/xfce4-sensors.desktop.in
===================================================================
--- xfce4-sensors-plugin/trunk/src/xfce4-sensors.desktop.in	2008-11-01 14:41:17 UTC (rev 5890)
+++ xfce4-sensors-plugin/trunk/src/xfce4-sensors.desktop.in	2008-11-01 16:19:13 UTC (rev 5891)
@@ -1,9 +1,12 @@
 [Desktop Entry]
 Encoding=UTF-8
-_Name=Xfce 4 Sensors
-_Comment=Graphical Sensors Viewer for Xfce 4
+Version=1.0
+_Name=Sensor Viewer
+_Comment=Show sensor values.
+_GenericName=Sensors Values Viewer
+Icon=xfce-sensors
 Exec=xfce4-sensors
-Icon=xfce4-sensors
 Terminal=false
 Type=Application
-_GenericName=Sensors Viewer
+Categories=X-XFCE;System;Utility;
+

Deleted: xfce4-sensors-plugin/trunk/src/xfce4-sensors.desktop.in.in