Index: /package_branches/invirt-web/hvirt/debian/changelog
===================================================================
--- /package_branches/invirt-web/hvirt/debian/changelog	(revision 2920)
+++ /package_branches/invirt-web/hvirt/debian/changelog	(revision 2921)
@@ -1,2 +1,26 @@
+invirt-web (0.1.5hvirt5) unstable; urgency=low
+
+  * Changed master -> invirt
+
+ -- Greg Brockman <gdb@mit.edu>  Sat, 23 Jan 2010 00:59:11 -0500
+
+invirt-web (0.1.5hvirt4) unstable; urgency=low
+
+  * Now use invirt-mako-render, so set path appropriately
+
+ -- Greg Brockman <gdb@mit.edu>  Sat, 23 Jan 2010 00:41:44 -0500
+
+invirt-web (0.1.5hvirt3) unstable; urgency=low
+
+  * Fixed some minor bugs
+
+ -- Greg Brockman <gdb@mit.edu>  Fri, 22 Jan 2010 02:17:21 -0500
+
+invirt-web (0.1.5hvirt2) unstable; urgency=low
+
+  * Removed old mako templates.
+
+ -- Greg Brockman <gdb@mit.edu>  Fri, 22 Jan 2010 02:08:55 -0500
+
 invirt-web (0.1.5hvirt1) unstable; urgency=low
 
Index: /package_branches/invirt-web/hvirt/debian/control
===================================================================
--- /package_branches/invirt-web/hvirt/debian/control	(revision 2920)
+++ /package_branches/invirt-web/hvirt/debian/control	(revision 2921)
@@ -13,7 +13,5 @@
  invirt-dns, invirt-vnc-client, invirt-iptables,
 # web server
- apache2, libapache2-mod-fcgid, libapache2-svn,
- libapache2-mod-auth-sslcert, libapache2-mod-auth-kerb,
- debathena-ssl-certificates,
+ apache2, libapache2-mod-fcgid,
 # python libraries
  python-flup, python-simplejson,
@@ -21,8 +19,8 @@
  python-mako,
 # misc
- kstart,
- debathena-afs-config, openafs-modules-xen,
- mail-transport-agent, subversion, zephyr-clients,
- cron,
+ mail-transport-agent, subversion, cron
+Recommends: libapache2-svn, libapache2-mod-auth-sslcert,
+ libapache2-mod-auth-kerb, debathena-ssl-certificates,
+ zephyr-clients
 Provides: ${diverted-files}
 Conflicts: ${diverted-files}
Index: /package_branches/invirt-web/hvirt/debian/invirt-web.init
===================================================================
--- /package_branches/invirt-web/hvirt/debian/invirt-web.init	(revision 2920)
+++ /package_branches/invirt-web/hvirt/debian/invirt-web.init	(revision 2921)
@@ -12,5 +12,5 @@
 PACKAGE=invirt-web
 PARENTPACKAGE=apache2
-GEN_FILES=(/etc/apache2/sites-available/master /etc/invirt-iptables/rules.d/50-invirt-web)
+GEN_FILES=(/etc/apache2/sites-available/invirt /etc/invirt-iptables/rules.d/50-invirt-web)
 
 . /lib/init/config-init.sh
Index: /package_branches/invirt-web/hvirt/files/etc/apache2/sites-available/invirt.mako
===================================================================
--- /package_branches/invirt-web/hvirt/files/etc/apache2/sites-available/invirt.mako	(revision 2920)
+++ /package_branches/invirt-web/hvirt/files/etc/apache2/sites-available/invirt.mako	(revision 2921)
@@ -56,4 +56,4 @@
 
 % for site in cfg.web.sites:
-<%include file="../conf.invirt/${site}.mako" args="cfg=cfg, invirt_ssl=invirt_ssl" />
+<%include file="${site}.mako" args="cfg=cfg, invirt_ssl=invirt_ssl" />
 % endfor