Enlightenment CVS committal
Author : horms
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance
Modified Files:
Makefile.am configure.in entrance.spec.in
Log Message:
* Relocate internal binaries (entrance_login and entrance_wrapper)
from PREFIX/bin to PREFIX/lib/entrance
* Allow configured Xsession not to exist at build time
(Need to fix up error reporting at run time)
Debian Package
* Removed useless debian/dirs
* Removed useless debian/entrance.conffiles
* Added Debian specific init script
- Uses debian's start-stip
- Somewhat more LSB compliant
* Added Debian specific pam file
* Added Debian specific Xsession
- On Debian /etc/X11/Xsession is non-executable (at the time of writing)
and is expected to be sourced nopt run. This wrapper does that
and nothing else.
* Update maintainer to E17 Debian Team
* Add build dependancy on automake1.7 | automaken, libtool, ecore0-bin,
edje0-bin, libesmart-dev
* Update build dependancy on libpam0g-dev | libpam-dev to libpam0g-dev
(I think libpam-dev is very ancient)
* Add dependancy on x11-common for /etc/X11/Xsession
* Start entrance in postinst rather than reloading it
- entranced fundamentally doesn't support reload and accordintly
neither the existing, or new Debian-specitic init script don't
have this opperation
- Restarting is problematic, because it might well restart a
running session. Probably the best idea is to do what xdm does and
as the user if they want entrance started if its controlling
a running session. But for the mean time just start entrance.
This will cause it to start if it isn't already running (and its
the default display manager). Otherwise the upgrade to the new
entrance will be defered untill the next time entrance is restarted,
the next time the user logs in.
===================================================================
RCS file: /cvs/e/e17/apps/entrance/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- Makefile.am 31 Mar 2006 03:36:18 -0000 1.11
+++ Makefile.am 6 May 2006 08:05:15 -0000 1.12
@@ -5,11 +5,11 @@
EXTRA_DIST = \
autogen.sh README README.edje AUTHORS COPYING entrance.spec \
debian/changelog debian/changelog.in debian/copyright \
- debian/control debian/rules debian/dirs debian/docs \
+ debian/control debian/rules debian/docs \
debian/README.Debian debian/entrance.postinst \
debian/entrance.postrm debian/entrance.prerm \
- debian/entrance.conffiles debian/entrance.config \
- m4/ac_expand_dir.m4 m4/ac_path_generic.m4 \
+ debian/entrance.config debian/etc/pam debian/etc/init \
+ debian/etc/Xsession m4/ac_expand_dir.m4 m4/ac_path_generic.m4 \
debian/entrance.templates entrance.spec.in
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
===================================================================
RCS file: /cvs/e/e17/apps/entrance/configure.in,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- configure.in 5 Apr 2006 16:29:50 -0000 1.53
+++ configure.in 6 May 2006 08:05:15 -0000 1.54
@@ -17,8 +17,10 @@
AC_EXPAND_DIR(PACKAGE_DATA_DIR, "$datadir/${PACKAGE}")
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "$PACKAGE_DATA_DIR", [Shared data
directory])
-AC_EXPAND_DIR(PACKAGE_BIN_DIR, "$bindir")
+AC_EXPAND_DIR(PACKAGE_LIB_DIR, "$bindir")
AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "$PACKAGE_BIN_DIR", [Location of binaries])
+AC_EXPAND_DIR(PACKAGE_LIB_DIR, "$libdir")
+AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "$PACKAGE_LIB_DIR", [Location of
libraries])
# Override autosplat's destination dir settings
test $sysconfdir = '${prefix}/etc' && sysconfdir="/etc"
@@ -163,10 +165,9 @@
fi
]
)
-if test ! -x $xsession ; then
- AC_MSG_WARN([** no $xsession file on this system **])
- AC_MSG_WARN([** Perhaps you need to specify --with-xsession **])
- xsession="You should reconfigure --with-xsession"
+if test ! -x "$xsession" ; then
+ AC_MSG_WARN([** $xsession does not exist or is not executable **])
+ AC_MSG_WARN([** Please consider overriding with --with-xsession **])
fi
AC_DEFINE_UNQUOTED(ENTRANCE_XSESSION, "$xsession", [Xsession script])
===================================================================
RCS file: /cvs/e/e17/apps/entrance/entrance.spec.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- entrance.spec.in 22 Mar 2006 19:11:10 -0000 1.1
+++ entrance.spec.in 6 May 2006 08:05:15 -0000 1.2
@@ -47,8 +47,8 @@
%{_sysconfdir}/pam.d/entrance
%{_bindir}/entrance
%{_bindir}/entrance_edit
-%{_bindir}/entrance_login
-%{_bindir}/entrance_wrapper
+%{_libdir}/entrance/entrance_login
+%{_libdir}/entrance/entrance_wrapper
%{_sbindir}/entranced
%{_datadir}/%{name}
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
