Updating branch refs/heads/master
to d2b0cf068cd01762ec812b04fd839b83e6008889 (commit)
from d304b5357f44c33f218c5bfe4bf61d0932d9f385 (commit)
commit d2b0cf068cd01762ec812b04fd839b83e6008889
Author: Nick Schermer <nick at xfce.org>
Date: Sun Dec 19 20:27:06 2010 +0100
Install desktop files in xfce4/plugins/actions (bug #7013).
plugins/actions/Makefile.am | 2 +-
plugins/applicationsmenu/Makefile.am | 2 +-
plugins/clock/Makefile.am | 2 +-
plugins/directorymenu/Makefile.am | 2 +-
plugins/launcher/Makefile.am | 2 +-
plugins/pager/Makefile.am | 2 +-
plugins/separator/Makefile.am | 2 +-
plugins/showdesktop/Makefile.am | 2 +-
plugins/systray/Makefile.am | 2 +-
plugins/tasklist/Makefile.am | 2 +-
plugins/windowmenu/Makefile.am | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/plugins/actions/Makefile.am b/plugins/actions/Makefile.am
index 4b1e18f..1bd65c4 100644
--- a/plugins/actions/Makefile.am
+++ b/plugins/actions/Makefile.am
@@ -48,7 +48,7 @@ libactions_la_DEPENDENCIES = \
#
# .desktop file
#
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(datadir)/xfce4/panel/plugins
desktop_in_files = actions.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
diff --git a/plugins/applicationsmenu/Makefile.am b/plugins/applicationsmenu/Makefile.am
index 0c031e8..59462fe 100644
--- a/plugins/applicationsmenu/Makefile.am
+++ b/plugins/applicationsmenu/Makefile.am
@@ -60,7 +60,7 @@ xfce4-popup-applicationsmenu: xfce4-popup-applicationsmenu.sh Makefile
#
# .desktop file
#
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(datadir)/xfce4/panel/plugins
desktop_in_files = applicationsmenu.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
diff --git a/plugins/clock/Makefile.am b/plugins/clock/Makefile.am
index 69df3d6..923fb33 100644
--- a/plugins/clock/Makefile.am
+++ b/plugins/clock/Makefile.am
@@ -61,7 +61,7 @@ libclock_la_DEPENDENCIES = \
#
# .desktop file
#
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(datadir)/xfce4/panel/plugins
desktop_in_files = clock.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
diff --git a/plugins/directorymenu/Makefile.am b/plugins/directorymenu/Makefile.am
index e69b905..8847f28 100644
--- a/plugins/directorymenu/Makefile.am
+++ b/plugins/directorymenu/Makefile.am
@@ -62,7 +62,7 @@ xfce4-popup-directorymenu: xfce4-popup-directorymenu.sh Makefile
#
# .desktop file
#
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(datadir)/xfce4/panel/plugins
desktop_in_files = directorymenu.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
diff --git a/plugins/launcher/Makefile.am b/plugins/launcher/Makefile.am
index f7e7365..e7029db 100644
--- a/plugins/launcher/Makefile.am
+++ b/plugins/launcher/Makefile.am
@@ -57,7 +57,7 @@ liblauncher_la_DEPENDENCIES = \
#
# .desktop file
#
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(datadir)/xfce4/panel/plugins
desktop_in_files = launcher.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
diff --git a/plugins/pager/Makefile.am b/plugins/pager/Makefile.am
index 5872349..ceb1ea7 100644
--- a/plugins/pager/Makefile.am
+++ b/plugins/pager/Makefile.am
@@ -53,7 +53,7 @@ libpager_la_DEPENDENCIES = \
#
# .desktop file
#
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(datadir)/xfce4/panel/plugins
desktop_in_files = pager.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
diff --git a/plugins/separator/Makefile.am b/plugins/separator/Makefile.am
index 9bbdf6a..1312aab 100644
--- a/plugins/separator/Makefile.am
+++ b/plugins/separator/Makefile.am
@@ -50,7 +50,7 @@ libseparator_la_DEPENDENCIES = \
#
# .desktop file
#
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(datadir)/xfce4/panel/plugins
desktop_in_files = separator.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
diff --git a/plugins/showdesktop/Makefile.am b/plugins/showdesktop/Makefile.am
index 4d035ec..c166d47 100644
--- a/plugins/showdesktop/Makefile.am
+++ b/plugins/showdesktop/Makefile.am
@@ -39,7 +39,7 @@ libshowdesktop_la_DEPENDENCIES = \
#
# .desktop file
#
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(datadir)/xfce4/panel/plugins
desktop_in_files = showdesktop.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
diff --git a/plugins/systray/Makefile.am b/plugins/systray/Makefile.am
index 10532fd..01db738 100644
--- a/plugins/systray/Makefile.am
+++ b/plugins/systray/Makefile.am
@@ -58,7 +58,7 @@ libsystray_la_DEPENDENCIES = \
#
# .desktop file
#
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(datadir)/xfce4/panel/plugins
desktop_in_files = systray.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
diff --git a/plugins/tasklist/Makefile.am b/plugins/tasklist/Makefile.am
index a6c0977..4d9c593 100644
--- a/plugins/tasklist/Makefile.am
+++ b/plugins/tasklist/Makefile.am
@@ -54,7 +54,7 @@ libtasklist_la_DEPENDENCIES = \
#
# .desktop file
#
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(datadir)/xfce4/panel/plugins
desktop_in_files = tasklist.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
diff --git a/plugins/windowmenu/Makefile.am b/plugins/windowmenu/Makefile.am
index 36695e2..56d68cc 100644
--- a/plugins/windowmenu/Makefile.am
+++ b/plugins/windowmenu/Makefile.am
@@ -61,7 +61,7 @@ xfce4-popup-windowmenu: xfce4-popup-windowmenu.sh Makefile
#
# .desktop file
#
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(datadir)/xfce4/panel/plugins
desktop_in_files = windowmenu.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@