Index: trunk/packages/xvm-console-devconfig/debian/changelog
===================================================================
--- trunk/packages/xvm-console-devconfig/debian/changelog	(revision 683)
+++ trunk/packages/xvm-console-devconfig/debian/changelog	(revision 687)
@@ -1,2 +1,8 @@
+xvm-console-devconfig (0.2) intrepid; urgency=low
+
+  * handle diversions correctly
+
+ -- Greg Price <price@mit.edu>  Sun, 20 Jul 2008 15:53:38 -0400
+
 xvm-console-devconfig (0.1) unstable; urgency=low
 
Index: trunk/packages/xvm-console-devconfig/debian/files
===================================================================
--- trunk/packages/xvm-console-devconfig/debian/files	(revision 683)
+++ trunk/packages/xvm-console-devconfig/debian/files	(revision 687)
@@ -1,1 +1,1 @@
-xvm-console-devconfig_0.1_all.deb servers important
+xvm-console-devconfig_0.2_all.deb servers important
Index: trunk/packages/xvm-console-devconfig/debian/invirt-console
===================================================================
--- trunk/packages/xvm-console-devconfig/debian/invirt-console	(revision 683)
+++ 	(revision )
@@ -1,2 +1,0 @@
-host/black-mesa.mit.edu@ATHENA.MIT.EDU
-host/sx-blade-2.mit.edu@ATHENA.MIT.EDU
Index: trunk/packages/xvm-console-devconfig/debian/invirt-hosts.cf
===================================================================
--- trunk/packages/xvm-console-devconfig/debian/invirt-hosts.cf	(revision 683)
+++ 	(revision )
@@ -1,2 +1,0 @@
-#include /etc/conserver/conf.d/black-mesa.mit.edu
-#include /etc/conserver/conf.d/sx-blade-2.mit.edu
Index: trunk/packages/xvm-console-devconfig/debian/xvm-console-devconfig.install
===================================================================
--- trunk/packages/xvm-console-devconfig/debian/xvm-console-devconfig.install	(revision 683)
+++ trunk/packages/xvm-console-devconfig/debian/xvm-console-devconfig.install	(revision 687)
@@ -1,2 +1,1 @@
-debian/invirt-hosts.cf etc/conserver
-debian/invirt-console etc/remctl/acl
+files/* .
Index: trunk/packages/xvm-console-devconfig/files/etc/conserver/invirt-hosts.cf.xvm
===================================================================
--- trunk/packages/xvm-console-devconfig/files/etc/conserver/invirt-hosts.cf.xvm	(revision 687)
+++ trunk/packages/xvm-console-devconfig/files/etc/conserver/invirt-hosts.cf.xvm	(revision 687)
@@ -0,0 +1,2 @@
+#include /etc/conserver/conf.d/black-mesa.mit.edu
+#include /etc/conserver/conf.d/sx-blade-2.mit.edu
Index: trunk/packages/xvm-console-devconfig/files/etc/remctl/acl/invirt-console.xvm
===================================================================
--- trunk/packages/xvm-console-devconfig/files/etc/remctl/acl/invirt-console.xvm	(revision 687)
+++ trunk/packages/xvm-console-devconfig/files/etc/remctl/acl/invirt-console.xvm	(revision 687)
@@ -0,0 +1,2 @@
+host/black-mesa.mit.edu@ATHENA.MIT.EDU
+host/sx-blade-2.mit.edu@ATHENA.MIT.EDU