Index: trunk/packages/invirt-console/debian/changelog
===================================================================
--- trunk/packages/invirt-console/debian/changelog	(revision 2855)
+++ trunk/packages/invirt-console/debian/changelog	(revision 2856)
@@ -1,2 +1,9 @@
+invirt-console (0.2.12) unstable; urgency=low
+
+  * Use the new invirt-ssh-config package instead of
+    debathena-ssh-server-config.
+
+ -- Evan Broder <broder@mit.edu>  Sun, 03 Jan 2010 13:42:43 -0500
+
 invirt-console (0.2.11) unstable; urgency=low
 
Index: trunk/packages/invirt-console/debian/control
===================================================================
--- trunk/packages/invirt-console/debian/control	(revision 2855)
+++ trunk/packages/invirt-console/debian/control	(revision 2856)
@@ -3,5 +3,5 @@
 Priority: extra
 Maintainer: Invirt project <invirt@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), config-package-dev (>= 4.5~), nscd, openssh-server, debathena-ssh-server-config, initscripts
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), config-package-dev (>= 4.5~), nscd, openssh-server, invirt-ssh-config, initscripts
 Standards-Version: 3.7.2
 
@@ -14,5 +14,5 @@
  debathena-kerberos-config, fuse-utils, libnss-pgsql1, nscd,
  openssh-server, python, python-routefs, invirt-database,
- remctl-server, debathena-ssh-server-config
+ remctl-server, invirt-ssh-config
 Description: Invirt serial-console proxy server
  This is the software for the serial-console proxy server.
Index: trunk/packages/invirt-console/debian/rules
===================================================================
--- trunk/packages/invirt-console/debian/rules	(revision 2855)
+++ trunk/packages/invirt-console/debian/rules	(revision 2856)
@@ -7,5 +7,10 @@
 	/etc/nscd.conf.invirt \
 	/etc/pam.d/sshd.invirt \
+	/etc/ssh/sshd_config.invirt.invirt
+
+DEB_UNDIVERT_FILES_invirt-console-server += \
 	/etc/ssh/sshd_config.debathena.invirt
+
+EB_UNDIVERT_VERSION_/etc/ssh/sshd_config.debathena.invirt = 0.2.12~
 
 ifneq ($(wildcard /usr/share/base-files/nsswitch.conf),)
Index: trunk/packages/invirt-console/debian/transform_sshd_config.debathena.invirt
===================================================================
--- trunk/packages/invirt-console/debian/transform_sshd_config.debathena.invirt	(revision 2855)
+++ 	(revision )
@@ -1,5 +1,0 @@
-#!/usr/bin/perl -0p
-s/^#?PrintLastLog .*$/PrintLastLog no/m or die;
-s/$/\nAllowTcpForwarding no/ or die;
-s/^#?X11Forwarding .*$/X11Forwarding no/m or die;
-s/^#?Subsystem sftp.*$//m or die;
Index: trunk/packages/invirt-console/debian/transform_sshd_config.invirt.invirt
===================================================================
--- trunk/packages/invirt-console/debian/transform_sshd_config.invirt.invirt	(revision 2856)
+++ trunk/packages/invirt-console/debian/transform_sshd_config.invirt.invirt	(revision 2856)
@@ -0,0 +1,5 @@
+#!/usr/bin/perl -0p
+s/^#?PrintLastLog .*$/PrintLastLog no/m or die;
+s/$/\nAllowTcpForwarding no/ or die;
+s/^#?X11Forwarding .*$/X11Forwarding no/m or die;
+s/^#?Subsystem sftp.*$//m or die;