Index: /package_branches/invirt-base/hvirt/debian/control
===================================================================
--- /package_branches/invirt-base/hvirt/debian/control	(revision 2864)
+++ /package_branches/invirt-base/hvirt/debian/control	(revision 2865)
@@ -3,5 +3,5 @@
 Priority: extra
 Maintainer: Invirt project <invirt@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), python-all-dev, python-support, python-setuptools, python-debian, python-apt, krb5-config, krb5-user, krb5-clients, openssh-server
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), python-all-dev, python-support, python-setuptools, python-debian, python-apt, krb5-config, krb5-user, krb5-clients, invirt-ssh-config
 Standards-Version: 3.8.0
 
@@ -11,5 +11,5 @@
  python-json (>= 3.4-2), python-yaml (>= 3.05), python-mako (>=
  0.2.2), remctl-client, invirt-config, krb5-config, krb5-user,
- krb5-clients, openssh-server
+ krb5-clients, invirt-ssh-config
 Provides: ${python:Provides}, ${diverted-files}
 Conflicts: ${diverted-files}
Index: /package_branches/invirt-base/hvirt/debian/invirt-base.install
===================================================================
--- /package_branches/invirt-base/hvirt/debian/invirt-base.install	(revision 2864)
+++ /package_branches/invirt-base/hvirt/debian/invirt-base.install	(revision 2865)
@@ -1,4 +1,3 @@
 files/* .
-debian/sshd_config.invirt etc/ssh/
 debian/krb5.conf.invirt.mako etc/
 
Index: /package_branches/invirt-base/hvirt/debian/invirt-base.postinst
===================================================================
--- /package_branches/invirt-base/hvirt/debian/invirt-base.postinst	(revision 2864)
+++ /package_branches/invirt-base/hvirt/debian/invirt-base.postinst	(revision 2865)
@@ -21,10 +21,4 @@
 case "$1" in
     configure)
-	# Stolen from debathena
-	if hash invoke-rc.d; then
-            invoke-rc.d ssh restart
-        else
-            /etc/init.d/ssh restart
-        fi
     ;;
 
Index: /package_branches/invirt-base/hvirt/debian/rules
===================================================================
--- /package_branches/invirt-base/hvirt/debian/rules	(revision 2864)
+++ /package_branches/invirt-base/hvirt/debian/rules	(revision 2865)
@@ -7,5 +7,4 @@
         /usr/share/kerberos-configs/krb5.conf.template
 DEB_DIVERT_FILES_invirt-base += \
-        /etc/ssh/sshd_config.invirt \
         /etc/krb5.conf.invirt
 
@@ -20,19 +19,5 @@
 	mv $(DEB_DESTDIR)usr/bin/invirt-reload $(DEB_DESTDIR)usr/sbin/invirt-reload
 
-common-build-indep:: debian/sshd_config.invirt debian/krb5.conf.invirt.mako
-
-# Stolen from Debathena
-debian/sshd_config.invirt-orig: /var/lib/dpkg/info/openssh-server.postinst
-	perl -0pe 's/^.*<<EOF[^\n]*\n(.*\n)EOF\n.*$$/$$1/s or die;' $< > $@
-
-# Stolen from Debathena
-debian/sshd_config.invirt: debian/sshd_config.invirt-orig
-	perl -0pe '# Debathena rules (from debathena-ssh-server-config) \
-s/^#?GSSAPIAuthentication .*$$/GSSAPIAuthentication yes\nGSSAPIKeyExchange yes\nGSSAPIStrictAcceptorCheck no/m and \
-s/^#?GSSAPICleanupCredentials .*$$/GSSAPICleanupCredentials yes/m and \
-s/^#?ChallengeResponseAuthentication .*$$/ChallengeResponseAuthentication yes/m and \
-## In Debathena, privilege separation is configurable. \
-s/^#?UsePrivilegeSeparation .*$$/UsePrivilegeSeparation yes/m and \
-s/^#?PasswordAuthentication .*$$/PasswordAuthentication no/m or die;' $< > $@
+common-build-indep:: debian/krb5.conf.invirt.mako
 
 debian/krb5.conf.invirt.mako: $(call debian_check_files,/etc/krb5.conf)