From: Evan Broder <broder@mit.edu>
Date: Sun, 3 Jan 2010 18:54:37 +0000 (-0500)
Subject: Use invirt-ssh-config in invirt-console instead of
X-Git-Tag: 0.2.13~2
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-console.git/commitdiff_plain/db4f7b1ed595dc7032def79c750d8f5008029328

Use invirt-ssh-config in invirt-console instead of
debathena-ssh-server-config.

svn path=/trunk/packages/invirt-console/; revision=2856
---

diff --git a/debian/changelog b/debian/changelog
index 94d829f..e57c698 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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
 
   * Disable the sftp subsystem on the console server; it interacts poorly
diff --git a/debian/control b/debian/control
index b93f1a5..7eb9695 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: invirt-console
 Section: servers
 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
 
 Package: invirt-console-server
@@ -13,7 +13,7 @@ Depends: invirt-base, ${shlibs:Depends}, ${misc:Depends},
  conserver-client, conserver-server, daemon,
  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.
 
diff --git a/debian/rules b/debian/rules
index b1b8d2b..0a4ca4d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,13 @@ DEB_TRANSFORM_FILES_invirt-console-server += \
 	/etc/nsswitch.conf.invirt \
 	/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),)
     DEB_CHECK_FILES_SOURCE_/etc/nsswitch.conf.invirt = \
         /usr/share/base-files/nsswitch.conf
diff --git a/debian/transform_sshd_config.debathena.invirt b/debian/transform_sshd_config.invirt.invirt
similarity index 100%
rename from debian/transform_sshd_config.debathena.invirt
rename to debian/transform_sshd_config.invirt.invirt