Index: trunk/packages/invirt-base/debian/changelog
===================================================================
--- trunk/packages/invirt-base/debian/changelog	(revision 1907)
+++ trunk/packages/invirt-base/debian/changelog	(revision 1910)
@@ -1,2 +1,9 @@
+invirt-base (0.0.17) unstable; urgency=low
+
+  * Remove apticron and molly-guard dependencies,
+    to go into the XVM metapackages
+
+ -- Greg Price <price@mit.edu>  Fri, 26 Dec 2008 23:56:34 -0500
+
 invirt-base (0.0.16) unstable; urgency=low
 
Index: trunk/packages/invirt-base/debian/control
===================================================================
--- trunk/packages/invirt-base/debian/control	(revision 1907)
+++ trunk/packages/invirt-base/debian/control	(revision 1910)
@@ -8,5 +8,5 @@
 Package: invirt-base
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, molly-guard, apticron,
+Depends: ${python:Depends}, ${misc:Depends},
  python-json (>= 3.4-2), python-yaml (>= 3.05), python-mako (>=
  0.2.2), invirt-config
Index: trunk/packages/xvm-meta/debian/changelog
===================================================================
--- trunk/packages/xvm-meta/debian/changelog	(revision 1907)
+++ trunk/packages/xvm-meta/debian/changelog	(revision 1910)
@@ -1,7 +1,9 @@
 xvm-meta (0.0.2) unstable; urgency=low
 
+  * factor out xvm-misc-config
+  * add apticron, molly-guard
   * trivial spelling, punctuation
 
- -- Gregory Nathan Price <Greg Price <price@mit.edu>>  Wed, 17 Dec 2008 01:00:00 -0500
+ -- Greg Price <price@mit.edu>  Fri, 26 Dec 2008 23:54:01 -0500
 
 xvm-meta (0.0.1) unstable; urgency=low
Index: trunk/packages/xvm-meta/debian/control
===================================================================
--- trunk/packages/xvm-meta/debian/control	(revision 1907)
+++ trunk/packages/xvm-meta/debian/control	(revision 1910)
@@ -9,5 +9,5 @@
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, invirt-host-master,
- xvm-mail-config, xvm-munin-host-config
+ xvm-munin-host-config, xvm-misc-config
 Description: Metapackage for XVM hosts
  This package installs the necessary software to run an XVM host.
@@ -17,5 +17,5 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, invirt-database-server,
  invirt-dev, invirt-web,
- xvm-db-backup, xvm-mail-config, xvm-munin-master-config
+ xvm-munin-master-config, xvm-db-backup, xvm-misc-config
 Description: Metapackage for the XVM master VM
  This package installs the necessary software for the XVM master VM,
@@ -25,5 +25,5 @@
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, invirt-console-server,
- xvm-mail-config, xvm-munin-console-config
+ xvm-munin-console-config, xvm-misc-config
 Description: Metapackage for the XVM console VM
  This package installs the necessary software for the XVM console
@@ -33,5 +33,11 @@
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, invirt-remote-server,
- xvm-mail-config, xvm-munin-remote-config
+ xvm-munin-remote-config, xvm-misc-config
 Description: Metapackage for the VM remote VM
  This package installs the necessary software for the XVM remctl proxy.
+
+Package: xvm-misc-config
+Architecture: all
+Depends: xvm-mail-config, molly-guard, apticron
+Description: Miscellaneous XVM configuration
+ This package configures some things every XVM machine needs.