[Xfce4-commits] <xfce4-power-manager:master> Install the brightness plugin in libdir instead of libexecdir

[Ali Abdallah]

Updating branch refs/heads/master
         to 645c365233870d8181949484725fd7cd1b811f6a (commit)
       from 350e40ab0d9d1c4ef2a8325c7609152b904456f4 (commit)

commit 645c365233870d8181949484725fd7cd1b811f6a
Author: Ali Abdallah <aliov at xfce.org>
Date:   Tue Jan 4 13:39:39 2011 +0100

    Install the brightness plugin in libdir instead of libexecdir

 configure.ac.in                                    |    2 +-
 panel-plugins/brightness/Makefile.am               |    4 +-
 .../xfce4-brightness-plugin.desktop.in.in          |    2 +-
 src/Makefile.am                                    |    6 ++--
 src/org.xfce.power.policy                          |   25 --------------------
 5 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 5763d2b..63d63f1 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,7 +1,7 @@
 m4_define([intltool_minimum_version], [0.31])
 m4_define([xfpm_version_major],  [1])
 m4_define([xfpm_version_minor],  [0])
-m4_define([xfpm_version_micro],  [2])
+m4_define([xfpm_version_micro],  [3])
 m4_define([xfpm_version_build],  [])
 m4_define([xfpm_version_tag],[])
 m4_define([xfpm_version], [xfpm_version_major().xfpm_version_minor().xfpm_version_micro()ifelse(xfpm_version_tag(), [git], [xfpm_version_tag().xfpm_version_build()], [xfpm_version_tag()])])
diff --git a/panel-plugins/brightness/Makefile.am b/panel-plugins/brightness/Makefile.am
index 11597a8..922cc68 100644
--- a/panel-plugins/brightness/Makefile.am
+++ b/panel-plugins/brightness/Makefile.am
@@ -1,4 +1,4 @@
-plugindir = $(libexecdir)/xfce4/panel-plugins
+plugindir = $(libdir)/xfce4/panel-plugins
 plugin_PROGRAMS = xfce4-brightness-plugin
 
 xfce4_brightness_plugin_SOURCES =		\
@@ -59,4 +59,4 @@ CLEANFILES =                                                            \
         $(desktop_DATA)
 
 %.desktop.in: %.desktop.in.in
-	sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@
+	sed -e "s,\@libdir\@,$(libdir),g" < $< > $@
diff --git a/panel-plugins/brightness/xfce4-brightness-plugin.desktop.in.in b/panel-plugins/brightness/xfce4-brightness-plugin.desktop.in.in
index 1a5e440..6adccea 100644
--- a/panel-plugins/brightness/xfce4-brightness-plugin.desktop.in.in
+++ b/panel-plugins/brightness/xfce4-brightness-plugin.desktop.in.in
@@ -3,5 +3,5 @@ Type=X-XFCE-PanelPlugin
 _Name=Brightness plugin
 _Comment=Control your LCD brightness
 Icon=xfpm-brightness-lcd
-X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/xfce4-brightness-plugin
+X-XFCE-Exec=@libdir@/xfce4/panel-plugins/xfce4-brightness-plugin
 X-XFCE-Unique=TRUE
diff --git a/src/Makefile.am b/src/Makefile.am
index 52bd53c..eaca181 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -201,11 +201,11 @@ autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
 EXTRA_DIST =                                    \
 	xfpm-marshal.list			\
         $(autostart_in_files)                   \
-        org.gnome.power.policy.in2              \
+        org.xfce.power.policy.in2              \
         $(manpage_DATA)
 
 DISTCLEANFILES =                                \
         $(BUILT_SOURCES)                        \
         xfce4-power-manager.desktop             \
-        org.gnome.power.policy                  \
-        org.gnome.power.policy.in
+        org.xfce.power.policy                  \
+        org.xfce.power.policy.in
diff --git a/src/org.xfce.power.policy b/src/org.xfce.power.policy
deleted file mode 100644
index 748bcf1..0000000
--- a/src/org.xfce.power.policy
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-<policyconfig>
-
-  
-
-  <vendor>XFCE Power Manager</vendor>
-  <vendor_url>http://goodies.xfce.org/projects/applications/xfce4-power-manager</vendor_url>
-  <icon_name>battery</icon_name>
-
-  <action id="org.xfce.power.backlight-helper">
-    
-    <description>Modify the laptop display brightness</description>
-    <message>Authentication is required to modify the laptop display brightness</message>
-    <defaults>
-      <allow_any>no</allow_any>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>yes</allow_active>
-    </defaults>
-    <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/xfpm-power-backlight-helper</annotate>
-  </action>
-
-</policyconfig>
\ No newline at end of file