-
Committer:
Chuck Short
-
Date:
2012-02-29 20:08:26 UTC
-
mfrom:
(312.1.5 debian-merge)
-
Revision ID:
zulcss@ubuntu.com-20120229200826-3s2nektpbonk1dfs
* debain/control: Fix nova-compute-$flavor Depends
* debian/rules: Fix FTBFS.
* Merge Ubuntu/Debian packaging:
- Thanks to Julien Danjou, Ghe Rivero, and Thomas Goirand
- debian/copyright: Update copyright file.
- debian/nova-api.init, debian/nova-compute.init,
debian/nova-network.init, debian/nova-objectstore,
debian/nova-scheduler, debian/nova-volume.init:
Synchronize init scripts.
- nova-common.install, debian/rules: Install policy.json
- debian/rules, debian/nova-xcp-network.install,
debian/nova-xcp-plugins.install, nova-xcp-plugins.postrm,
debian/nova-xcp-plugins.doc, debian/nova-xcp-plugins.postinst,
debian/README.xcp_and_openstack, debian/control,
debian/ubuntu_xen-openvswitch-nova.rules,
debian/patches/path-to-the-xenhost.conf-fixup.patch:
Add Xen XCP support.
- debian/control,
debian/nova-compute-{kvm,lxc,qemu,xen,uml}.postinst: Make
nova-compute a virtual package.
- Dropped ubuntu_ubuntu_control_vars: We dont use it
* New upstream release.
* Dropped python-babel, it will be handled by langpacks.