remove X11 session initialization script. ready for 0.32 release

diff --git a/debian/70monkeysphere_use-validation-agent b/debian/70monkeysphere_use-validation-agent
deleted file mode 100644 (file)
index 894de12..0000000
--- a/debian/70monkeysphere_use-validation-agent
+++ /dev/null
@@ -1,38 +0,0 @@
-# /etc/X11/Xsession.d/70monkeysphere_use-validation-agent
-
-# This is a script to be sourced by Xsession.  It wraps the session
-# startup argument with a monkeysphere-validation-agent nested
-# process, if available and none already exist.
-
-# Enable this system-wide by setting
-# MONKEYSPHERE_USE_VALIDATION_AGENT=true in
-# /etc/monkeysphere/monkeysphere.conf
-
-# Note that there is some weird interaction between this and
-# dbus-session at the moment: dbus-launch can start the msva just
-# fine, but if msva tries to start dbus-launch, dbus-launch fails
-# with:
-
-# Failed to waitpid() for babysitter intermediate process: No child processes
-
-# So this is placed at position 70 -- *before* the dbus Xsession
-# startup script, which is at 75 as of 2010-03-12, when i wrote this.
-
-# this is also good, because it means that the MSVA will learn about
-# the dbus session parameters, in case we want the agent to use dbus
-# to communicate with the user.
-
-# Author: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-MSVAGENT=/usr/bin/monkeysphere-validation-agent
-MSSYSCONFIG=/etc/monkeysphere/monkeysphere.conf
-MSUSERCONFIG="$HOME/.monkeysphere/monkeysphere.conf"
-
-if [ -x "$MSVAGENT" ] ; then
-   if [ "$(USE_VALIDATION_AGENT=
-[ -r "$MSSYSCONFIG" ]  && . "$MSSYSCONFIG" 2>/dev/null || :
-[ -r "$MSUSERCONFIG" ] && . "$MSUSERCONFIG" 2>/dev/null || :
-printf '%s' "$USE_VALIDATION_AGENT")" = "true" ] ; then
-        STARTUP="$MSVAGENT $STARTUP"
-    fi
-fi

diff --git a/debian/changelog b/debian/changelog
index 66d9fcc7ff3895b74d5a826c77b85a84cb8cbbdc..15dceebbf9114ddb935f01a10d67662df905edc1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-monkeysphere (0.31-2~pre) UNRELEASED; urgency=low
+monkeysphere (0.32-1) unstable; urgency=low
 
-  * fix X11 session initialization script for systems with dash as /bin/sh
-    (resolves MS #2471)
+  * New upstream release
+  * remove the etc/X11/Xsession.d/70monkeysphere_use-validation-agent
+    script, since msva will now be handling that itself.
 
- -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Tue, 10 Aug 2010 14:07:45 -0400
+ -- Jameson Rollins <jrollins@finestructure.net>  Mon, 04 Oct 2010 02:14:05 -0400
 
 monkeysphere (0.31-1) unstable; urgency=low
 

diff --git a/debian/monkeysphere.install b/debian/monkeysphere.install
deleted file mode 100644 (file)
index 63a2dd7..0000000
--- a/debian/monkeysphere.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/70monkeysphere_use-validation-agent etc/X11/Xsession.d