From b52866e39d4ec7ab7a1366d8cd4b191b1e70810e Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Mon, 4 Oct 2010 01:33:04 -0400
Subject: [PATCH] preparing for 0.4-1 release into debian (adopting Xsession.d
 script from monkeysphere package)

---
 debian/70monkeysphere_use-validation-agent | 38 ++++++++++++++++++++++
 debian/changelog                           |  9 +++++
 debian/control                             | 12 ++++---
 debian/msva-perl.install                   |  3 ++
 4 files changed, 57 insertions(+), 5 deletions(-)
 create mode 100644 debian/70monkeysphere_use-validation-agent

diff --git a/debian/70monkeysphere_use-validation-agent b/debian/70monkeysphere_use-validation-agent
new file mode 100644
index 0000000..894de12
--- /dev/null
+++ b/debian/70monkeysphere_use-validation-agent
@@ -0,0 +1,38 @@
+# /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 88ad6ab..6c26da5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+msva-perl (0.4-1) experimental; urgency=low
+
+  * New Upstream Release (to experimental)
+  * Bumped Standards-Version to 3.9.1 (no changes needed)
+  * Adopted Xsession.d script from monkeysphere package (which
+    unfortunately means we conflict with any monkeysphere package << 0.32)
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Mon, 04 Oct 2010 01:11:15 -0400
+
 msva-perl (0.3-1) unstable; urgency=low
 
   * New Upstream Release:
diff --git a/debian/control b/debian/control
index f4ce337..84dc1db 100644
--- a/debian/control
+++ b/debian/control
@@ -5,27 +5,29 @@ Maintainer: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 Uploaders: Micah Anderson <micah@debian.org>
 Build-Depends: debhelper (>= 7.0),
  perl
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://web.monkeysphere.info/
 Vcs-Git: git://git.monkeysphere.info/msva-perl
 
 Package: msva-perl
 Architecture: all
-Depends: monkeysphere,
+Depends: 
  libcrypt-x509-perl,
  libconvert-asn1-perl,
  libnet-server-perl,
  libhttp-server-simple-perl,
  libjson-perl,
  libparent-perl,
+ libgnupg-interface-perl (>= 0.42.02),
+ libregexp-common-perl,
+ libgtk2-perl,
  ${misc:Depends}
+Conflicts: monkeysphere (<< 0.32)
 Provides: monkeysphere-validation-agent
-Enhances: monkeysphere
+Enhances: xul-ext-monkeysphere
 Description: Cryptographic identity validation agent (Perl implementation)
  The Monkeysphere Validation Agent offers a local service for tools to
  validate certificates (both X.509 and OpenPGP) and other public keys.
  .
  This package contains a perl implementation of a Monkeysphere
  Validation Agent.
-
-
diff --git a/debian/msva-perl.install b/debian/msva-perl.install
index 64b2177..0c85a68 100644
--- a/debian/msva-perl.install
+++ b/debian/msva-perl.install
@@ -1,2 +1,5 @@
 msva-perl usr/bin
 Net/Server/MSVA.pm usr/share/perl5/Net/Server
+Crypt/Monkeysphere/MSVA.pm usr/share/perl5/Crypt/Monkeysphere
+Crypt/Monkeysphere/MSVA/MarginalUI.pm usr/share/perl5/Crypt/Monkeysphere/MSVA
+debian/70monkeysphere_use-validation-agent etc/X11/Xsession.d
-- 
2.26.2