Merge lp:~yolanda.robla/nova/grizzly into lp:~openstack-ubuntu-testing/nova/grizzly

[Yolanda Robla]

Added fixes to remove lintian warnings.
Only the following are still there:

W: nova-scheduler: binary-without-manpage usr/bin/nova-clear-rabbit-queues
W: nova-scheduler: binary-without-manpage usr/bin/nova-rpc-zmq-receiver

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-29 17:00:21 +0000
+++ debian/changelog	2012-11-30 19:47:20 +0000
@@ -35,6 +35,17 @@
     debian/nova-conductor.upstart.in: Add nova-conductor service.
   * debian/control: Add python-fixtures as a build deps.
 
+  [ Yolanda Robla ]
+  * debian/nova-common.docs: Installing changelogs from rules
+  * debian/rules: Replacing perms in /etc/nova/logging.conf for 0644
+  * debian/nova-compute-xcp.lintian-overrides: skip empty binary package warn
+  * debian/control: adduser dependency on nova-compute
+  * debian/control: added section oldlibs and priority extra on
+    nova-ajax-console-proxy
+  * debian/control: adding version number in nova-api breaks
+  * debian/nova-api-ec2.postrm
+  * nova-xvpvncproxy.postrm: removing because of duplicates
+
  -- Chuck Short <[e-mail]>  Fri, 23 Nov 2012 09:32:05 -0600
 
 nova (2012.2-0ubuntu5) quantal; urgency=low
 
=== modified file 'debian/control'
--- debian/control	2012-11-20 14:41:52 +0000
+++ debian/control	2012-11-30 19:47:20 +0000
@@ -157,7 +157,8 @@
  genisoimage,
  vlan,
  ${misc:Depends},
- ${python:Depends}
+ ${python:Depends},
+ adduser
 Suggests: guestmount
 Description: OpenStack Compute - compute node
  OpenStack is a reliable cloud infrastructure. Its mission is to produce
@@ -472,6 +473,8 @@
 
 Package: nova-ajax-console-proxy
 Architecture: all
+Section: oldlibs
+Priority: extra
 Depends: nova-common (= ${binary:Version}),
  ${misc:Depends},
  ${ostack-lsb-base},
@@ -705,7 +708,7 @@
  ${misc:Depends},
  ${ostack-lsb-base},
  ${python:Depends}
-Breaks: nova-api
+Breaks: nova-api (<< 2012.1~rc1-0ubuntu2)
 Description: OpenStack Compute - metadata API frontend
  OpenStack is a reliable cloud infrastructure. Its mission is to produce
  the ubiquitous cloud computing platform that will meet the needs of public
@@ -724,7 +727,7 @@
  ${misc:Depends},
  ${ostack-lsb-base},
  ${python:Depends}
-Breaks: nova-api
+Breaks: nova-api (<< 2012.1~rc1-0ubuntu2)
 Description: OpenStack Compute - OpenStack Compute API frontend
  OpenStack is a reliable cloud infrastructure. Its mission is to produce
  the ubiquitous cloud computing platform that will meet the needs of public
@@ -743,7 +746,7 @@
  ${misc:Depends},
  ${ostack-lsb-base},
  ${python:Depends}
-Breaks: nova-api
+Breaks: nova-api (<< 2012.1~rc1-0ubuntu2)
 Description: OpenStack Compute - OpenStack Volume API frontend
  OpenStack is a reliable cloud infrastructure. Its mission is to produce
  the ubiquitous cloud computing platform that will meet the needs of public
@@ -762,7 +765,7 @@
  ${misc:Depends},
  ${ostack-lsb-base},
  ${python:Depends}
-Breaks: nova-api
+Breaks: nova-api (<< 2012.1~rc1-0ubuntu2)
 Description: OpenStack Compute - EC2 API frontend
  OpenStack is a reliable cloud infrastructure. Its mission is to produce
  the ubiquitous cloud computing platform that will meet the needs of public
 
=== added file 'debian/nova-api-ec2.postrm'
--- debian/nova-api-ec2.postrm	1970-01-01 00:00:00 +0000
+++ debian/nova-api-ec2.postrm	2012-11-30 19:47:20 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+if [ "$1" = purge ]; then
+	update-rc.d nova-api-ec2 remove
+fi
+
+#DEBHELPER#
 
=== added file 'debian/nova-api-os-volume.lintian-overrides'
--- debian/nova-api-os-volume.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/nova-api-os-volume.lintian-overrides	2012-11-30 19:47:20 +0000
@@ -0,0 +1,1 @@
+nova-api-os-volume: breaks-without-version nova-api
 
=== removed file 'debian/nova-common.docs'
--- debian/nova-common.docs	2012-07-03 20:56:54 +0000
+++ debian/nova-common.docs	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-ChangeLog
 
=== added file 'debian/nova-compute-xcp.lintian-overrides'
--- debian/nova-compute-xcp.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/nova-compute-xcp.lintian-overrides	2012-11-30 19:47:20 +0000
@@ -0,0 +1,1 @@
+nova-compute-xcp: empty-binary-package
 
=== removed file 'debian/nova-xvpvncproxy.postrm'
--- debian/nova-xvpvncproxy.postrm	2012-10-02 19:34:36 +0000
+++ debian/nova-xvpvncproxy.postrm	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = purge ]; then
-	update-rc.d nova-xvpvncproxy remove
-fi
-
-#DEBHELPER#
 
=== modified file 'debian/rules'
--- debian/rules	2012-11-29 17:00:21 +0000
+++ debian/rules	2012-11-30 19:47:20 +0000
@@ -51,7 +51,7 @@
 	dh_install --fail-missing -Xbin/nova-all
 	chmod 440 $(CURDIR)/debian/nova-common/etc/sudoers.d/nova_sudoers
 	install -D -m 644 debian/source_nova.py debian/php5-common/usr/share/apport/package-hooks/source_nova.py
-	install -D -m 0655 $(CURDIR)/etc/nova/logging_sample.conf $(CURDIR)/debian/nova-common/etc/nova/logging.conf
+	install -D -m 0644 $(CURDIR)/etc/nova/logging_sample.conf $(CURDIR)/debian/nova-common/etc/nova/logging.conf
 	for hypervisor in qemu kvm xen uml lxc; do \
 		install -D -m 0600 $(CURDIR)/debian/nova-compute-$${hypervisor}.conf $(CURDIR)/debian/nova-compute-$${hypervisor}/etc/nova/nova-compute.conf; \
 	done
@@ -85,3 +85,6 @@
 	dh_installlogrotate
 	dh_installlogrotate --name=nova-manage
 	dh_installlogrotate --name=nova-dhcpbridge
+
+override_dh_installchangelogs:
+	dh_installchangelogs -k ChangeLog
 
=== added directory 'plugins'
=== added directory 'plugins/xenserver'
=== added directory 'plugins/xenserver/xenapi'
=== added directory 'plugins/xenserver/xenapi/etc'
=== added directory 'plugins/xenserver/xenapi/etc/xapi.d'
=== added directory 'plugins/xenserver/xenapi/etc/xapi.d/plugins'