Merge lp:~mordred/nova/add-vlan-dep-trunk into lp:~openstack-ubuntu-packagers/nova/ubuntu

[Monty Taylor]

Adds vlan dep to nova-compute.

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-21 17:45:18 +0000
+++ debian/changelog	2011-09-21 21:58:22 +0000
@@ -20,8 +20,9 @@
 
   [ Monty Taylor ]
   * Add branching logic for building on lucid.
+  * Add vlan as a depend for nova-compute.
 
- -- Monty Taylor <[e-mail]>  Mon, 19 Sep 2011 17:03:29 -0400
+ -- Monty Taylor <[e-mail]>  Wed, 21 Sep 2011 17:49:43 -0400
 
 nova (2011.3~rc~20110909.r1155-0ubuntu1) oneiric; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2011-09-21 17:45:18 +0000
+++ debian/control	2011-09-21 21:58:22 +0000
@@ -125,8 +125,18 @@
 
 Package: nova-compute
 Architecture: all
-Depends: ${ostack-lsb-base}, ${nova-compute-deps}, nova-common (= ${binary:Version}), kpartx, curl, parted,
- ebtables, gawk, iptables, open-iscsi, ${nova-compute-default-hypervisor} | nova-compute-hypervisor,
+Depends: ${ostack-lsb-base},
+ ${nova-compute-deps},
+ ${nova-compute-default-hypervisor} | nova-compute-hypervisor,
+ nova-common (= ${binary:Version}),
+ curl,
+ ebtables,
+ gawk,
+ iptables,
+ kpartx,
+ open-iscsi,
+ parted,
+ vlan,
  ${python:Depends}, ${misc:Depends}
 Recommends: ajaxterm
 Description: OpenStack Compute - compute node