Updating branch refs/heads/master
to 29458948356bd057887a32c52a9e7e416400a034 (commit)
from 596ec8a39d2f70c2bf246c86b7d6dae540973548 (commit)
commit 29458948356bd057887a32c52a9e7e416400a034
Author: Nick Schermer <[email protected]>
Date: Thu Aug 26 20:30:41 2010 +0200
Move $libexecdir files to $libdir.
README | 8 ++++----
doc/C/xfce4-session.html | 8 ++++----
doc/C/xfce4-session.xml | 10 +++++-----
doc/fr/xfce4-session.html | 8 ++++----
doc/fr/xfce4-session.xml | 10 +++++-----
engines/balou/Makefile.am | 4 ++--
engines/balou/scripts/Makefile.am | 5 +++--
xfce4-session.spec.in | 9 ++-------
xfce4-session/Makefile.am | 2 +-
xfsm-shutdown-helper/Makefile.am | 3 ++-
10 files changed, 32 insertions(+), 35 deletions(-)
diff --git a/README b/README
index 8e40f04..929166a 100644
--- a/README
+++ b/README
@@ -6,16 +6,16 @@ Since 4.1.5, the session manager supports only sudo(8)-based
shutdown, other
method can be added by packagers if desired, just replace XfsmShutdownHelper
with your code. To be able to shutdown the computer, you must be listed
in the systems sudoers file, in particular, you must be allowed to execute
-$libexecdir/xfsm-shutdown-helper as user root (where $libexecdir is the
-libexec subdir in the prefix you installed xfce4-session, for example
-/usr/local/libexec).
+$libdir/xfce4/session/xfsm-shutdown-helper as user root (where $libdir is the
+lib subdir in the prefix you installed xfce4-session, for example
+/usr/local/lib).
For example, you installed xfce4-session into /usr/local, your hostname
is myhost and your user account is named myuser, then you'd have to add
the following line to your sudoers file (remember to use visudo to edit
that file):
- myuser myhost=/usr/local/libexec/xfsm-shutdown-helper
+ myuser myhost=/usr/local/lib/xfce4/session/xfsm-shutdown-helper
Starting with xfce4-session 4.3.99.2 xfce4-session will first try to use
HAL (if built with D-Bus support) and fallback to the sudo method described
diff --git a/doc/C/xfce4-session.html b/doc/C/xfce4-session.html
index a358e32..8161885 100644
--- a/doc/C/xfce4-session.html
+++ b/doc/C/xfce4-session.html
@@ -45,16 +45,16 @@
of your desktop session. To be able to shutdown the computer, you
have to be listed in the systems <code class="filename">sudoers</code>
file,
in particular, you must be allowed to execute the command
- <code class="filename">${libexecdir}/xfsm-shutdown-helper</code>
+ <code class="filename">${libdir}/xfce4/session/xfsm-shutdown-helper</code>
(<code class="filename">/usr/sbin/xfsm-shutdown-helper</code> on Debian
GNU/Linux)
- as user root (where <code class="filename">${libexecdir}</code> is the
<code class="filename">libexec</code> sub directory in the prefix you
+ as user root (where <code class="filename">${libdir}</code> is the <code
class="filename">lib</code> sub directory in the prefix you
installed <strong class="application"><code>xfce4-session</code></strong>,
for example
- <code class="filename">/usr/local/libexec</code>).</p><p>For example, lets
say, you installed <strong
class="application"><code>xfce4-session</code></strong> into <code
class="filename">/usr/local</code>, your hostname is <span
class="emphasis"><em>myhost</em></span>
+ <code class="filename">/usr/local/lib</code>).</p><p>For example, lets
say, you installed <strong
class="application"><code>xfce4-session</code></strong> into <code
class="filename">/usr/local</code>, your hostname is <span
class="emphasis"><em>myhost</em></span>
and your user account is named <span
class="emphasis"><em>myuser</em></span>, then you
would have to add the following line to your <code
class="filename">sudoers</code>
file (remember to use <strong
class="application"><code>visudo</code></strong> to edit
that file):</p><pre class="programlisting">
-myuser myhost=/usr/local/libexec/xfsm-shutdown-helper
+myuser myhost=/usr/local/lib/xfce4/session/xfsm-shutdown-helper
</pre></div></div><div class="sect1" lang="en"><div
class="titlepage"><div><div><h2 class="title" style="clear: both"><a
name="xfsm-advanced"></a>Advanced</h2></div></div></div><div class="sect2"
lang="en"><div class="titlepage"><div><div><h3 class="title"><a
name="files-and-env-vars"></a>Files and Environment
Variables</h3></div></div></div><p>Xfce now uses the Basedir Specification as
defined on <a href="http://freedesktop.org/"; target="_top">Freedesktop.org</a>
to
locate its data and configuration files. This means that file locations
will be specified as a path relative to the directories described in
diff --git a/doc/C/xfce4-session.xml b/doc/C/xfce4-session.xml
index 33faad3..afdb377 100644
--- a/doc/C/xfce4-session.xml
+++ b/doc/C/xfce4-session.xml
@@ -243,12 +243,12 @@ maintainers, etc. Commented out by default.
of your desktop session. To be able to shutdown the computer, you
have to be listed in the systems <filename>sudoers</filename> file,
in particular, you must be allowed to execute the command
- <filename>${libexecdir}/xfsm-shutdown-helper</filename>
+ <filename>${libdir}/xfce4/session/xfsm-shutdown-helper</filename>
(<filename>/usr/sbin/xfsm-shutdown-helper</filename> on Debian GNU/Linux)
- as user root (where <filename>${libexecdir}</filename> is the <filename
- role="directory">libexec</filename> sub directory in the prefix you
+ as user root (where <filename>${libdir}</filename> is the <filename
+ role="directory">lib</filename> sub directory in the prefix you
installed &app;, for example
- <filename role="directory">/usr/local/libexec</filename>).</para>
+ <filename role="directory">/usr/local/lib/xfce4/session</filename>).</para>
<para>For example, lets say, you installed &app; into <filename
role="directory">/usr/local</filename>, your hostname is
<emphasis>myhost</emphasis>
@@ -258,7 +258,7 @@ maintainers, etc. Commented out by default.
that file):</para>
<programlisting>
-myuser myhost=/usr/local/libexec/xfsm-shutdown-helper
+myuser myhost=/usr/local/lib/xfce4/session/xfsm-shutdown-helper
</programlisting>
</sect2>
diff --git a/doc/fr/xfce4-session.html b/doc/fr/xfce4-session.html
index 6356d7a..e7b30e5 100644
--- a/doc/fr/xfce4-session.html
+++ b/doc/fr/xfce4-session.html
@@ -31,14 +31,14 @@
s�lectionn�.</p><p><strong
class="application"><code>xfce4-session</code></strong> fournit par d�faut
trois moteurs de th�me d'�cran de d�marrage. Leurs options de configuration
respectives - si disponibles - sont disponibles en cliquant sur le bouton
<span><strong class="guibutton">Configurer</strong></span>.</p></div><div
class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a
name="xfsm-shutdown"></a>Les options
d'arr�t/red�marrage</h3></div></div></div><p><strong
class="application"><code>xfce4-session</code></strong> supporte l'arr�t de
votre ordinateur lors de la d�connexion de la session. Pour cela, vous devez
�tre list� dans le fichier <code class="filename">sudoers</code> du
syst�me, et vous devez en particulier �tre autoris�
- � ex�cuter la commande <code
class="filename">${libexecdir}/xfsm-shutdown-helper</code>
+ � ex�cuter la commande <code
class="filename">${libdir}/xfce4/session/xfsm-shutdown-helper</code>
(<code class="filename">/usr/sbin/xfsm-shutdown-helper</code> sous Debian
GNU/Linux)
- en tant qu'utilisateur root (o� <code
class="filename">${libexecdir}</code> est le sous r�pertoire <code
class="filename">libexec</code> selon le pr�fixe utilis� pour installer <strong
class="application"><code>xfce4-session</code></strong>, par exemple
- <code class="filename">/usr/local/libexec</code>).</p><p>pas exemple, si
vous avez install� <strong
class="application"><code>xfce4-session</code></strong> dans <code
class="filename">/usr/local</code>, que votre nom d'h�te est <span
class="emphasis"><em>myhost</em></span>
+ en tant qu'utilisateur root (o� <code class="filename">${libdir}</code>
est le sous r�pertoire <code class="filename">lib</code> selon le pr�fixe
utilis� pour installer <strong
class="application"><code>xfce4-session</code></strong>, par exemple
+ <code class="filename">/usr/local/lib/xfce4/session</code>).</p><p>pas
exemple, si vous avez install� <strong
class="application"><code>xfce4-session</code></strong> dans <code
class="filename">/usr/local</code>, que votre nom d'h�te est <span
class="emphasis"><em>myhost</em></span>
et que votre compte utilisateur est nomm�<span
class="emphasis"><em>myuser</em></span>, alors vous devez ajouter la ligne
suivante au fichier <code class="filename">sudoers</code> (souvenez-vous
d'utiliser <strong class="application"><code>visudo</code></strong>
pour �diter ce fichier):</p><pre class="programlisting">
-myuser myhost=/usr/local/libexec/xfsm-shutdown-helper
+myuser myhost=/usr/local/lib/xfce4/session/xfsm-shutdown-helper
</pre></div></div><p>�</p><div class="sect1" lang="en"><div
class="titlepage"><div><div><h2 class="title" style="clear: both"><a
name="xfsm-advanced"></a>Avanc�</h2></div></div></div><div class="sect2"
lang="en"><div class="titlepage"><div><div><h3 class="title"><a
name="files-and-env-vars"></a>Fichiers et variables
d'environnement</h3></div></div></div><p>Xfce utilise maintenant la
sp�cification Basedir telle que d�finie sur <a href="http://freedesktop.org/";
target="_top">Freedesktop.org</a> pour chercher ses donn�es et ses fichiers de
configuration. Cela signifie que les emplacements de ces fichiers seront
indiqu�s selon un chemin relatif aux
r�pertoires d�crits dans cette sp�cification.</p><div
class="variablelist"><dl><dt><span
class="term">${XDG_CONFIG_HOME}</span></dt><dd><p>Le premier r�pertoire o� il
faut rechercher les fichiers de configuration. Par d�faut, c'est
diff --git a/doc/fr/xfce4-session.xml b/doc/fr/xfce4-session.xml
index a553839..1129fc3 100644
--- a/doc/fr/xfce4-session.xml
+++ b/doc/fr/xfce4-session.xml
@@ -230,11 +230,11 @@ maintainers, etc. Commented out by default.
<para>&app; supporte l'arrêt de votre ordinateur lors de la déconnexion de
la session. Pour cela, vous devez
être listé dans le fichier <filename>sudoers</filename> du système, et
vous devez en particulier être autorisé
- à exécuter la commande
<filename>${libexecdir}/xfsm-shutdown-helper</filename>
+ à exécuter la commande
<filename>${libdir}/xfce4/session/xfsm-shutdown-helper</filename>
(<filename>/usr/sbin/xfsm-shutdown-helper</filename> sous Debian GNU/Linux)
- en tant qu'utilisateur root (où <filename>${libexecdir}</filename> est le
sous répertoire <filename
- role="directory">libexec</filename> selon le préfixe utilisé pour
installer &app;, par exemple
- <filename role="directory">/usr/local/libexec</filename>).</para>
+ en tant qu'utilisateur root (où <filename>${libdir}</filename> est le sous
répertoire <filename
+ role="directory">lib</filename> selon le préfixe utilisé pour installer
&app;, par exemple
+ <filename role="directory">/usr/local/lib/xfce4/session</filename>).</para>
<para>pas exemple, si vous avez installé &app; dans <filename
role="directory">/usr/local</filename>, que votre nom d'hôte est
<emphasis>myhost</emphasis>
@@ -243,7 +243,7 @@ maintainers, etc. Commented out by default.
pour éditer ce fichier):</para>
<programlisting>
-myuser myhost=/usr/local/libexec/xfsm-shutdown-helper
+myuser myhost=/usr/local/lib/xfce4/session/xfsm-shutdown-helper
</programlisting>
</sect2>
diff --git a/engines/balou/Makefile.am b/engines/balou/Makefile.am
index 57186cd..902ef4d 100644
--- a/engines/balou/Makefile.am
+++ b/engines/balou/Makefile.am
@@ -20,8 +20,8 @@ libbalou_la_CFLAGS =
\
-I$(top_srcdir) \
$(LIBXFCE4UI_CFLAGS) \
$(XFCONF_CFLAGS) \
- -DBALOU_EXPORT_THEME=\"$(libexecdir)/balou-export-theme\" \
- -DBALOU_INSTALL_THEME=\"$(libexecdir)/balou-install-theme\"
+ -DBALOU_EXPORT_THEME=\"$(libdir)/xfce4/session/balou-export-theme\" \
+ -DBALOU_INSTALL_THEME=\"$(libdir)/xfce4/session/balou-install-theme\"
libbalou_la_LDFLAGS = \
-avoid-version \
diff --git a/engines/balou/scripts/Makefile.am
b/engines/balou/scripts/Makefile.am
index 62b82dc..858ab37 100644
--- a/engines/balou/scripts/Makefile.am
+++ b/engines/balou/scripts/Makefile.am
@@ -1,5 +1,6 @@
-libexec_SCRIPTS = \
+baloursciptsdir = $(libdir)/xfce4/session
+balourscipts_SCRIPTS = \
balou-export-theme \
balou-install-theme
-EXTRA_DIST = $(libexec_SCRIPTS)
+EXTRA_DIST = $(balourscipts_SCRIPTS)
diff --git a/xfce4-session.spec.in b/xfce4-session.spec.in
index fe0b66a..d925ed8 100644
--- a/xfce4-session.spec.in
+++ b/xfce4-session.spec.in
@@ -8,11 +8,7 @@ Source0: %{name}-%{version}.tar.gz
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-root
Requires: libxfcegui4 >= @LIBXFCEGUI4_REQUIRED_VERSION@
-Requires: libxfce4mcs >= @LIBXFCE4MCS_CLIENT_REQUIRED_VERSION@
-Requires: xfce-mcs-manager >= @XFCE_MCS_MANAGER_REQUIRED_VERSION@
BuildRequires: libxfcegui4-devel >= @LIBXFCEGUI4_REQUIRED_VERSION@
-BuildRequires: libxfce4mcs-devel >= @LIBXFCE4MCS_CLIENT_REQUIRED_VERSION@
-BuildRequires: xfce-mcs-manager-devel >= @XFCE_MCS_MANAGER_REQUIRED_VERSION@
%description
xfce4-session is the session manager for the Xfce desktop environment.
@@ -68,9 +64,8 @@ fi
%{_datadir}/xfce4/*
%{_datadir}/locale/*
%{_libdir}/lib*.so.*
-%{_libdir}/xfce4/mcs-plugins/*
%{_libdir}/xfce4/splash/engines/libmice.*
-%{_libexecdir}/xfsm-shutdown-helper
+%{_libdir}/xfce4/session/xfsm-shutdown-helper
%{_mandir}/man1/*
%{_sysconfdir}/xdg/*
@@ -86,4 +81,4 @@ fi
%{_datadir}/themes/Default/balou/*
%{_libdir}/xfce4/splash/engines/libbalou.*
%{_libdir}/xfce4/splash/engines/libsimple.*
-%{_libexecdir}/balou-*
+%{_libdir}/xfce4/session/balou-*
diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am
index 5b4244a..3ea938c 100644
--- a/xfce4-session/Makefile.am
+++ b/xfce4-session/Makefile.am
@@ -65,7 +65,7 @@ xfce4_session_CFLAGS =
\
-DLIBDIR=\"$(libdir)\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
- -DXFSM_SHUTDOWN_HELPER_CMD=\"$(libexecdir)/xfsm-shutdown-helper\"
+
-DXFSM_SHUTDOWN_HELPER_CMD=\"$(libdir)/xfce4/session/xfsm-shutdown-helper\"
xfce4_session_LDADD = \
$(top_builddir)/libxfsm/libxfsm-4.6.la \
diff --git a/xfsm-shutdown-helper/Makefile.am b/xfsm-shutdown-helper/Makefile.am
index 212c856..9a89eec 100644
--- a/xfsm-shutdown-helper/Makefile.am
+++ b/xfsm-shutdown-helper/Makefile.am
@@ -1,4 +1,5 @@
-libexec_PROGRAMS = \
+xfsm_shutdown_helperdir = $(libdir)/xfce4/session
+xfsm_shutdown_helper_PROGRAMS = \
xfsm-shutdown-helper
xfsm_shutdown_helper_SOURCES = \
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
