From: Evan Broder <broder@mit.edu>
Date: Tue, 14 Oct 2008 05:34:49 +0000 (-0400)
Subject: Correctly divert conserver.cf in sipb-xen-console-server
X-Git-Tag: sipb-xen-console-server/2.06.1^0
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-console.git/commitdiff_plain/1b0230c55aa01c83ae7afc7597266420801cdf26?ds=sidebyside

Correctly divert conserver.cf in sipb-xen-console-server

svn path=/trunk/packages/sipb-xen-console-server/; revision=1112
---

diff --git a/debian/changelog b/debian/changelog
index 4819606..65da424 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sipb-xen-console-server (2.06.1) unstable; urgency=low
+
+  * Correctly divert conserver.cf
+
+ -- Evan Broder <broder@mit.edu>  Tue, 14 Oct 2008 01:34:25 -0400
+
 sipb-xen-console-server (2.06) unstable; urgency=low
 
   * generate config files using mako
diff --git a/debian/rules b/debian/rules
index 2922acc..7ee4fef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
 DEB_DIVERT_EXTENSION = .sipb-xen
 DEB_DIVERT_FILES_sipb-xen-console += \
-	/etc/conserver/conserver.cf
+	/etc/conserver/conserver.cf.sipb-xen
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/config-package.mk