[Xfce4-commits] <xfce4-panel:devel> Update desktop files.
Nick Schermer
nick at xfce.org
Tue Aug 11 20:36:01 CEST 2009
Updating branch refs/heads/devel
to b9af75e0c37753876455bfc88ddcb903786f9148 (commit)
from 8c7ed2a793e3c61717908c8a0094480126e643b2 (commit)
commit b9af75e0c37753876455bfc88ddcb903786f9148
Author: Nick Schermer <nick at xfce.org>
Date: Tue Aug 4 21:01:30 2009 +0200
Update desktop files.
There is no path in the desktop files anymore, so
drop the X-XFCE-Module-Path entry and rename the
files to *.in, because we do not have to edit it
during building.
plugins/actions/Makefile.am | 10 +++-------
.../{actions.desktop.in.in => actions.desktop.in} | 1 -
plugins/clock/Makefile.am | 10 +++-------
.../{clock.desktop.in.in => clock.desktop.in} | 1 -
plugins/launcher/Makefile.am | 10 +++-------
...{launcher.desktop.in.in => launcher.desktop.in} | 1 -
plugins/pager/Makefile.am | 10 +++-------
.../{pager.desktop.in.in => pager.desktop.in} | 1 -
plugins/separator/Makefile.am | 10 +++-------
...eparator.desktop.in.in => separator.desktop.in} | 1 -
plugins/showdesktop/Makefile.am | 10 +++-------
...esktop.desktop.in.in => showdesktop.desktop.in} | 1 -
plugins/systray/Makefile.am | 10 +++-------
.../{systray.desktop.in.in => systray.desktop.in} | 1 -
plugins/tasklist/Makefile.am | 10 +++-------
...{tasklist.desktop.in.in => tasklist.desktop.in} | 1 -
plugins/windowmenu/Makefile.am | 10 +++-------
...dowmenu.desktop.in.in => windowmenu.desktop.in} | 1 -
18 files changed, 27 insertions(+), 72 deletions(-)
diff --git a/plugins/actions/Makefile.am b/plugins/actions/Makefile.am
index 734f123..f5bcfdf 100644
--- a/plugins/actions/Makefile.am
+++ b/plugins/actions/Makefile.am
@@ -50,20 +50,16 @@ libactions_la_DEPENDENCIES = \
# .desktop file
#
desktopdir = $(datadir)/xfce4/panel-plugins
-desktop_in_in_files = actions.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-actions.desktop.in: $(desktop_in_in_files)
- sed -e "s,\@plugindir\@,$(plugindir),g" < $< > $@
+desktop_in_files = actions.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
EXTRA_DIST = \
actions-dialog.glade \
- $(desktop_in_in_files)
+ $(desktop_in_files)
DISTCLEANFILES = \
- $(desktop_DATA) \
- $(desktop_in_files)
+ $(desktop_DATA)
if MAINTAINER_MODE
BUILT_SOURCES = \
diff --git a/plugins/actions/actions.desktop.in.in b/plugins/actions/actions.desktop.in
similarity index 85%
rename from plugins/actions/actions.desktop.in.in
rename to plugins/actions/actions.desktop.in
index 14d3c30..84aea1d 100644
--- a/plugins/actions/actions.desktop.in.in
+++ b/plugins/actions/actions.desktop.in
@@ -5,5 +5,4 @@ _Name=Action Buttons
_Comment=Log out, lock or other system actions
Icon=system-log-out
X-XFCE-Module=actions
-X-XFCE-Module-Path=@plugindir@
X-XFCE-Internal=TRUE
diff --git a/plugins/clock/Makefile.am b/plugins/clock/Makefile.am
index b288fd3..2871da5 100644
--- a/plugins/clock/Makefile.am
+++ b/plugins/clock/Makefile.am
@@ -60,20 +60,16 @@ libclock_la_DEPENDENCIES = \
# .desktop file
#
desktopdir = $(datadir)/xfce4/panel-plugins
-desktop_in_in_files = clock.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-clock.desktop.in: $(desktop_in_in_files)
- sed -e "s,\@plugindir\@,$(plugindir),g" < $< > $@
+desktop_in_files = clock.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
EXTRA_DIST = \
clock-dialog.glade \
- $(desktop_in_in_files)
+ $(desktop_in_files)
DISTCLEANFILES = \
- $(desktop_DATA) \
- $(desktop_in_files)
+ $(desktop_DATA)
if MAINTAINER_MODE
BUILT_SOURCES = \
diff --git a/plugins/clock/clock.desktop.in.in b/plugins/clock/clock.desktop.in
similarity index 83%
rename from plugins/clock/clock.desktop.in.in
rename to plugins/clock/clock.desktop.in
index 3bd2d42..e849dd7 100644
--- a/plugins/clock/clock.desktop.in.in
+++ b/plugins/clock/clock.desktop.in
@@ -5,5 +5,4 @@ _Name=Clock
_Comment=What time is it?
Icon=office-calendar
X-XFCE-Module=clock
-X-XFCE-Module-Path=@plugindir@
X-XFCE-Internal=TRUE
diff --git a/plugins/launcher/Makefile.am b/plugins/launcher/Makefile.am
index 501ebd2..ec1c8f3 100644
--- a/plugins/launcher/Makefile.am
+++ b/plugins/launcher/Makefile.am
@@ -60,10 +60,7 @@ liblauncher_la_DEPENDENCIES = \
# .desktop file
#
desktopdir = $(datadir)/xfce4/panel-plugins
-desktop_in_in_files = launcher.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-launcher.desktop.in: $(desktop_in_in_files)
- sed -e "s,\@plugindir\@,$(plugindir),g" < $< > $@
+desktop_in_files = launcher.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
@@ -76,11 +73,10 @@ menu_DATA = launcher.menu
EXTRA_DIST = \
launcher-dialog.glade \
$(menu_DATA) \
- $(desktop_in_in_files)
+ $(desktop_in_files)
DISTCLEANFILES = \
- $(desktop_DATA) \
- $(desktop_in_files)
+ $(desktop_DATA)
if MAINTAINER_MODE
BUILT_SOURCES = \
diff --git a/plugins/launcher/launcher.desktop.in.in b/plugins/launcher/launcher.desktop.in
similarity index 85%
rename from plugins/launcher/launcher.desktop.in.in
rename to plugins/launcher/launcher.desktop.in
index 12af281..c59fd07 100644
--- a/plugins/launcher/launcher.desktop.in.in
+++ b/plugins/launcher/launcher.desktop.in
@@ -5,5 +5,4 @@ _Name=Launcher
_Comment=Program launcher with optional menu
Icon=application-x-executable
X-XFCE-Module=launcher
-X-XFCE-Module-Path=@plugindir@
X-XFCE-Internal=TRUE
diff --git a/plugins/pager/Makefile.am b/plugins/pager/Makefile.am
index f5a6c0c..f48409a 100644
--- a/plugins/pager/Makefile.am
+++ b/plugins/pager/Makefile.am
@@ -53,20 +53,16 @@ libpager_la_DEPENDENCIES = \
# .desktop file
#
desktopdir = $(datadir)/xfce4/panel-plugins
-desktop_in_in_files = pager.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-pager.desktop.in: $(desktop_in_in_files)
- sed -e "s,\@plugindir\@,$(plugindir),g" < $< > $@
+desktop_in_files = pager.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
EXTRA_DIST = \
pager-dialog.glade \
- $(desktop_in_in_files)
+ $(desktop_in_files)
DISTCLEANFILES = \
- $(desktop_DATA) \
- $(desktop_in_files)
+ $(desktop_DATA)
if MAINTAINER_MODE
BUILT_SOURCES = \
diff --git a/plugins/pager/pager.desktop.in.in b/plugins/pager/pager.desktop.in
similarity index 84%
rename from plugins/pager/pager.desktop.in.in
rename to plugins/pager/pager.desktop.in
index 8527e55..7c7ec56 100644
--- a/plugins/pager/pager.desktop.in.in
+++ b/plugins/pager/pager.desktop.in
@@ -5,5 +5,4 @@ _Name=Pager
_Comment=Miniature view of all virtual desktops
Icon=xfce4-workspaces
X-XFCE-Module=pager
-X-XFCE-Module-Path=@plugindir@
X-XFCE-Internal=TRUE
diff --git a/plugins/separator/Makefile.am b/plugins/separator/Makefile.am
index 855606a..c6306eb 100644
--- a/plugins/separator/Makefile.am
+++ b/plugins/separator/Makefile.am
@@ -52,20 +52,16 @@ libseparator_la_DEPENDENCIES = \
# .desktop file
#
desktopdir = $(datadir)/xfce4/panel-plugins
-desktop_in_in_files = separator.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-separator.desktop.in: $(desktop_in_in_files)
- sed -e "s,\@plugindir\@,$(plugindir),g" < $< > $@
+desktop_in_files = separator.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
EXTRA_DIST = \
separator-dialog.glade \
- $(desktop_in_in_files)
+ $(desktop_in_files)
DISTCLEANFILES = \
- $(desktop_DATA) \
- $(desktop_in_files)
+ $(desktop_DATA)
if MAINTAINER_MODE
BUILT_SOURCES = \
diff --git a/plugins/separator/separator.desktop.in.in b/plugins/separator/separator.desktop.in
similarity index 85%
rename from plugins/separator/separator.desktop.in.in
rename to plugins/separator/separator.desktop.in
index 8938237..bcb174d 100644
--- a/plugins/separator/separator.desktop.in.in
+++ b/plugins/separator/separator.desktop.in
@@ -5,5 +5,4 @@ _Name=Separator
_Comment=Adds a separator or space between panel items
Icon=gtk-remove
X-XFCE-Module=separator
-X-XFCE-Module-Path=@plugindir@
X-XFCE-Internal=TRUE
diff --git a/plugins/showdesktop/Makefile.am b/plugins/showdesktop/Makefile.am
index f08d3ef..ff027fc 100644
--- a/plugins/showdesktop/Makefile.am
+++ b/plugins/showdesktop/Makefile.am
@@ -42,18 +42,14 @@ libshowdesktop_la_DEPENDENCIES = \
# .desktop file
#
desktopdir = $(datadir)/xfce4/panel-plugins
-desktop_in_in_files = showdesktop.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-showdesktop.desktop.in: $(desktop_in_in_files)
- sed -e "s,\@plugindir\@,$(plugindir),g" < $< > $@
+desktop_in_files = showdesktop.desktop.in
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)
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/plugins/showdesktop/showdesktop.desktop.in.in b/plugins/showdesktop/showdesktop.desktop.in
similarity index 86%
rename from plugins/showdesktop/showdesktop.desktop.in.in
rename to plugins/showdesktop/showdesktop.desktop.in
index ae178c1..60d938d 100644
--- a/plugins/showdesktop/showdesktop.desktop.in.in
+++ b/plugins/showdesktop/showdesktop.desktop.in
@@ -5,5 +5,4 @@ _Name=Show Desktop
_Comment=Toggle button that hides all windows and shows the desktop
Icon=user-desktop
X-XFCE-Module=showdesktop
-X-XFCE-Module-Path=@plugindir@
X-XFCE-Internal=TRUE
diff --git a/plugins/systray/Makefile.am b/plugins/systray/Makefile.am
index ef23eda..7309984 100644
--- a/plugins/systray/Makefile.am
+++ b/plugins/systray/Makefile.am
@@ -60,21 +60,17 @@ libsystray_la_DEPENDENCIES = \
# .desktop file
#
desktopdir = $(datadir)/xfce4/panel-plugins
-desktop_in_in_files = systray.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-systray.desktop.in: $(desktop_in_in_files)
- sed -e "s,\@plugindir\@,$(plugindir),g" < $< > $@
+desktop_in_files = systray.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
EXTRA_DIST = \
- $(desktop_in_in_files) \
+ $(desktop_in_files) \
systray-dialog.glade \
systray-marshal.list
DISTCLEANFILES = \
- $(desktop_DATA) \
- $(desktop_in_files)
+ $(desktop_DATA)
#
# Rules to auto-generate built sources
diff --git a/plugins/systray/systray.desktop.in.in b/plugins/systray/systray.desktop.in
similarity index 86%
rename from plugins/systray/systray.desktop.in.in
rename to plugins/systray/systray.desktop.in
index 673e6c0..2be7df2 100644
--- a/plugins/systray/systray.desktop.in.in
+++ b/plugins/systray/systray.desktop.in
@@ -5,5 +5,4 @@ _Name=Notification Area
_Comment=Area where notification icons appear
Icon=applications-system
X-XFCE-Module=systray
-X-XFCE-Module-Path=@plugindir@
X-XFCE-Internal=FALSE
diff --git a/plugins/tasklist/Makefile.am b/plugins/tasklist/Makefile.am
index 7786d3c..e081d38 100644
--- a/plugins/tasklist/Makefile.am
+++ b/plugins/tasklist/Makefile.am
@@ -54,20 +54,16 @@ libtasklist_la_DEPENDENCIES = \
# .desktop file
#
desktopdir = $(datadir)/xfce4/panel-plugins
-desktop_in_in_files = tasklist.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-tasklist.desktop.in: $(desktop_in_in_files)
- sed -e "s,\@plugindir\@,$(plugindir),g" < $< > $@
+desktop_in_files = tasklist.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
EXTRA_DIST = \
tasklist-dialog.glade \
- $(desktop_in_in_files)
+ $(desktop_in_files)
DISTCLEANFILES = \
- $(desktop_DATA) \
- $(desktop_in_files)
+ $(desktop_DATA)
if MAINTAINER_MODE
BUILT_SOURCES = \
diff --git a/plugins/tasklist/tasklist.desktop.in.in b/plugins/tasklist/tasklist.desktop.in
similarity index 85%
rename from plugins/tasklist/tasklist.desktop.in.in
rename to plugins/tasklist/tasklist.desktop.in
index f2ce64c..67a111f 100644
--- a/plugins/tasklist/tasklist.desktop.in.in
+++ b/plugins/tasklist/tasklist.desktop.in
@@ -5,5 +5,4 @@ _Name=Task List
_Comment=Show all running applications
Icon=preferences-system-windows
X-XFCE-Module=tasklist
-X-XFCE-Module-Path=@plugindir@
X-XFCE-Internal=TRUE
diff --git a/plugins/windowmenu/Makefile.am b/plugins/windowmenu/Makefile.am
index b2de203..792c81a 100644
--- a/plugins/windowmenu/Makefile.am
+++ b/plugins/windowmenu/Makefile.am
@@ -53,20 +53,16 @@ libwindowmenu_la_DEPENDENCIES = \
# .desktop file
#
desktopdir = $(datadir)/xfce4/panel-plugins
-desktop_in_in_files = windowmenu.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-windowmenu.desktop.in: $(desktop_in_in_files)
- sed -e "s,\@plugindir\@,$(plugindir),g" < $< > $@
+desktop_in_files = windowmenu.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
EXTRA_DIST = \
windowmenu-dialog.glade \
- $(desktop_in_in_files)
+ $(desktop_in_files)
DISTCLEANFILES = \
- $(desktop_DATA) \
- $(desktop_in_files)
+ $(desktop_DATA)
if MAINTAINER_MODE
BUILT_SOURCES = \
diff --git a/plugins/windowmenu/windowmenu.desktop.in.in b/plugins/windowmenu/windowmenu.desktop.in
similarity index 86%
rename from plugins/windowmenu/windowmenu.desktop.in.in
rename to plugins/windowmenu/windowmenu.desktop.in
index b28563b..8c0f9b4 100644
--- a/plugins/windowmenu/windowmenu.desktop.in.in
+++ b/plugins/windowmenu/windowmenu.desktop.in
@@ -5,5 +5,4 @@ _Name=Window Menu
_Comment=Switch between open windows using a menu
Icon=preferences-system-windows
X-XFCE-Module=windowmenu
-X-XFCE-Module-Path=@plugindir@
X-XFCE-Internal=TRUE
More information about the Xfce4-commits
mailing list