From: Evan Broder Date: Sun, 30 May 2010 15:48:51 +0000 (-0400) Subject: Divert /etc/conserver/console.cf in console-server instead of dropping one into place. X-Git-Tag: 0.2.14^0 X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-console.git/commitdiff_plain/refs/tags/0.2.14 Divert /etc/conserver/console.cf in console-server instead of dropping one into place. conserver-client also has a console.cf, which was causing the packages to conflict. svn path=/trunk/packages/invirt-console/; revision=3018 --- diff --git a/debian/changelog b/debian/changelog index 4bda8a2..9ba049d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ invirt-console (0.2.14) unstable; urgency=low * Use the .. Perl operator to simplify the invirt-console-host prerm. + * Divert /etc/conserver/console.cf on the ocnsole server, since + conserver-client also has one of those. - -- Evan Broder Thu, 27 May 2010 11:55:53 -0400 + -- Evan Broder Sun, 30 May 2010 11:48:15 -0400 invirt-console (0.2.13) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 5251626..eba9e2b 100755 --- a/debian/rules +++ b/debian/rules @@ -23,6 +23,7 @@ DEB_DIVERT_FILES_invirt-console-server += \ /etc/motd.invirt DEB_DIVERT_FILES_invirt-console-host += \ /etc/conserver/conserver.cf.invirt \ + /etc/conserver/console.cf.invirt \ /etc/conserver/server.conf.invirt include /usr/share/cdbs/1/rules/debhelper.mk diff --git a/server/etc/conserver/console.cf b/server/etc/conserver/console.cf.invirt similarity index 100% rename from server/etc/conserver/console.cf rename to server/etc/conserver/console.cf.invirt