Enlightenment CVS committal

Author  : horms
Project : e17
Module  : apps/entrance

Dir     : e17/apps/entrance/debian


Modified Files:
        changelog.in control entrance.postinst rules 
Removed Files:
        dirs entrance.conffiles 


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/debian/changelog.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- changelog.in        14 Oct 2005 22:17:04 -0000      1.2
+++ changelog.in        6 May 2006 08:05:15 -0000       1.3
@@ -2,5 +2,5 @@
 
   * a CVS snapshot release.
 
- -- Blake Barnett (shadoi) <[EMAIL PROTECTED]>  Fri, 23 Sep 2005 09:02:58 -0700
+ -- E17 Debian Team <[EMAIL PROTECTED]>  Sun, 16 Apr 2006 12:58:12 +0900
 
===================================================================
RCS file: /cvs/e/e17/apps/entrance/debian/control,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- control     14 Oct 2005 22:17:04 -0000      1.8
+++ control     6 May 2006 08:05:15 -0000       1.9
@@ -1,14 +1,14 @@
 Source: entrance
 Section: x11
 Priority: optional
-Maintainer: Sytse Wielinga <[EMAIL PROTECTED]>
-Build-Depends: libevas-dev, libecore-dev, libedje-dev, libpam0g-dev | 
libpam-dev, debhelper (>> 4.0.0)
+Maintainer: E17 Debian Team <[EMAIL PROTECTED]>
+Build-Depends: debhelper (>> 4.0.0), automake1.7 | automaken, libtool, 
libpam0g-dev, libevas-dev, libecore-dev, ecore0-bin, libedje-dev, edje0-bin, 
libesmart-dev
 Standards-Version: 3.6.1.0
 
 Package: entrance
 Section: x11
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, x11-common
 Description: The enlightened login manager.
  Entrance is a login manager similar to gdm or kdm, it is based on the 
  Enlightenment Foundation Libraries.  It is fully themeable via Edje.
===================================================================
RCS file: /cvs/e/e17/apps/entrance/debian/entrance.postinst,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- entrance.postinst   14 Oct 2005 22:17:04 -0000      1.1
+++ entrance.postinst   6 May 2006 08:05:15 -0000       1.2
@@ -87,7 +87,11 @@
 
 if [ -x /etc/init.d/entrance ]; then
   update-rc.d entrance defaults 99 01 >/dev/null 2>&1
-  invoke-rc.d entrance reload 2> /dev/null || true
+  # xdm has some rather involved  logic to prompt the user
+  # in prerm to see if they want to stop xdm if its already running a session.
+  # That can be added to entrance later, but for now, just start it if its not 
running,
+  # otherwise just leave it running.
+  invoke-rc.d entrance start 2> /dev/null || true
 fi
 
 # Automatically added by dh_installmenu
===================================================================
RCS file: /cvs/e/e17/apps/entrance/debian/rules,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- rules       2 Apr 2006 07:38:05 -0000       1.7
+++ rules       6 May 2006 08:05:15 -0000       1.8
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
+
 # GNU copyright 1997 to 1999 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
@@ -12,6 +12,8 @@
 
 CFLAGS ?= -Wall -g
 
+pwd := `pwd`
+
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
        CFLAGS += -O0
 else
@@ -27,14 +29,16 @@
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 INSTALL=/usr/bin/install -p
-CONFIGUREOPTS = --prefix=/usr --with-xsession=/etc/X11/Xsession 
--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+CONFIGUREOPTS = --prefix=/usr --with-xsession=/etc/entrance/Xsession \
+       --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
+       --with-pam-config=entrance
 package=entrance
 
 configure: configure-stamp
 configure-stamp:
        dh_testdir
 
-       test -x autogen.sh && ./autogen.sh $(CONFIGUREOPTS) || ./configure 
$(CONFIGUREOPTS)
+       ./configure $(CONFIGUREOPTS)
 
        touch configure-stamp
 
@@ -64,6 +68,15 @@
 
        # Add here commands to install the package into debian/entrance.
        $(MAKE) install DESTDIR=$(CURDIR)/debian/$(package)
+
+       ./mkinstalldirs $(pwd)/debian/entrance/etc/init.d
+       install -c -m 755 debian/etc/init 
$(pwd)/debian/entrance/etc/init.d/entrance
+
+       ./mkinstalldirs $(pwd)/debian/entrance/etc/pam.d
+       install -c -m 644 debian/etc/pam 
$(pwd)/debian/entrance/etc/pam.d/entrance
+
+       ./mkinstalldirs $(pwd)/debian/entrance/etc/entrance
+       install -c -m 755 debian/etc/Xsession 
$(pwd)/debian/entrance/etc/entrance/Xsession
 
 # Build architecture-independent files here.
 binary-indep: build install




-------------------------------------------------------
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

Reply via email to