Merge lp:~james-page/nova/fix-watch-file into lp:~openstack-ubuntu-testing/nova/raring-grizzly-proposed

[James Page]

Fixup watch file

Fixup watch file.

Unmerged revisions

561. By James Page on 2013-03-01

d/watch: Update uversionmangle to deal with upstream versioning
changes, remove tarballs.openstack.org.

560. By Chuck Short on 2013-02-28

* New upstream release.
* debian/patches/avoid_setuptools_git_dependency.patch: Refreshed.
* debian/control: Clean up dependencies:
  - Dropped python-gflags no longer needed.
  - Dropped python-daemon no longer needed.
  - Dropped python-glance no longer needed.
  - Dropped python-lockfile no longer needed.
  - Dropped python-simplejson no longer needed.
  - Dropped python-tempita no longer needed.
  - Dropped python-xattr no longer needed.

559. By Chuck Short on 2013-02-22

releasing version 2013.1.g3-0ubuntu1

558. By Chuck Short on 2013-02-20

debian/control: Suggest sysfsutils, sg3-utils, multipath-tools for fibre
channel support.

557. By Chuck Short on 2013-02-20

debian/control: Add python-oslo-config as a dependency.

556. By Chuck Short on 2013-02-12

* debian/nova-common.postinst: Removed config file conversion, since
  the option is no longer available. (LP: #1110567)
* debian/control: Add python-pyasn1 as a dependency.

555. By Chuck Short on 2013-02-12

Refresh patch

554. By Chuck Short on 2013-02-07

debian/nova-common.postinst: Removed config file conversion, since
the option is no longer available. (LP: #1110567)

553. By Chuck Short on 2013-01-31

debian/pyddist-overrides: Add websockify.

552. By Chuck Short on 2013-01-30

Resync with whats in the archive

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-20 15:45:24 +0000
+++ debian/changelog	2013-03-01 14:23:35 +0000
@@ -1,4 +1,119 @@
-nova (2013.1~g1~20121120.17206-0ubuntu1) UNRELEASED; urgency=low
+nova (2013.1.a4723.ge807e19-0ubuntu1) UNRELEASED; urgency=low
+
+  [ Chuck Short ]
+  * New upstream release.
+  * debian/patches/avoid_setuptools_git_dependency.patch: Refreshed.
+  * debian/control: Clean up dependencies:
+    - Dropped python-gflags no longer needed.
+    - Dropped python-daemon no longer needed.
+    - Dropped python-glance no longer needed.
+    - Dropped python-lockfile no longer needed.
+    - Dropped python-simplejson no longer needed.
+    - Dropped python-tempita no longer needed.
+    - Dropped python-xattr no longer needed.
+
+  [ James Page ]
+  * d/watch: Update uversionmangle to deal with upstream versioning
+    changes, remove tarballs.openstack.org. 
+
+ -- Chuck Short <[e-mail]>  Thu, 28 Feb 2013 09:00:15 -0600
+
+nova (2013.1.g3-0ubuntu1) raring; urgency=low
+
+  [ Chuck Short ]
+  * New usptream release. 
+  * debian/patches/debian/patches/fix-ubuntu-tests.patch: Refreshed.
+  * debian/nova-baremetal.logrotate: Fix logfile path.
+  * debian/control, debian/nova-spiceproxy.{install, logrotate, upstart}:
+    Add spice html5 proxy support.
+  * debian/nova-novncproxy.upstart: Start on runlevel [2345]
+  * debian/rules: Call testr directly since run_tests.sh -N gives weird return
+    value when tests pass.
+  * debian/pyddist-overrides: Add websockify.
+  * debian/nova-common.postinst: Removed config file conversion, since
+    the option is no longer available. (LP: #1110567)
+  * debian/control: Add python-pyasn1 as a dependency.
+  * debian/control: Add python-oslo-config as a dependency.
+  * debian/control: Suggest sysfsutils, sg3-utils, multipath-tools for fibre
+    channel support.
+
+  [ Adam Gandelman ]
+  * debian/control: Fix typo (websocikfy -> websockify).
+
+ -- Chuck Short <[e-mail]>  Fri, 22 Feb 2013 09:27:29 -0600
+
+nova (2013.1~g2-0ubuntu3) raring; urgency=low
+
+  * SECURITY UPDATE: fix lack of authentication on block device used for
+    os-volume_boot
+    - debian/patches/CVE-2013-0208.patch: adjust nova/compute/api.py to
+      validate we can access the volumes
+    - CVE-2013-0208
+
+ -- Jamie Strandboge <[e-mail]>  Thu, 24 Jan 2013 08:23:44 -0600
+
+nova (2013.1~g2-0ubuntu2) raring; urgency=low
+
+  * Make nova-compute-kvm prefer qemu-system over kvm for the new qemu.
+
+ -- Adam Conrad <[e-mail]>  Sat, 19 Jan 2013 07:00:56 -0700
+
+nova (2013.1~g2-0ubuntu1) raring; urgency=low
+
+  [ Chuck Short ]
+  * New upstream release.
+  * debian/patches/ubuntu-show-tests.patch: Dropped no longer needed.
+  * debian/nova-xcp-plugins.install: Fix xcp-plugins empty packages
+  * debian/control: Drop python-nose in favor or testrepository
+  * debian/control: Add python-coverage as a build dep.
+  * debian/rules, debian/control: Run pep8 tests.
+  * debian/*.init: Remove they are not needed and take up space
+  * debian/control, debian/nova-cells.{install, logrotate, upstart}: Add
+    cells support.
+  * debian/patches/fix-ubuntu-tests.patch: temporarily disable failing tests.
+  * debian/control, debian/nova-baremetal.{install, logrotate, upstart}: Add
+    nova baremetal support.
+  * debian/control: Remove python-support.
+
+  [ Adam Gandelman ]
+  * debian/*.manpages: Install Sphinx-generated manpages instead of
+    our own.
+  * debian/nova-compute-*.conf: Specify the newly required compute_driver
+    flag in addition to libvirt_type.
+  * debian/control:  Specify required python-webob and python-stevedore
+    versions.
+
+  [ Yolanda Robla ]
+  * debian/*.upstart: Use start-stop-daemon instead of su for chuid
+    (LP: #1086833).
+  * debian/rules: Remove override of dh_installinit for discriminating
+    between Debian and Ubuntu.
+  * debian/nova-common.docs: Installing changelogs from rules
+  * debian/rules: Replacing perms in /etc/nova/logging.conf for 0644
+  * debian/control: adduser dependency on nova-compute.
+  * debian/control: added section oldlibs and priority extra on
+    nova-ajax-console-proxy.
+  * debian/nova-xvpvncproxy.postrm: removing because of duplicates.
+
+  [ James Page ]
+  * d/control: Add ~ to python-sqlalchemy-ext versioned dependencies to
+    make backporting easier.
+  * d/control: Updated nova-volume description and depdendencies to
+    mark it as a transitional package, moved to oldlibs/extra.
+  * d/p/fix-libvirt-tests.patch: Dropped; accepted upstream.
+  * d/control: Added python-stevedore to BD's.
+  * d/*.postrm: Dropped postrm's that just run update-rc.d; this is not
+    required when deploying upstart configurations only.
+  * d/nova-scheduler.manpages: Add man page for nova-rpc-zmq-receiver.
+  * d/rules: Install upstream changelog with a policy compliant name.
+  * d/control: Mark nova-compute-xcp as virtual package.
+  * d/control: nova-api-os-volume; Depend on cinder-api and mark as
+    transitional package.
+  * d/nova-api-os-volume.lintian-overrides: Dropped - no longer required.
+
+ -- Chuck Short <[e-mail]>  Fri, 11 Jan 2013 13:06:56 -0600
+
+nova (2013.1~g1-0ubuntu1) raring; urgency=low
 
   [ Adam Gandelman ]
   * debian/control: Ensure novaclient is upgraded with nova,
@@ -27,7 +142,7 @@
     debian/nova-conductor.upstart.in: Add nova-conductor service.
   * debian/control: Add python-fixtures as a build deps.
 
- -- Adam Gandelman <[e-mail]>  Wed, 31 Oct 2012 13:49:10 +0100
+ -- Chuck Short <[e-mail]>  Fri, 23 Nov 2012 09:32:05 -0600
 
 nova (2012.2-0ubuntu5) quantal; urgency=low
 
@@ -36,7 +151,7 @@
     nova-volume.  Ensure it has proper permissions. (LP: #1065320)
   * debian/patches/avoid_setuptools_git_dependency.patch:  Remove
     setuptools_git from tools/pip-requires to avoid it being automatically
-    added to python-nova's runtime dependencies. (LP: #1059907) 
+    added to python-nova's runtime dependencies. (LP: #1059907)
 
   [ Chuck Short ]
   * debian/patches/rbd-security.patch: Support override of ceph rbd

=== modified file 'debian/control'
--- debian/control	2012-11-20 14:41:52 +0000
+++ debian/control	2013-03-01 14:23:35 +0000
@@ -6,7 +6,7 @@
 Uploaders: Soren Hansen <[e-mail]>, Thomas Goirand <[e-mail]>
 Build-Depends: debhelper (>= 7.0.50),
  python-all (>= 2.6),
- python-all-dev (>= 2.6.6-3~) | python-support
+ python-all-dev (>= 2.6.6-3~)
 Build-Depends-Indep: openssh-client,
  openssl,
  python-amqplib,
@@ -14,40 +14,38 @@
  python-carrot,
  python-cheetah,
  python-cinderclient,
+ python-coverage,
  python-crypto,
- python-daemon,
  python-distutils-extra,
  python-eventlet,
- python-fixtures,
+ python-fixtures (>= 0.3.12),
  python-feedparser,
- python-gflags,
- python-glance,
  python-glanceclient,
  python-iso8601,
  python-kombu,
- python-lockfile,
  python-lxml,
  python-migrate,
  python-mox,
  python-netaddr,
- python-nose,
  python-novaclient (>= 1:2.9.0),
+ python-oslo-config,
  python-paramiko,
  python-paste,
  python-pastedeploy (>= 1.5.0),
+ python-pyasn1,
  python-quantumclient,
  python-routes,
  python-setuptools,
  python-setuptools-git,
- python-simplejson,
+ python-stevedore (>= 0.7.2),
  python-sphinx (>> 1.0),
- python-sqlalchemy-ext ( >= 0.7.8-1) | python-sqlalchemy (<< 0.6.3-2),
+ python-sqlalchemy-ext ( >= 0.7.8-1~) | python-sqlalchemy (<< 0.6.3-2),
  python-suds,
- python-tempita,
- python-testtools,
+ python-testtools (>= 0.9.22),
  python-unittest2,
- python-webob,
- python-xattr
+ python-webob (>= 1.2.3),
+ pep8,
+ testrepository ( >= 0.0.8)
 Build-Conflicts: python-cjson
 Standards-Version: 3.9.3
 Homepage: http://launchpad.net/nova
@@ -85,10 +83,11 @@
  python-pycurl,
  python-routes,
  python-simplejson,
- python-sqlalchemy-ext ( >= 0.7.8-1) | python-sqlalchemy (<< 0.6.3-2),
+ python-sqlalchemy-ext ( >= 0.7.8-1~) | python-sqlalchemy (<< 0.6.3-2),
+ python-pyasn1,
  python-suds,
  python-tempita,
- python-webob,
+ python-webob (>= 1.2.3),
  python-xattr,
  sudo,
  ${misc:Depends},
@@ -157,8 +156,9 @@
  genisoimage,
  vlan,
  ${misc:Depends},
- ${python:Depends}
-Suggests: guestmount
+ ${python:Depends},
+ adduser
+Suggests: guestmount, sysfsutils, sg3-utils, multipath-tools
 Description: OpenStack Compute - compute node
  OpenStack is a reliable cloud infrastructure. Its mission is to produce
  the ubiquitous cloud computing platform that will meet the needs of public
@@ -282,7 +282,7 @@
 
 Package: nova-compute-kvm
 Architecture: all
-Depends: kvm,
+Depends: qemu-system (>= 1.3.0) | kvm,
  libvirt-bin,
  nova-compute (= ${binary:Version}),
  python-libvirt,
@@ -326,7 +326,7 @@
  (SQLite, MySQL, and PostgreSQL, for instance), different types of user
  databases (LDAP or SQL), etc.
  .
- Install this package on your compute nodes if you're using xcp
+ Install this dependency package on your compute nodes if you're using xcp
 
 Package: nova-xcp-plugins
 Architecture: all
@@ -450,9 +450,10 @@
  This is the Nova scheduler.
 
 Package: nova-volume
+Section: oldlibs
+Priority: extra
 Architecture: all
-Depends: cinder-volume, cinder-api, cinder-scheduler
-Suggests: ceph-common, sheepdog
+Depends: cinder-volume, cinder-api, cinder-scheduler, ${misc:Depends}
 Description: OpenStack Compute - storage
  OpenStack is a reliable cloud infrastructure. Its mission is to produce
  the ubiquitous cloud computing platform that will meet the needs of public
@@ -468,10 +469,12 @@
  (SQLite, MySQL, and PostgreSQL, for instance), different types of user
  databases (LDAP or SQL), etc.
  .
- This is the package you will install on your storage nodes.
+ This is a dummy transitional package that can be removed after upgrade.
 
 Package: nova-ajax-console-proxy
 Architecture: all
+Section: oldlibs
+Priority: extra
 Depends: nova-common (= ${binary:Version}),
  ${misc:Depends},
  ${ostack-lsb-base},
@@ -499,7 +502,7 @@
  ${misc:Depends},
  ${ostack-lsb-base},
  ${python:Depends}
-Suggests: novnc, websocikfy
+Suggests: novnc, websockify
 Description: OpenStack Compute - NoVNC proxy
  OpenStack is a reliable cloud infrastructure. Its mission is to produce
  the ubiquitous cloud computing platform that will meet the needs of public
@@ -542,6 +545,30 @@
  This package provides the VNC proxy. It is a publically reachable
  component which proxies access to VNCs running on compute nodes.
 
+Package: nova-spiceproxy
+Architecture: all
+Depends: nova-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${ostack-lsb-base},
+ ${python:Depends}
+Description: OpenStack Compute - spice html5 proxy
+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
+ the ubiquitous cloud computing platform that will meet the needs of public
+ and private cloud providers regardless of size, by being simple to implement
+ and massively scalable.
+ .
+ OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In
+ addition to its "native" API (the OpenStack API), it also supports the Amazon
+ EC2 API.
+ .
+ Nova is intended to be modular and easy to extend and adapt. It supports many
+ different hypervisors (KVM and Xen to name a few), different database backends
+ (SQLite, MySQL, and PostgreSQL, for instance), different types of user
+ databases (LDAP or SQL), etc.
+ .
+ This package provides the spice proxy. It is a publically reachable
+ component which proxies access to qemu-space running on compute nodes
+
 Package: nova-api
 Architecture: all
 Depends: nova-common (= ${binary:Version}),
@@ -738,12 +765,10 @@
  This package provides the OpenStack Compute API frontend.
 
 Package: nova-api-os-volume
+Section: oldlibs
+Priority: extra
 Architecture: all
-Depends: nova-common (= ${binary:Version}),
- ${misc:Depends},
- ${ostack-lsb-base},
- ${python:Depends}
-Breaks: nova-api
+Depends: cinder-api, ${misc:Depends}
 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
@@ -754,7 +779,7 @@
  addition to its "native" API (the OpenStack API), it also supports the Amazon
  EC2 API.
  .
- This package provides the OpenStack Volume API frontend.
+ This is a dummy transitional package that can be removed after upgrade.
 
 Package: nova-api-ec2
 Architecture: all
@@ -779,3 +804,49 @@
  databases (LDAP or SQL), etc.
  .
  This package provides the EC2 API.
+
+Package: nova-cells
+Architecture: all
+Depends: nova-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${ostack-lsb-base},
+ ${python:Depends}
+Description: Openstack Compute - cells
+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
+ the ubiquitous cloud computing platform that will meet the needs of public
+ and private cloud providers regardless of size, by being simple to implement
+ and massively scalable.
+ .
+ OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In
+ addition to its "native" API (the OpenStack API), it also supports the Amazon
+ EC2 API.
+ .
+ Nova is intended to be modular and easy to extend and adapt. It supports many
+ different hypervisors (KVM and Xen to name a few), different database backends
+ (SQLite, MySQL, and PostgreSQL, for instance), different types of user
+ databases (LDAP or SQL), etc.
+ .
+ This is the Nova cells component.
+
+Package: nova-baremetal
+Architecture: all
+Depends: nova-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${ostack-lsb-base},
+ ${python:Depends}
+Description: Openstack Compute - baremetal virt
+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
+ the ubiquitous cloud computing platform that will meet the needs of public
+ and private cloud providers regardless of size, by being simple to implement
+ and massively scalable.
+ .
+ OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In
+ addition to its "native" API (the OpenStack API), it also supports the Amazon
+ EC2 API.
+ .
+ Nova is intended to be modular and easy to extend and adapt. It supports many
+ different hypervisors (KVM and Xen to name a few), different database backends
+ (SQLite, MySQL, and PostgreSQL, for instance), different types of user
+ databases (LDAP or SQL), etc.
+ .
+ This is the baremetal virt component.

=== removed directory 'debian/mans'
=== removed file 'debian/mans/nova-ajax-console-proxy.8'
--- debian/mans/nova-ajax-console-proxy.8	2012-06-05 23:34:09 +0000
+++ debian/mans/nova-ajax-console-proxy.8	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-.TH nova\-ajax\-console\-proxy 8
-.SH NAME
-nova\-ajax\-console\-proxy \- nova ajax console proxy
-
-.SH SYNOPSIS
-.B nova\-ajax\-console\-proxy
-.B \-\-config-file=<config-filepath>
-
-.SH DESCRIPTION
-.B nova\-ajax\-console\-proxy
-
-This man page is a stub. Please contribute.
-
-.SH PARAMETERS
-
-.LP
-.B \-\-config-file=<config-filepath>
-.IP
-
-Path to the file containing options.

=== removed file 'debian/mans/nova-api-ec2.8'
--- debian/mans/nova-api-ec2.8	2012-06-05 23:34:09 +0000
+++ debian/mans/nova-api-ec2.8	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-.TH nova\-api\-ec2.8
-.SH NAME
-nova\-api\-ec2 \- frontend EC2 API server for Nova
-
-.SH SYNOPSIS
-.B nova\-api\-ec2
-.B \-\-config-file=<config-filepath>
-
-.SH DESCRIPTION
-.B nova\-api\-ec2
-
-This man page is a stub. Please contribute.
-
-.SH PARAMETERS
-
-.LP
-.B \-\-config-file=<config-filepath>
-.IP
-
-Path to the file containing options.

=== removed file 'debian/mans/nova-api-metadata.8'
--- debian/mans/nova-api-metadata.8	2012-06-05 23:34:09 +0000
+++ debian/mans/nova-api-metadata.8	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-.TH nova\-api\-metadata.8
-.SH NAME
-nova\-api\-metadata \- frontend metadata API server for Nova
-
-.SH SYNOPSIS
-.B nova\-api\-metadata
-.B \-\-config-file=<config-filepath>
-
-.SH DESCRIPTION
-.B nova\-api\-metadata
-
-This man page is a stub. Please contribute.
-
-.SH PARAMETERS
-
-.LP
-.B \-\-config-file=<config-filepath>
-.IP
-
-Path to the file containing options.

=== removed file 'debian/mans/nova-api-os-compute.8'
--- debian/mans/nova-api-os-compute.8	2012-06-05 23:34:09 +0000
+++ debian/mans/nova-api-os-compute.8	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-.TH nova\-api\-os\-compute 8
-.SH NAME
-nova\-api\-os\-compute \- frontend API server for Nova Compute 
-
-.SH SYNOPSIS
-.B nova\-api\-os\-compute
-.B \-\-config-file=<config-filepath>
-
-.SH DESCRIPTION
-.B nova\-api\-os\-compute
-
-This man page is a stub. Please contribute.
-
-.SH PARAMETERS
-
-.LP
-.B \-\-config-file=<config-filepath>
-.IP
-
-Path to the file containing options.

=== removed file 'debian/mans/nova-api-os-volume.8'
--- debian/mans/nova-api-os-volume.8	2012-06-05 23:34:09 +0000
+++ debian/mans/nova-api-os-volume.8	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-.TH nova\-api\-os\-volume 8
-.SH NAME
-nova\-api\-os\-volume \- frontend API server for Nova Volume
-
-.SH SYNOPSIS
-.B nova\-api\-os\-volume
-.B \-\-config-file=<config-filepath>
-
-.SH DESCRIPTION
-.B nova\-api\-os\-volume
-
-This man page is a stub. Please contribute.
-
-.SH PARAMETERS
-
-.LP
-.B \-\-config-file=<config-filepath>
-.IP
-
-Path to the file containing options.

=== removed file 'debian/mans/nova-api.8'
--- debian/mans/nova-api.8	2012-06-05 23:34:09 +0000
+++ debian/mans/nova-api.8	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-.TH nova\-api 8
-.SH NAME
-nova\-api \- frontend API server for Nova
-
-.SH SYNOPSIS
-.B nova\-api
-.B \-\-config-file=<config-filepath>
-
-.SH DESCRIPTION
-.B nova\-api
-
-This man page is a stub. Please contribute.
-
-.SH PARAMETERS
-
-.LP
-.B \-\-config-file=<config-filepath>
-.IP
-
-Path to the file containing options.

=== removed file 'debian/mans/nova-cert.8'
--- debian/mans/nova-cert.8	2012-06-05 23:34:09 +0000
+++ debian/mans/nova-cert.8	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-.TH nova\-cert 8
-.SH NAME
-nova\-cert \- Manages x509 certificates for Nova
-
-.SH SYNOPSIS
-.B nova\-cert
-.B \-\-config-file=<config-filepath>
-
-.SH DESCRIPTION
-.B nova\-cert
-
-This man page is a stub. Please contribute.
-
-.SH PARAMETERS
-
-.LP
-.B \-\-config-file=<config-filepath>
-.IP
-
-Path to the file containing options.

=== removed file 'debian/mans/nova-compute.8'
--- debian/mans/nova-compute.8	2012-06-05 23:34:09 +0000
+++ debian/mans/nova-compute.8	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-.TH nova\-compute 8
-.SH NAME
-nova\-compute \- provides compute server resources for the openstack cloud computing system
-
-.SH SYNOPSIS
-.B nova-compute
-.B \-\-config-file=<config-filepath>
-
-.SH DESCRIPTION
-.B nova\-compute
-
-This man page is a stub. Please contribute.
-
-.SH PARAMETERS
-
-.LP
-.B \-\-config-file=<config-filepath>
-.IP
-
-Path to the file containing options.

=== removed file 'debian/mans/nova-conductor.8'
--- debian/mans/nova-conductor.8	2012-11-20 14:11:24 +0000
+++ debian/mans/nova-conductor.8	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-.TH nova\-conductor 8
-.SH NAME
-nova\-conductor\- compute services management
-
-.SH SYNOPSIS
-.B nova\-conductor
-.B \-\-config-file=<config-filepath>
-
-.SH DESCRIPTION
-.B nova\-conductor
-
-This man page is a stub. Please contribute.
-
-.SH PARAMETERS
-
-.LP
-.B \-\-config-file=<config-filepath>
-.IP
-
-Path to the file containing options.

=== removed file 'debian/mans/nova-console.8'
--- debian/mans/nova-console.8	2012-06-05 23:34:09 +0000
+++ debian/mans/nova-console.8	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-.TH nova\-console 8
-.SH NAME
-nova\-console \- nova VNC console proxy
-
-.SH SYNOPSIS
-.B nova\-console
-.B \-\-config-file=<config-filepath>
-
-.SH DESCRIPTION
-.B nova\-console
-
-This man page is a stub. Please contribute.
-
-.SH PARAMETERS
-
-.LP
-.B \-\-config-file=<config-filepath>
-.IP
-
-Path to the file containing options.

=== removed file 'debian/mans/nova-consoleauth.8'
--- debian/mans/nova-consoleauth.8	2012-06-05 23:34:09 +0000
+++ debian/mans/nova-consoleauth.8	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-.TH nova\-consoleauth 8
-.SH NAME
-nova\-console \- nova VNC console authenticator 
-
-.SH SYNOPSIS
-.B nova\-consoleauth
-.B \-\-config-file=<config-filepath>
-
-.SH DESCRIPTION
-.B nova\-consoleauth
-
-This man page is a stub. Please contribute.
-
-.SH PARAMETERS
-
-.LP
-.B \-\-config-file=<config-filepath>
-.IP
-
-Path to the file containing options.

=== removed file 'debian/mans/nova-dhcpbridge.8'
--- debian/mans/nova-dhcpbridge.8	2011-04-14 05:56:46 +0000
+++ debian/mans/nova-dhcpbridge.8	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-.TH nova\-dhcpbridge 8
-.SH NAME
-nova\-dhcpbridge \- Manage nova\-network DHCP bridge
-
-.SH DESCRIPTION
-.B nova\-dhcpbridge
-
-This man page is a stub. Please contribute.

=== removed file 'debian/mans/nova-network.8'
--- debian/mans/nova-network.8	2012-06-05 23:34:09 +0000
+++ debian/mans/nova-network.8	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-.TH nova\-compute 8
-.SH NAME
-nova\-network \- provides network ressources (connectivity and IP addresses)
-
-.SH SYNOPSIS
-.B nova-compute
-.B \-\-config-file=<config-filepath>
-
-.SH DESCRIPTION
-.B nova-network
-
-This man page is a stub. Please contribute.
-
-.SH PARAMETERS
-
-.LP
-.B \-\-config-file=<config-filepath>
-.IP
-
-Path to the file containing options.

=== removed file 'debian/mans/nova-novncproxy.8'
--- debian/mans/nova-novncproxy.8	2012-10-02 19:34:36 +0000
+++ debian/mans/nova-novncproxy.8	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-.TH nova\-compute 8
-.SH NAME
-nova\-compute \- provides compute server resources for the openstack cloud computing system
-
-.SH SYNOPSIS
-.B nova-compute
-.B \-\-config-file=<config-filepath>
-
-.SH DESCRIPTION
-.B nova\-compute
-
-This man page is a stub. Please contribute.
-
-.SH PARAMETERS
-
-.LP
-.B \-\-config-file=<config-filepath>
-.IP
-
-Path to the file containing options.

=== removed file 'debian/mans/nova-objectstore.8'
--- debian/mans/nova-objectstore.8	2012-06-05 23:34:09 +0000
+++ debian/mans/nova-objectstore.8	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-.TH nova\-objectstore 8
-.SH NAME
-nova\-objectstore \- provides virtual machine storage functionalities
-
-.SH SYNOPSIS
-.B nova-objectstore
-.B \-\-config-file=<config-filepath>
-
-.SH DESCRIPTION
-.B nova\-objectstore
-
-This man page is a stub. Please contribute.
-
-.SH PARAMETERS
-
-.LP
-.B \-\-config-file=<config-filepath>
-.IP
-
-Path to the file containing options.

=== removed file 'debian/mans/nova-rootwrap.8'
--- debian/mans/nova-rootwrap.8	2012-03-30 23:49:25 +0000
+++ debian/mans/nova-rootwrap.8	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-.TH nova\-rootwrap 8
-.SH NAME
-nova\-rootwrap \- Authorizes and executes sudo commands on Nova's behalf
-
-.SH SYNOPSIS
-.B nova\-rootwrap
-.B <command>
-
-.SH DESCRIPTION
-.B nova\-rootwrap
-
-This man page is a stub. Please contribute.
-
-.SH PARAMETERS
-
-.LP
-.B <command> 
-.IP
-
-Command to be executed with sudo

=== removed file 'debian/mans/nova-scheduler.8'
--- debian/mans/nova-scheduler.8	2012-06-05 23:34:09 +0000
+++ debian/mans/nova-scheduler.8	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-.TH nova\-scheduler 8
-.SH NAME
-nova\-scheduler \- Schedules instances, volumes, etc. for Nova
-
-.SH SYNOPSIS
-.B nova\-scheduler
-.B \-\-config-file=<config-filepath>
-
-.SH DESCRIPTION
-.B nova\-scheduler
-
-This man page is a stub. Please contribute.
-
-.SH PARAMETERS
-
-.LP
-.B \-\-config-file=<config-filepath>
-.IP
-
-Path to the file containing options.

=== removed file 'debian/mans/nova-volume.8'
--- debian/mans/nova-volume.8	2012-06-05 23:34:09 +0000
+++ debian/mans/nova-volume.8	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-.TH nova\-volume 8
-.SH NAME
-nova\-volume \- provides EBS like storage for your virtual machine instances
-
-.SH SYNOPSIS
-.B nova\-volume
-.B \-\-config-file=<config-filepath>
-
-.SH DESCRIPTION
-.B nova\-volume
-
-Nova-volume provides storage for your virtual machine instances.
-These could be a partition on your VM, and can be a persistent storage.
-This man page is a stub. Please contribute.
-
-.SH PARAMETERS
-
-.LP
-.B \-\-config-file=<config-filepath>
-.IP
-
-Path to the file containing options.

=== removed file 'debian/mans/nova-xvpvncproxy.8'
--- debian/mans/nova-xvpvncproxy.8	2012-10-02 19:34:36 +0000
+++ debian/mans/nova-xvpvncproxy.8	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-.TH nova\-xvpvncproxy 8
-.SH NAME
-nova\-xvpvncproxy \- nova XVP VNC console proxy
-
-.SH SYNOPSIS
-.B nova\-xvpvncproxy
-.B \-\-config-file=<config-filepath>
-
-.SH DESCRIPTION
-.B nova\-xvpvncproxy
-
-This man page is a stub. Please contribute.
-
-.SH PARAMETERS
-
-.LP
-.B \-\-config-file=<config-filepath>
-.IP
-
-Path to the file containing options.

=== removed file 'debian/nova-api-ec2.init'
--- debian/nova-api-ec2.init	2012-06-05 23:34:09 +0000
+++ debian/nova-api-ec2.init	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          nova-api-ec2
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: nova-api EC2 server
-# Description:       frontend EC2 API server for Nova
-### END INIT INFO
-
-
-set -e
-
-DAEMON=/usr/bin/nova-api-ec2
-DAEMON_ARGS="--config-file=/etc/nova/nova.conf"
-PIDFILE=/var/run/nova/nova-api-ec2.pid
-
-ENABLED=true
-
-if test -f /etc/default/nova-api-ec2; then
-  . /etc/default/nova-api-ec2
-fi
-
-mkdir -p /var/run/nova
-chown nova:root /var/run/nova/
-
-mkdir -p /var/lock/nova
-chown nova:root /var/lock/nova/
-
-uid="$(getent passwd nova | cut -f3 -d:)"
-gid="$(getent passwd nova | cut -f4 -d:)"
-
-. /lib/lsb/init-functions
-
-export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
-
-if ! [ -x ${DAEMON} ] ; then
-	exit 0
-fi
-
-case "$1" in
-  start)
-    test "$ENABLED" = "true" || exit 0
-    log_daemon_msg "Starting nova ec2 api" "nova-api-ec2"
-    start-stop-daemon --start --chdir /var/run --chuid ${uid}:${gid} -b -m --pidfile ${PIDFILE} --exec ${DAEMON} -- ${DAEMON_ARGS}
-    log_end_msg $?
-    ;;
-  stop)
-    test "$ENABLED" = "true" || exit 0
-    log_daemon_msg "Stopping nova ec2 api" "nova-api-ec2"
-    start-stop-daemon --stop --oknodo --pidfile ${PIDFILE}
-    log_end_msg $?
-    ;;
-  # Could we implement a reload if the daemon traps the -HUP signal? This would be done with:
-  # reload)
-  #   start-stop-daemon --stop --signal HUP --pidfile ${PID_FILE}
-  #   ;;
-  restart|force-reload)
-    test "$ENABLED" = "true" || exit 1
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  status)
-    test "$ENABLED" = "true" || exit 0
-    # This is to be fixed: it doesn't exist in Debian
-    status_of_proc -p $PIDFILE $DAEMON nova-api && exit 0 || exit $?
-    ;;
-  *)
-    log_action_msg "Usage: /etc/init.d/nova-api-ec2 {start|stop|restart|force-reload|status}"
-    exit 1
-    ;;
-esac
-
-exit 0

=== modified file 'debian/nova-api-ec2.manpages'
--- debian/nova-api-ec2.manpages	2012-03-30 23:49:25 +0000
+++ debian/nova-api-ec2.manpages	2013-03-01 14:23:35 +0000
@@ -1,1 +1,1 @@
-debian/mans/nova-api-ec2.8
+doc/build/man/nova-api-ec2.1

=== added file 'debian/nova-api-ec2.upstart'
--- debian/nova-api-ec2.upstart	1970-01-01 00:00:00 +0000
+++ debian/nova-api-ec2.upstart	2013-03-01 14:23:35 +0000
@@ -0,0 +1,18 @@
+description "Nova EC2 API server"
+author "Joe Heck <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+
+chdir /var/run
+
+pre-start script
+	mkdir -p /var/run/nova
+	chown nova:root /var/run/nova/
+
+	mkdir -p /var/lock/nova
+	chown nova:root /var/lock/nova/
+end script
+
+exec start-stop-daemon --start --chuid nova --exec /usr/bin/nova-api-ec2 -- --config-file=/etc/nova/nova.conf

=== removed file 'debian/nova-api-ec2.upstart.in'
--- debian/nova-api-ec2.upstart.in	2012-08-23 14:04:37 +0000
+++ debian/nova-api-ec2.upstart.in	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-description "Nova EC2 API server"
-author "Joe Heck <[e-mail]>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-
-chdir /var/run
-
-pre-start script
-	mkdir -p /var/run/nova
-	chown nova:root /var/run/nova/
-
-	mkdir -p /var/lock/nova
-	chown nova:root /var/lock/nova/
-end script
-
-exec su -s /bin/sh -c "exec nova-api-ec2 --config-file=/etc/nova/nova.conf" nova

=== removed file 'debian/nova-api-metadata.init'
--- debian/nova-api-metadata.init	2012-06-05 23:34:09 +0000
+++ debian/nova-api-metadata.init	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          nova-api-metadata
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: nova-api metadata server
-# Description:       frontend Metadata API server for Nova
-### END INIT INFO
-
-
-set -e
-
-DAEMON=/usr/bin/nova-api-metadata
-DAEMON_ARGS="--config-file=/etc/nova/nova.conf"
-PIDFILE=/var/run/nova/nova-api-metadata.pid
-
-ENABLED=true
-
-if test -f /etc/default/nova-api-metadata; then
-  . /etc/default/nova-api-metadata
-fi
-
-mkdir -p /var/run/nova
-chown nova:root /var/run/nova/
-
-mkdir -p /var/lock/nova
-chown nova:root /var/lock/nova/
-
-uid="$(getent passwd nova | cut -f3 -d:)"
-gid="$(getent passwd nova | cut -f4 -d:)"
-
-. /lib/lsb/init-functions
-
-export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
-
-if ! [ -x ${DAEMON} ] ; then
-	exit 0
-fi
-
-case "$1" in
-  start)
-    test "$ENABLED" = "true" || exit 0
-    log_daemon_msg "Starting nova metadata api" "nova-api-metadata"
-    start-stop-daemon --start --chdir /var/run --chuid ${uid}:${gid} -b -m --pidfile ${PIDFILE} --exec ${DAEMON} -- ${DAEMON_ARGS}
-    log_end_msg $?
-    ;;
-  stop)
-    test "$ENABLED" = "true" || exit 0
-    log_daemon_msg "Stopping nova metdata api" "nova-api-metadata"
-    start-stop-daemon --stop --oknodo --pidfile ${PIDFILE}
-    log_end_msg $?
-    ;;
-  # Could we implement a reload if the daemon traps the -HUP signal? This would be done with:
-  # reload)
-  #   start-stop-daemon --stop --signal HUP --pidfile ${PID_FILE}
-  #   ;;
-  restart|force-reload)
-    test "$ENABLED" = "true" || exit 1
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  status)
-    test "$ENABLED" = "true" || exit 0
-    # This is to be fixed: it doesn't exist in Debian
-    status_of_proc -p $PIDFILE $DAEMON nova-api && exit 0 || exit $?
-    ;;
-  *)
-    log_action_msg "Usage: /etc/init.d/nova-api-metadata {start|stop|restart|force-reload|status}"
-    exit 1
-    ;;
-esac
-
-exit 0

=== modified file 'debian/nova-api-metadata.manpages'
--- debian/nova-api-metadata.manpages	2012-03-30 23:49:25 +0000
+++ debian/nova-api-metadata.manpages	2013-03-01 14:23:35 +0000
@@ -1,1 +1,1 @@
-debian/mans/nova-api-metadata.8
+doc/build/man/nova-api-metadata.1

=== removed file 'debian/nova-api-metadata.postrm'
--- debian/nova-api-metadata.postrm	2012-09-14 12:15:44 +0000
+++ debian/nova-api-metadata.postrm	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = purge ]; then
-	update-rc.d nova-api-metadata remove
-fi
-
-#DEBHELPER#

=== added file 'debian/nova-api-metadata.upstart'
--- debian/nova-api-metadata.upstart	1970-01-01 00:00:00 +0000
+++ debian/nova-api-metadata.upstart	2013-03-01 14:23:35 +0000
@@ -0,0 +1,18 @@
+description "Nova Metadata API server"
+author "Joe Heck <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+
+chdir /var/run
+
+pre-start script
+	mkdir -p /var/run/nova
+	chown nova:root /var/run/nova/
+
+	mkdir -p /var/lock/nova
+	chown nova:root /var/lock/nova/
+end script
+
+exec start-stop-daemon --start --chuid nova --exec /usr/bin/nova-api-metadata -- --config-file=/etc/nova/nova.conf

=== removed file 'debian/nova-api-metadata.upstart.in'
--- debian/nova-api-metadata.upstart.in	2012-08-23 14:04:37 +0000
+++ debian/nova-api-metadata.upstart.in	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-description "Nova Metadata API server"
-author "Joe Heck <[e-mail]>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-
-chdir /var/run
-
-pre-start script
-	mkdir -p /var/run/nova
-	chown nova:root /var/run/nova/
-
-	mkdir -p /var/lock/nova
-	chown nova:root /var/lock/nova/
-end script
-
-exec su -s /bin/sh -c "exec nova-api-metadata --config-file=/etc/nova/nova.conf" nova

=== removed file 'debian/nova-api-os-compute.init'
--- debian/nova-api-os-compute.init	2012-06-05 23:34:09 +0000
+++ debian/nova-api-os-compute.init	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          nova-api-os-compute
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: nova-api compute openstack server
-# Description:       frontend OpenStack Compute API server for Nova
-### END INIT INFO
-
-
-set -e
-
-DAEMON=/usr/bin/nova-api-os-compute
-DAEMON_ARGS="--config-file=/etc/nova/nova.conf"
-PIDFILE=/var/run/nova/nova-api-os-compute.pid
-
-ENABLED=true
-
-if test -f /etc/default/nova-api-os-compute; then
-  . /etc/default/nova-api-os-compute
-fi
-
-mkdir -p /var/run/nova
-chown nova:root /var/run/nova/
-
-mkdir -p /var/lock/nova
-chown nova:root /var/lock/nova/
-
-uid="$(getent passwd nova | cut -f3 -d:)"
-gid="$(getent passwd nova | cut -f4 -d:)"
-
-. /lib/lsb/init-functions
-
-export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
-
-if ! [ -x ${DAEMON} ] ; then
-	exit 0
-fi
-
-case "$1" in
-  start)
-    test "$ENABLED" = "true" || exit 0
-    log_daemon_msg "Starting nova openstack compute api" "nova-api-os-compute"
-    start-stop-daemon --start --chdir /var/run --chuid ${uid}:${gid} -b -m --pidfile ${PIDFILE} --exec ${DAEMON} -- ${DAEMON_ARGS}
-    log_end_msg $?
-    ;;
-  stop)
-    test "$ENABLED" = "true" || exit 0
-    log_daemon_msg "Stopping nova openstack compute api" "nova-api-os-compute"
-    start-stop-daemon --stop --oknodo --pidfile ${PIDFILE}
-    log_end_msg $?
-    ;;
-  # Could we implement a reload if the daemon traps the -HUP signal? This would be done with:
-  # reload)
-  #   start-stop-daemon --stop --signal HUP --pidfile ${PID_FILE}
-  #   ;;
-  restart|force-reload)
-    test "$ENABLED" = "true" || exit 1
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  status)
-    test "$ENABLED" = "true" || exit 0
-    # This is to be fixed: it doesn't exist in Debian
-    status_of_proc -p $PIDFILE $DAEMON nova-api-os-compute && exit 0 || exit $?
-    ;;
-  *)
-    log_action_msg "Usage: /etc/init.d/nova-api-os-compute {start|stop|restart|force-reload|status}"
-    exit 1
-    ;;
-esac
-
-exit 0

=== modified file 'debian/nova-api-os-compute.manpages'
--- debian/nova-api-os-compute.manpages	2012-03-30 23:49:25 +0000
+++ debian/nova-api-os-compute.manpages	2013-03-01 14:23:35 +0000
@@ -1,1 +1,1 @@
-debian/mans/nova-api-os-compute.8
+doc/build/man/nova-api-os-compute.1

=== removed file 'debian/nova-api-os-compute.postrm'
--- debian/nova-api-os-compute.postrm	2012-09-14 12:15:44 +0000
+++ debian/nova-api-os-compute.postrm	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = purge ]; then
-	update-rc.d nova-api-os-compute remove
-fi
-
-#DEBHELPER#

=== added file 'debian/nova-api-os-compute.upstart'
--- debian/nova-api-os-compute.upstart	1970-01-01 00:00:00 +0000
+++ debian/nova-api-os-compute.upstart	2013-03-01 14:23:35 +0000
@@ -0,0 +1,18 @@
+description "Nova OpenStack Compute API server"
+author "Joe Heck <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+
+chdir /var/run
+
+pre-start script
+	mkdir -p /var/run/nova
+	chown nova:root /var/run/nova/
+
+	mkdir -p /var/lock/nova
+	chown nova:root /var/lock/nova/
+end script
+
+exec start-stop-daemon --start --chuid nova --exec /usr/bin/nova-api-os-compute -- --config-file=/etc/nova/nova.conf

=== removed file 'debian/nova-api-os-compute.upstart.in'
--- debian/nova-api-os-compute.upstart.in	2012-08-23 14:04:37 +0000
+++ debian/nova-api-os-compute.upstart.in	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-description "Nova OpenStack Compute API server"
-author "Joe Heck <[e-mail]>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-
-chdir /var/run
-
-pre-start script
-	mkdir -p /var/run/nova
-	chown nova:root /var/run/nova/
-
-	mkdir -p /var/lock/nova
-	chown nova:root /var/lock/nova/
-end script
-
-exec su -s /bin/sh -c "exec nova-api-os-compute --config-file=/etc/nova/nova.conf" nova

=== removed file 'debian/nova-api.init'
--- debian/nova-api.init	2012-06-05 23:34:09 +0000
+++ debian/nova-api.init	1970-01-01 00:00:00 +0000
@@ -1,97 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          nova-api
-# Required-Start:    $network $local_fs $remote_fs $syslog
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Nova API server
-# Description:       Frontend Nova API server
-### END INIT INFO
-
-# Author: Julien Danjou <[e-mail]>
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="OpenStack Compute API"
-NAME=nova-api
-DAEMON=/usr/bin/nova-api
-DAEMON_ARGS="--config-file=/etc/nova/nova.conf"
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-NOVA_USER=nova
-LOCK_DIR=/var/lock/nova/
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-mkdir -p ${LOCK_DIR}
-chown ${NOVA_USER} ${LOCK_DIR}
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-. /lib/lsb/init-functions
-
-do_start()
-{
-	start-stop-daemon --start --background --quiet --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null \
-		|| return 1
-	start-stop-daemon --start --background --quiet --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON -- \
-		$DAEMON_ARGS \
-		|| return 2
-}
-
-do_stop()
-{
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
-	RETVAL="$?"
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-case "$1" in
-  start)
-    log_daemon_msg "Starting $DESC " "$NAME"
-    do_start
-    case "$?" in
-		0|1) log_end_msg 0 ;;
-		2) log_end_msg 1 ;;
-	esac
-  ;;
-  stop)
-	log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) log_end_msg 0 ;;
-		2) log_end_msg 1 ;;
-	esac
-	;;
-  status)
-       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-       ;;
-  restart|force-reload)
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-		# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-:

=== modified file 'debian/nova-api.manpages'
--- debian/nova-api.manpages	2011-04-15 15:09:24 +0000
+++ debian/nova-api.manpages	2013-03-01 14:23:35 +0000
@@ -1,1 +1,1 @@
-debian/mans/nova-api.8
+doc/build/man/nova-api.1

=== removed file 'debian/nova-api.postrm'
--- debian/nova-api.postrm	2012-09-14 12:15:44 +0000
+++ debian/nova-api.postrm	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = purge ]; then
-	update-rc.d nova-api remove
-fi
-
-#DEBHELPER#

=== added file 'debian/nova-api.upstart'
--- debian/nova-api.upstart	1970-01-01 00:00:00 +0000
+++ debian/nova-api.upstart	2013-03-01 14:23:35 +0000
@@ -0,0 +1,18 @@
+description "Nova API server"
+author "Soren Hansen <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+
+chdir /var/run
+
+pre-start script
+	mkdir -p /var/run/nova
+	chown nova:root /var/run/nova/
+
+	mkdir -p /var/lock/nova
+	chown nova:root /var/lock/nova/
+end script
+
+exec start-stop-daemon --start --chuid nova --exec /usr/bin/nova-api -- --config-file=/etc/nova/nova.conf

=== removed file 'debian/nova-api.upstart.in'
--- debian/nova-api.upstart.in	2012-08-23 14:04:37 +0000
+++ debian/nova-api.upstart.in	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-description "Nova API server"
-author "Soren Hansen <[e-mail]>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-
-chdir /var/run
-
-pre-start script
-	mkdir -p /var/run/nova
-	chown nova:root /var/run/nova/
-
-	mkdir -p /var/lock/nova
-	chown nova:root /var/lock/nova/
-end script
-
-exec su -s /bin/sh -c "exec nova-api --config-file=/etc/nova/nova.conf" nova

=== added file 'debian/nova-baremetal.install'
--- debian/nova-baremetal.install	1970-01-01 00:00:00 +0000
+++ debian/nova-baremetal.install	2013-03-01 14:23:35 +0000
@@ -0,0 +1,2 @@
+usr/bin/nova-baremetal-manage
+usr/bin/nova-baremetal-deploy-helper

=== added file 'debian/nova-baremetal.logrotate'
--- debian/nova-baremetal.logrotate	1970-01-01 00:00:00 +0000
+++ debian/nova-baremetal.logrotate	2013-03-01 14:23:35 +0000
@@ -0,0 +1,7 @@
+/var/log/nova/nova-baremetal.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}

=== added file 'debian/nova-baremetal.upstart'
--- debian/nova-baremetal.upstart	1970-01-01 00:00:00 +0000
+++ debian/nova-baremetal.upstart	2013-03-01 14:23:35 +0000
@@ -0,0 +1,18 @@
+description "Nova baremetal"
+author "Chuck Short <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+
+chdir /var/run
+
+pre-start script
+	mkdir -p /var/run/nova
+	chown nova:root /var/run/nova/
+
+	mkdir -p /var/lock/nova
+	chown nova:root /var/lock/nova/
+end script
+
+exec start-stop-daemon --start --chuid nova --exec /usr/bin/nova-baremetal-deploy-helper -- --config-file=/etc/nova/nova.conf

=== added file 'debian/nova-cells.install'
--- debian/nova-cells.install	1970-01-01 00:00:00 +0000
+++ debian/nova-cells.install	2013-03-01 14:23:35 +0000
@@ -0,0 +1,1 @@
+usr/bin/nova-cells

=== added file 'debian/nova-cells.logrotate'
--- debian/nova-cells.logrotate	1970-01-01 00:00:00 +0000
+++ debian/nova-cells.logrotate	2013-03-01 14:23:35 +0000
@@ -0,0 +1,7 @@
+/var/log/nova/nova-cells.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}

=== added file 'debian/nova-cells.upstart'
--- debian/nova-cells.upstart	1970-01-01 00:00:00 +0000
+++ debian/nova-cells.upstart	2013-03-01 14:23:35 +0000
@@ -0,0 +1,17 @@
+description "Nova cells"
+author "Chuck Short <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+chdir /var/run
+
+pre-start script
+	mkdir -p /var/run/nova
+	chown nova:root /var/run/nova/
+
+	mkdir -p /var/lock/nova
+	chown nova:Root /var/lock nova
+end script
+
+exec start-stop-daemon --start --chuid nova --exec /usr/bin/nova-cells -- --config-file=/etc/nova/nova.conf

=== removed file 'debian/nova-cert.init'
--- debian/nova-cert.init	2012-06-05 23:34:09 +0000
+++ debian/nova-cert.init	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          nova-cert
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: nova-cert
-# Description:       Schedules instances, volumes, etc. for Nova
-### END INIT INFO
-
-
-set -e
-
-DAEMON=/usr/bin/nova-cert
-DAEMON_ARGS="--config-file=/etc/nova/nova.conf"
-PIDFILE=/var/run/nova/nova-cert.pid
-
-ENABLED=true
-
-if test -f /etc/default/nova-cert; then
-  . /etc/default/nova-cert
-fi
-
-mkdir -p /var/run/nova
-chown nova:root /var/run/nova/
-
-mkdir -p /var/lock/nova
-chown nova:root /var/lock/nova/
-
-uid="$(getent passwd nova | cut -f3 -d:)"
-gid="$(getent passwd nova | cut -f4 -d:)"
-
-. /lib/lsb/init-functions
-
-export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
-
-if ! [ -x ${DAEMON} ] ; then
-	exit 0
-fi
-
-case "$1" in
-  start)
-    test "$ENABLED" = "true" || exit 0
-    log_daemon_msg "Starting nova cert" "nova-cert"
-    start-stop-daemon --start --chdir /var/run --chuid ${uid}:${gid} -b -m --pidfile ${PIDFILE} --exec ${DAEMON} -- ${DAEMON_ARGS}
-    log_end_msg $?
-    ;;
-  stop)
-    test "$ENABLED" = "true" || exit 0
-    log_daemon_msg "Stopping nova cert" "nova-cert"
-    start-stop-daemon --stop --oknodo --pidfile ${PIDFILE}
-    log_end_msg $?
-    ;;
-  restart|force-reload)
-    test "$ENABLED" = "true" || exit 1
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  status)
-    test "$ENABLED" = "true" || exit 0
-    status_of_proc -p $PIDFILE $DAEMON nova-cert && exit 0 || exit $?
-    ;;
-  *)
-    log_action_msg "Usage: /etc/init.d/nova-cert {start|stop|restart|force-reload|status}"
-    exit 1
-    ;;
-esac
-
-exit 0

=== modified file 'debian/nova-cert.manpages'
--- debian/nova-cert.manpages	2012-01-26 01:18:26 +0000
+++ debian/nova-cert.manpages	2013-03-01 14:23:35 +0000
@@ -1,1 +1,1 @@
-debian/mans/nova-cert.8
+doc/build/man/nova-cert.1

=== removed file 'debian/nova-cert.postrm'
--- debian/nova-cert.postrm	2012-09-14 12:15:44 +0000
+++ debian/nova-cert.postrm	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = purge ]; then
-	update-rc.d nova-cert remove
-fi
-
-#DEBHELPER#

=== added file 'debian/nova-cert.upstart'
--- debian/nova-cert.upstart	1970-01-01 00:00:00 +0000
+++ debian/nova-cert.upstart	2013-03-01 14:23:35 +0000
@@ -0,0 +1,18 @@
+description "Nova cert"
+author "Soren Hansen <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+
+chdir /var/run
+
+pre-start script
+	mkdir -p /var/run/nova
+	chown nova:root /var/run/nova/
+
+	mkdir -p /var/lock/nova
+	chown nova:root /var/lock/nova/
+end script
+
+exec start-stop-daemon --start --chuid nova --exec /usr/bin/nova-cert -- --config-file=/etc/nova/nova.conf

=== removed file 'debian/nova-cert.upstart.in'
--- debian/nova-cert.upstart.in	2012-08-23 14:04:37 +0000
+++ debian/nova-cert.upstart.in	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-description "Nova cert"
-author "Soren Hansen <[e-mail]>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-
-chdir /var/run
-
-pre-start script
-	mkdir -p /var/run/nova
-	chown nova:root /var/run/nova/
-
-	mkdir -p /var/lock/nova
-	chown nova:root /var/lock/nova/
-end script
-
-exec su -s /bin/sh -c "exec nova-cert --config-file=/etc/nova/nova.conf" nova

=== 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

=== modified file 'debian/nova-common.manpages'
--- debian/nova-common.manpages	2012-03-30 23:49:25 +0000
+++ debian/nova-common.manpages	2013-03-01 14:23:35 +0000
@@ -1,2 +1,2 @@
-debian/mans/nova-rootwrap.8
+doc/build/man/nova-rootwrap.1
 doc/build/man/nova-manage.1

=== modified file 'debian/nova-common.postinst'
--- debian/nova-common.postinst	2012-09-24 14:45:25 +0000
+++ debian/nova-common.postinst	2013-03-01 14:23:35 +0000
@@ -24,18 +24,6 @@
       find /var/lib/nova/ -name 'rootfs' -prune -o \
         -group nogroup -a -user nova -exec chown nova:nova {} \;
     elif dpkg --compare-versions "$2" lt "2012.2~f1~20120503.13935-0ubuntu1"; then
-      # convert the /etc/nova/nova.conf to the new configuration
-      mv /etc/nova/nova.conf /etc/nova/nova.conf.upgrade
-      nova-manage config convert --infile=/etc/nova/nova.conf.upgrade \
-        --outfile=/etc/nova/nova.conf
-      chmod 600 /etc/nova/nova.conf
-      chown nova:nova /etc/nova/nova.conf
-      # nova.conf, too (if its there)
-      if [ -e /etc/nova/nova-compute.conf ] ; then
-        mv /etc/nova/nova-compute.conf /etc/nova/nova-compute.conf.upgrade
-        nova-manage config convert --infile=/etc/nova/nova-compute.conf.upgrade \
-          --outfile=/etc/nova/nova-compute.conf  
-      fi
 	  # convert the root_helper to rootwrap_config
 	  sed -e "s,^root_helper=.\+,rootwrap_config=/etc/nova/rootwrap.conf," -i /etc/nova/nova.conf
     fi	

=== modified file 'debian/nova-compute-kvm.conf'
--- debian/nova-compute-kvm.conf	2012-06-05 23:34:09 +0000
+++ debian/nova-compute-kvm.conf	2013-03-01 14:23:35 +0000
@@ -1,2 +1,3 @@
 [DEFAULT]
 libvirt_type=kvm
+compute_driver=libvirt.LibvirtDriver

=== modified file 'debian/nova-compute-lxc.conf'
--- debian/nova-compute-lxc.conf	2012-06-05 23:34:09 +0000
+++ debian/nova-compute-lxc.conf	2013-03-01 14:23:35 +0000
@@ -1,2 +1,3 @@
 [DEFAULT]
 libvirt_type=lxc
+compute_driver=libvirt.LibvirtDriver

=== modified file 'debian/nova-compute-qemu.conf'
--- debian/nova-compute-qemu.conf	2012-06-05 23:34:09 +0000
+++ debian/nova-compute-qemu.conf	2013-03-01 14:23:35 +0000
@@ -1,2 +1,3 @@
 [DEFAULT]
 libvirt_type=qemu
+compute_driver=libvirt.LibvirtDriver

=== modified file 'debian/nova-compute-uml.conf'
--- debian/nova-compute-uml.conf	2012-06-05 23:34:09 +0000
+++ debian/nova-compute-uml.conf	2013-03-01 14:23:35 +0000
@@ -1,2 +1,3 @@
 [DEFAULT]
 libvirt_type=uml
+compute_driver=libvirt.LibvirtDriver

=== modified file 'debian/nova-compute-xen.conf'
--- debian/nova-compute-xen.conf	2012-06-05 23:34:09 +0000
+++ debian/nova-compute-xen.conf	2013-03-01 14:23:35 +0000
@@ -1,2 +1,3 @@
 [DEFAULT]
 libvirt_type=xen
+compute_driver=libvirt.LibvirtDriver

=== removed file 'debian/nova-compute.init'
--- debian/nova-compute.init	2012-06-05 23:34:09 +0000
+++ debian/nova-compute.init	1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          nova-compute
-# Required-Start:    $network $local_fs $remote_fs $syslog
-# Required-Stop:     $remote_fs
-# Should-Start:      libvirt-bin
-# Should-Stop:       libvirt-bin
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Nova Compute server
-# Description:       Provides compute server resources for the
-#                    OpenStack cloud computing system
-### END INIT INFO
-
-# Author: Julien Danjou <[e-mail]>
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="OpenStack Compute"
-NAME=nova-compute
-DAEMON=/usr/bin/nova-compute
-DAEMON_ARGS="--config-file=/etc/nova/nova.conf"
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-NOVA_USER=nova
-LOCK_DIR=/var/lock/nova/
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-mkdir -p ${LOCK_DIR}
-chown ${NOVA_USER} ${LOCK_DIR}
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-. /lib/lsb/init-functions
-
-do_start()
-{
-	start-stop-daemon --start --background --quiet --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null \
-		|| return 1
-	start-stop-daemon --start --background --quiet --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON -- \
-		$DAEMON_ARGS \
-		|| return 2
-}
-
-do_stop()
-{
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
-	RETVAL="$?"
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-case "$1" in
-  start)
-    log_daemon_msg "Starting $DESC " "$NAME"
-    do_start
-    case "$?" in
-		0|1) log_end_msg 0 ;;
-		2) log_end_msg 1 ;;
-	esac
-  ;;
-  stop)
-	log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) log_end_msg 0 ;;
-		2) log_end_msg 1 ;;
-	esac
-	;;
-  status)
-       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-       ;;
-  restart|force-reload)
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-		# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-:

=== modified file 'debian/nova-compute.manpages'
--- debian/nova-compute.manpages	2011-04-14 05:56:46 +0000
+++ debian/nova-compute.manpages	2013-03-01 14:23:35 +0000
@@ -1,1 +1,1 @@
-debian/mans/nova-compute.8
+doc/build/man/nova-compute.1

=== removed file 'debian/nova-compute.postrm'
--- debian/nova-compute.postrm	2012-09-14 12:15:44 +0000
+++ debian/nova-compute.postrm	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = purge ]; then
-	update-rc.d nova-compute remove
-fi
-
-#DEBHELPER#

=== added file 'debian/nova-compute.upstart'
--- debian/nova-compute.upstart	1970-01-01 00:00:00 +0000
+++ debian/nova-compute.upstart	2013-03-01 14:23:35 +0000
@@ -0,0 +1,20 @@
+description "Nova compute worker"
+author "Soren Hansen <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+
+chdir /var/run
+
+pre-start script
+	mkdir -p /var/run/nova
+	chown nova:root /var/run/nova/
+
+	mkdir -p /var/lock/nova
+	chown nova:root /var/lock/nova/
+
+	modprobe nbd
+end script
+
+exec start-stop-daemon --start --chuid nova --exec /usr/bin/nova-compute -- --config-file=/etc/nova/nova.conf --config-file=/etc/nova/nova-compute.conf

=== removed file 'debian/nova-compute.upstart.in'
--- debian/nova-compute.upstart.in	2012-08-23 14:04:37 +0000
+++ debian/nova-compute.upstart.in	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-description "Nova compute worker"
-author "Soren Hansen <[e-mail]>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-
-chdir /var/run
-
-pre-start script
-	mkdir -p /var/run/nova
-	chown nova:root /var/run/nova/
-
-	mkdir -p /var/lock/nova
-	chown nova:root /var/lock/nova/
-
-	modprobe nbd
-end script
-
-exec su -s /bin/sh -c "exec nova-compute --config-file=/etc/nova/nova.conf --config-file=/etc/nova/nova-compute.conf" nova

=== removed file 'debian/nova-conductor.init'
--- debian/nova-conductor.init	2012-11-20 14:11:24 +0000
+++ debian/nova-conductor.init	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          nova-conductor
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: nova-conductor
-# Description:       Schedules instances, volumes, etc. for Nova
-### END INIT INFO
-
-
-set -e
-
-DAEMON=/usr/bin/nova-conductor
-DAEMON_ARGS="--config-file=/etc/nova/nova.conf"
-PIDFILE=/var/run/nova/nova-conductor.pid
-
-ENABLED=true
-
-if test -f /etc/default/nova-conductor; then
-  . /etc/default/nova-conductor
-fi
-
-mkdir -p /var/run/nova
-chown nova:root /var/run/nova/
-
-mkdir -p /var/lock/nova
-chown nova:root /var/lock/nova/
-
-uid="$(getent passwd nova | cut -f3 -d:)"
-gid="$(getent passwd nova | cut -f4 -d:)"
-
-. /lib/lsb/init-functions
-
-export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
-
-if ! [ -x ${DAEMON} ] ; then
-	exit 0
-fi
-
-case "$1" in
-  start)
-    test "$ENABLED" = "true" || exit 0
-    log_daemon_msg "Starting nova cert" "nova-conductor"
-    start-stop-daemon --start --chdir /var/run --chuid ${uid}:${gid} -b -m --pidfile ${PIDFILE} --exec ${DAEMON} -- ${DAEMON_ARGS}
-    log_end_msg $?
-    ;;
-  stop)
-    test "$ENABLED" = "true" || exit 0
-    log_daemon_msg "Stopping nova cert" "nova-conductor"
-    start-stop-daemon --stop --oknodo --pidfile ${PIDFILE}
-    log_end_msg $?
-    ;;
-  restart|force-reload)
-    test "$ENABLED" = "true" || exit 1
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  status)
-    test "$ENABLED" = "true" || exit 0
-    status_of_proc -p $PIDFILE $DAEMON nova-conductor && exit 0 || exit $?
-    ;;
-  *)
-    log_action_msg "Usage: /etc/init.d/nova-conductor {start|stop|restart|force-reload|status}"
-    exit 1
-    ;;
-esac
-
-exit 0

=== modified file 'debian/nova-conductor.manpages'
--- debian/nova-conductor.manpages	2012-11-20 14:11:24 +0000
+++ debian/nova-conductor.manpages	2013-03-01 14:23:35 +0000
@@ -1,1 +1,1 @@
-debian/mans/nova-conductor.8
+doc/build/man/nova-conductor.1

=== removed file 'debian/nova-conductor.postrm'
--- debian/nova-conductor.postrm	2012-11-20 14:11:24 +0000
+++ debian/nova-conductor.postrm	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = purge ]; then
-	update-rc.d nova-conductor remove
-fi
-
-#DEBHELPER#

=== added file 'debian/nova-conductor.upstart'
--- debian/nova-conductor.upstart	1970-01-01 00:00:00 +0000
+++ debian/nova-conductor.upstart	2013-03-01 14:23:35 +0000
@@ -0,0 +1,18 @@
+description "Nova conductor"
+author "Chuck Short <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+
+chdir /var/run
+
+pre-start script
+	mkdir -p /var/run/nova
+	chown nova:root /var/run/nova/
+
+	mkdir -p /var/lock/nova
+	chown nova:root /var/lock/nova/
+end script
+
+exec start-stop-daemon --start --chuid nova --exec /usr/bin/nova-conductor -- --config-file=/etc/nova/nova.conf

=== removed file 'debian/nova-conductor.upstart.in'
--- debian/nova-conductor.upstart.in	2012-11-20 14:11:24 +0000
+++ debian/nova-conductor.upstart.in	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-description "Nova conductor"
-author "Chuck Short <[e-mail]>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-
-chdir /var/run
-
-pre-start script
-	mkdir -p /var/run/nova
-	chown nova:root /var/run/nova/
-
-	mkdir -p /var/lock/nova
-	chown nova:root /var/lock/nova/
-end script
-
-exec su -s /bin/sh -c "exec nova-conductor --config-file=/etc/nova/nova.conf" nova

=== removed file 'debian/nova-console.init'
--- debian/nova-console.init	2012-06-05 23:34:09 +0000
+++ debian/nova-console.init	1970-01-01 00:00:00 +0000
@@ -1,97 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          nova-console
-# Required-Start:    $network $local_fs $remote_fs $syslog
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Nova Console for XenServer and XVP
-# Description:       Nova Console for XenServer and XVP
-### END INIT INFO
-
-# Author: Julien Danjou <[e-mail]>
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="OpenStack Compute Console"
-NAME=nova-console
-DAEMON=/usr/bin/nova-console
-DAEMON_ARGS="--config-file=/etc/nova/nova.conf"
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-NOVA_USER=nova
-LOCK_DIR=/var/lock/nova/
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-mkdir -p ${LOCK_DIR}
-chown ${NOVA_USER} ${LOCK_DIR}
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-. /lib/lsb/init-functions
-
-do_start()
-{
-	start-stop-daemon --start --background --quiet --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null \
-		|| return 1
-	start-stop-daemon --start --background --quiet --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON -- \
-		$DAEMON_ARGS \
-		|| return 2
-}
-
-do_stop()
-{
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
-	RETVAL="$?"
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-case "$1" in
-  start)
-    log_daemon_msg "Starting $DESC " "$NAME"
-    do_start
-    case "$?" in
-		0|1) log_end_msg 0 ;;
-		2) log_end_msg 1 ;;
-	esac
-  ;;
-  stop)
-	log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) log_end_msg 0 ;;
-		2) log_end_msg 1 ;;
-	esac
-	;;
-  status)
-       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-       ;;
-  restart|force-reload)
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-		# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-:

=== modified file 'debian/nova-console.manpages'
--- debian/nova-console.manpages	2011-10-24 19:37:51 +0000
+++ debian/nova-console.manpages	2013-03-01 14:23:35 +0000
@@ -1,1 +1,1 @@
-debian/mans/nova-console.8
+doc/build/man/nova-console.1

=== removed file 'debian/nova-console.postrm'
--- debian/nova-console.postrm	2012-09-14 12:15:44 +0000
+++ debian/nova-console.postrm	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = purge ]; then
-	update-rc.d nova-console remove
-fi
-
-#DEBHELPER#

=== added file 'debian/nova-console.upstart'
--- debian/nova-console.upstart	1970-01-01 00:00:00 +0000
+++ debian/nova-console.upstart	2013-03-01 14:23:35 +0000
@@ -0,0 +1,19 @@
+description "Nova Console"
+author "Vishvananda Ishaya <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+respawn
+
+chdir /var/run
+
+pre-start script
+	mkdir -p /var/run/nova
+	chown nova:root /var/run/nova
+
+	mkdir -p /var/lock/nova
+	chown nova:root /var/lock/nova
+end script
+
+exec start-stop-daemon --start --chuid nova --exec /usr/bin/nova-console -- --config-file=/etc/nova/nova.conf

=== removed file 'debian/nova-console.upstart.in'
--- debian/nova-console.upstart.in	2012-08-23 14:04:37 +0000
+++ debian/nova-console.upstart.in	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-description "Nova Console"
-author "Vishvananda Ishaya <[e-mail]>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-respawn
-
-chdir /var/run
-
-pre-start script
-	mkdir -p /var/run/nova
-	chown nova:root /var/run/nova
-
-	mkdir -p /var/lock/nova
-	chown nova:root /var/lock/nova
-end script
-
-exec su -s /bin/sh -c "exec nova-console --config-file=/etc/nova/nova.conf" nova

=== removed file 'debian/nova-consoleauth.init'
--- debian/nova-consoleauth.init	2012-06-05 23:34:09 +0000
+++ debian/nova-consoleauth.init	1970-01-01 00:00:00 +0000
@@ -1,97 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          nova-console
-# Required-Start:    $network $local_fs $remote_fs $syslog
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Nova Console for XenServer and XVP
-# Description:       Nova Console for XenServer and XVP
-### END INIT INFO
-
-# Author: Julien Danjou <[e-mail]>
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="OpenStack Compute Console"
-NAME=nova-consoleauth
-DAEMON=/usr/bin/nova-consoleauth
-DAEMON_ARGS="--config-file=/etc/nova/nova.conf"
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-NOVA_USER=nova
-LOCK_DIR=/var/lock/nova/
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-mkdir -p ${LOCK_DIR}
-chown ${NOVA_USER} ${LOCK_DIR}
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-. /lib/lsb/init-functions
-
-do_start()
-{
-	start-stop-daemon --start --background --quiet --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null \
-		|| return 1
-	start-stop-daemon --start --background --quiet --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON -- \
-		$DAEMON_ARGS \
-		|| return 2
-}
-
-do_stop()
-{
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
-	RETVAL="$?"
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-case "$1" in
-  start)
-    log_daemon_msg "Starting $DESC " "$NAME"
-    do_start
-    case "$?" in
-		0|1) log_end_msg 0 ;;
-		2) log_end_msg 1 ;;
-	esac
-  ;;
-  stop)
-	log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) log_end_msg 0 ;;
-		2) log_end_msg 1 ;;
-	esac
-	;;
-  status)
-       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-       ;;
-  restart|force-reload)
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-		# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-:

=== modified file 'debian/nova-consoleauth.manpages'
--- debian/nova-consoleauth.manpages	2012-03-19 22:35:04 +0000
+++ debian/nova-consoleauth.manpages	2013-03-01 14:23:35 +0000
@@ -1,1 +1,1 @@
-debian/mans/nova-consoleauth.8
+doc/build/man/nova-consoleauth.1

=== removed file 'debian/nova-consoleauth.postrm'
--- debian/nova-consoleauth.postrm	2012-09-14 12:15:44 +0000
+++ debian/nova-consoleauth.postrm	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = purge ]; then
-	update-rc.d nova-consoleauth remove
-fi
-
-#DEBHELPER#

=== added file 'debian/nova-consoleauth.upstart'
--- debian/nova-consoleauth.upstart	1970-01-01 00:00:00 +0000
+++ debian/nova-consoleauth.upstart	2013-03-01 14:23:35 +0000
@@ -0,0 +1,19 @@
+description "Nova Console"
+author "Vishvananda Ishaya <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+respawn
+
+chdir /var/run
+
+pre-start script
+	mkdir -p /var/run/nova
+	chown nova:root /var/run/nova
+
+	mkdir -p /var/lock/nova
+	chown nova:root /var/lock/nova
+end script
+
+exec start-stop-daemon --start --chuid nova --exec /usr/bin/nova-consoleauth -- --config-file=/etc/nova/nova.conf

=== removed file 'debian/nova-consoleauth.upstart.in'
--- debian/nova-consoleauth.upstart.in	2012-08-23 14:04:37 +0000
+++ debian/nova-consoleauth.upstart.in	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-description "Nova Console"
-author "Vishvananda Ishaya <[e-mail]>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-respawn
-
-chdir /var/run
-
-pre-start script
-	mkdir -p /var/run/nova
-	chown nova:root /var/run/nova
-
-	mkdir -p /var/lock/nova
-	chown nova:root /var/lock/nova
-end script
-
-exec su -s /bin/sh -c "exec nova-consoleauth --config-file=/etc/nova/nova.conf" nova

=== removed file 'debian/nova-network.init'
--- debian/nova-network.init	2012-06-05 23:34:09 +0000
+++ debian/nova-network.init	1970-01-01 00:00:00 +0000
@@ -1,97 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          nova-network
-# Required-Start:    $network $local_fs $remote_fs $syslog
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Nova Network
-# Description:       Provides network resources
-### END INIT INFO
-
-# Author: Julien Danjou <[e-mail]>
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="OpenStack Compute Network"
-NAME=nova-network
-DAEMON=/usr/bin/nova-network
-DAEMON_ARGS="--config-file=/etc/nova/nova.conf"
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-NOVA_USER=nova
-LOCK_DIR=/var/lock/nova/
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-mkdir -p ${LOCK_DIR}
-chown ${NOVA_USER} ${LOCK_DIR}
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-. /lib/lsb/init-functions
-
-do_start()
-{
-	start-stop-daemon --start --quiet --background --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null \
-		|| return 1
-	start-stop-daemon --start --quiet --background --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON -- \
-		$DAEMON_ARGS \
-		|| return 2
-}
-
-do_stop()
-{
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
-	RETVAL="$?"
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-case "$1" in
-  start)
-    log_daemon_msg "Starting $DESC " "$NAME"
-    do_start
-    case "$?" in
-		0|1) log_end_msg 0 ;;
-		2) log_end_msg 1 ;;
-	esac
-  ;;
-  stop)
-	log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) log_end_msg 0 ;;
-		2) log_end_msg 1 ;;
-	esac
-	;;
-  status)
-       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-       ;;
-  restart|force-reload)
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-		# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-:

=== modified file 'debian/nova-network.manpages'
--- debian/nova-network.manpages	2011-04-14 05:56:46 +0000
+++ debian/nova-network.manpages	2013-03-01 14:23:35 +0000
@@ -1,2 +1,2 @@
-debian/mans/nova-network.8
-debian/mans/nova-dhcpbridge.8
+doc/build/man/nova-network.1
+doc/build/man/nova-dhcpbridge.1

=== removed file 'debian/nova-network.postrm'
--- debian/nova-network.postrm	2012-09-14 12:15:44 +0000
+++ debian/nova-network.postrm	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = purge ]; then
-	update-rc.d nova-network remove
-fi
-
-#DEBHELPER#

=== added file 'debian/nova-network.upstart'
--- debian/nova-network.upstart	1970-01-01 00:00:00 +0000
+++ debian/nova-network.upstart	2013-03-01 14:23:35 +0000
@@ -0,0 +1,17 @@
+description "Nova network worker"
+author "Soren Hansen <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+chdir /var/run
+
+pre-start script
+	mkdir -p /var/run/nova
+	chown nova:root /var/run/nova/
+
+	mkdir -p /var/lock/nova
+	chown nova:root /var/lock/nova/
+end script
+
+exec start-stop-daemon --start --chuid nova --exec /usr/bin/nova-network -- --config-file=/etc/nova/nova.conf

=== removed file 'debian/nova-network.upstart.in'
--- debian/nova-network.upstart.in	2012-08-23 14:04:37 +0000
+++ debian/nova-network.upstart.in	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-description "Nova network worker"
-author "Soren Hansen <[e-mail]>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-chdir /var/run
-
-pre-start script
-	mkdir -p /var/run/nova
-	chown nova:root /var/run/nova/
-
-	mkdir -p /var/lock/nova
-	chown nova:root /var/lock/nova/
-end script
-
-exec su -s /bin/sh -c "exec nova-network --config-file=/etc/nova/nova.conf" nova

=== modified file 'debian/nova-novncproxy.manpages'
--- debian/nova-novncproxy.manpages	2012-10-02 19:34:36 +0000
+++ debian/nova-novncproxy.manpages	2013-03-01 14:23:35 +0000
@@ -1,1 +1,1 @@
-debian/mans/nova-novncproxy.8
+doc/build/man/nova-novncproxy.1

=== removed file 'debian/nova-novncproxy.postrm'
--- debian/nova-novncproxy.postrm	2012-10-02 19:34:36 +0000
+++ debian/nova-novncproxy.postrm	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = purge ]; then
-	update-rc.d nova-novncproxy remove
-fi
-
-#DEBHELPER#

=== added file 'debian/nova-novncproxy.upstart'
--- debian/nova-novncproxy.upstart	1970-01-01 00:00:00 +0000
+++ debian/nova-novncproxy.upstart	2013-03-01 14:23:35 +0000
@@ -0,0 +1,17 @@
+description "Nova NoVNC proxy"
+author "Vishvananda Ishaya <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+chdir /var/run
+
+pre-start script
+   mkdir -p /var/run/nova
+   chown nova:root /var/run/nova/
+
+   mkdir -p /var/lock/nova
+   chown nova:root /var/lock/nova/
+end script
+
+exec start-stop-daemon --start --chuid nova --exec /usr/bin/nova-novncproxy -- --config-file=/etc/nova/nova.conf

=== removed file 'debian/nova-novncproxy.upstart.in'
--- debian/nova-novncproxy.upstart.in	2012-10-02 19:34:36 +0000
+++ debian/nova-novncproxy.upstart.in	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-description "Nova NoVNC proxy"
-author "Vishvananda Ishaya <[e-mail]>"
-
-start on (filesystem and net-device-up IFACE!=lo)
-stop on runlevel [016]
-
-chdir /var/run
-
-pre-start script
-   mkdir -p /var/run/nova
-   chown nova:root /var/run/nova/
-
-   mkdir -p /var/lock/nova
-   chown nova:root /var/lock/nova/
-end script
-
-exec su -s /bin/sh -c "exec nova-novncproxy --config-file=/etc/nova/nova.conf" nova

=== removed file 'debian/nova-objectstore.init'
--- debian/nova-objectstore.init	2012-06-05 23:34:09 +0000
+++ debian/nova-objectstore.init	1970-01-01 00:00:00 +0000
@@ -1,97 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          nova-objectstore
-# Required-Start:    $network $local_fs $remote_fs $syslog
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Nova Objectstore
-# Description:       Provides virtual machine storage functionalities
-### END INIT INFO
-
-# Author: Julien Danjou <[e-mail]>
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="OpenStack Compute Objectstore"
-NAME=nova-objectstore
-DAEMON=/usr/bin/nova-objectstore
-DAEMON_ARGS="--config-file=/etc/nova/nova.conf"
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-NOVA_USER=nova
-LOCK_DIR=/var/lock/nova/
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-mkdir -p ${LOCK_DIR}
-chown ${NOVA_USER} ${LOCK_DIR}
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-. /lib/lsb/init-functions
-
-do_start()
-{
-	start-stop-daemon --start --quiet --background --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null \
-		|| return 1
-	start-stop-daemon --start --quiet --background --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON -- \
-		$DAEMON_ARGS \
-		|| return 2
-}
-
-do_stop()
-{
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
-	RETVAL="$?"
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-case "$1" in
-  start)
-    log_daemon_msg "Starting $DESC " "$NAME"
-    do_start
-    case "$?" in
-		0|1) log_end_msg 0 ;;
-		2) log_end_msg 1 ;;
-	esac
-  ;;
-  stop)
-	log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) log_end_msg 0 ;;
-		2) log_end_msg 1 ;;
-	esac
-	;;
-  status)
-       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-       ;;
-  restart|force-reload)
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-		# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-:

=== modified file 'debian/nova-objectstore.manpages'
--- debian/nova-objectstore.manpages	2011-04-14 05:56:46 +0000
+++ debian/nova-objectstore.manpages	2013-03-01 14:23:35 +0000
@@ -1,1 +1,1 @@
-debian/mans/nova-objectstore.8
+doc/build/man/nova-objectstore.1

=== removed file 'debian/nova-objectstore.postrm'
--- debian/nova-objectstore.postrm	2012-09-14 12:15:44 +0000
+++ debian/nova-objectstore.postrm	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = purge ]; then
-	update-rc.d nova-objectstore remove
-fi
-
-#DEBHELPER#

=== added file 'debian/nova-objectstore.upstart'
--- debian/nova-objectstore.upstart	1970-01-01 00:00:00 +0000
+++ debian/nova-objectstore.upstart	2013-03-01 14:23:35 +0000
@@ -0,0 +1,17 @@
+description "Nova object store"
+author "Soren Hansen <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+chdir /var/run
+
+pre-start script
+    mkdir -p /var/run/nova
+    chown nova:root /var/run/nova/
+
+	mkdir -p /var/lock/nova
+	chown nova:root /var/lock/nova/
+end script
+
+exec start-stop-daemon --start --chuid nova --exec /usr/bin/nova-objectstore -- --config-file=/etc/nova/nova.conf

=== removed file 'debian/nova-objectstore.upstart.in'
--- debian/nova-objectstore.upstart.in	2012-08-23 14:04:37 +0000
+++ debian/nova-objectstore.upstart.in	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-description "Nova object store"
-author "Soren Hansen <[e-mail]>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-chdir /var/run
-
-pre-start script
-    mkdir -p /var/run/nova
-    chown nova:root /var/run/nova/
-
-	mkdir -p /var/lock/nova
-	chown nova:root /var/lock/nova/
-end script
-
-exec su -s /bin/sh -c "exec nova-objectstore --config-file=/etc/nova/nova.conf" nova

=== removed file 'debian/nova-scheduler.init'
--- debian/nova-scheduler.init	2012-06-05 23:34:09 +0000
+++ debian/nova-scheduler.init	1970-01-01 00:00:00 +0000
@@ -1,97 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          nova-scheduler
-# Required-Start:    $network $local_fs $remote_fs $syslog
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Nova Scheduler
-# Description:       Schedules instances, volumes, etc. for Nova
-### END INIT INFO
-
-# Author: Julien Danjou <[e-mail]>
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="OpenStack Compute Scheduler"
-NAME=nova-scheduler
-DAEMON=/usr/bin/nova-scheduler
-DAEMON_ARGS="--config-file=/etc/nova/nova.conf"
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-NOVA_USER=nova
-LOCK_DIR=/var/lock/nova/
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-mkdir -p ${LOCK_DIR}
-chown ${NOVA_USER} ${LOCK_DIR}
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-. /lib/lsb/init-functions
-
-do_start()
-{
-	start-stop-daemon --start --quiet --background --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null \
-		|| return 1
-	start-stop-daemon --start --quiet --background --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON -- \
-		$DAEMON_ARGS \
-		|| return 2
-}
-
-do_stop()
-{
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
-	RETVAL="$?"
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-case "$1" in
-  start)
-    log_daemon_msg "Starting $DESC " "$NAME"
-    do_start
-    case "$?" in
-		0|1) log_end_msg 0 ;;
-		2) log_end_msg 1 ;;
-	esac
-  ;;
-  stop)
-	log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) log_end_msg 0 ;;
-		2) log_end_msg 1 ;;
-	esac
-	;;
-  status)
-       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-       ;;
-  restart|force-reload)
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-		# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-:

=== modified file 'debian/nova-scheduler.manpages'
--- debian/nova-scheduler.manpages	2011-04-14 05:56:46 +0000
+++ debian/nova-scheduler.manpages	2013-03-01 14:23:35 +0000
@@ -1,1 +1,2 @@
-debian/mans/nova-scheduler.8
+doc/build/man/nova-scheduler.1
+doc/build/man/nova-rpc-zmq-receiver.1

=== removed file 'debian/nova-scheduler.postrm'
--- debian/nova-scheduler.postrm	2012-09-14 12:15:44 +0000
+++ debian/nova-scheduler.postrm	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = purge ]; then
-	update-rc.d nova-scheduler remove
-fi
-
-#DEBHELPER#

=== added file 'debian/nova-scheduler.upstart'
--- debian/nova-scheduler.upstart	1970-01-01 00:00:00 +0000
+++ debian/nova-scheduler.upstart	2013-03-01 14:23:35 +0000
@@ -0,0 +1,18 @@
+description "Nova scheduler"
+author "Soren Hansen <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+
+chdir /var/run
+
+pre-start script
+	mkdir -p /var/run/nova
+	chown nova:root /var/run/nova/
+
+	mkdir -p /var/lock/nova
+	chown nova:root /var/lock/nova/
+end script
+
+exec start-stop-daemon --start --chuid nova --exec /usr/bin/nova-scheduler -- --config-file=/etc/nova/nova.conf

=== removed file 'debian/nova-scheduler.upstart.in'
--- debian/nova-scheduler.upstart.in	2012-08-23 14:04:37 +0000
+++ debian/nova-scheduler.upstart.in	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-description "Nova scheduler"
-author "Soren Hansen <[e-mail]>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-
-chdir /var/run
-
-pre-start script
-	mkdir -p /var/run/nova
-	chown nova:root /var/run/nova/
-
-	mkdir -p /var/lock/nova
-	chown nova:root /var/lock/nova/
-end script
-
-exec su -s /bin/sh -c "exec nova-scheduler --config-file=/etc/nova/nova.conf" nova

=== added file 'debian/nova-spiceproxy.install'
--- debian/nova-spiceproxy.install	1970-01-01 00:00:00 +0000
+++ debian/nova-spiceproxy.install	2013-03-01 14:23:35 +0000
@@ -0,0 +1,1 @@
+usr/bin/nova-spicehtml5proxy

=== added file 'debian/nova-spiceproxy.logrotate'
--- debian/nova-spiceproxy.logrotate	1970-01-01 00:00:00 +0000
+++ debian/nova-spiceproxy.logrotate	2013-03-01 14:23:35 +0000
@@ -0,0 +1,7 @@
+/var/log/nova/nova-novncproxy.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}

=== added file 'debian/nova-spiceproxy.upstart'
--- debian/nova-spiceproxy.upstart	1970-01-01 00:00:00 +0000
+++ debian/nova-spiceproxy.upstart	2013-03-01 14:23:35 +0000
@@ -0,0 +1,17 @@
+description "Nova spice proxy"
+author "Chuck Short <[e-mail]"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+chdir /var/run
+
+pre-start script
+   mkdir -p /var/run/nova
+   chown nova:root /var/run/nova/
+
+   mkdir -p /var/lock/nova
+   chown nova:root /var/lock/nova/
+end script
+
+exec start-stop-daemon --start --chuid nova --exec /usr/bin/nova-spicehtml5proxy -- --config-file=/etc/nova/nova.conf

=== removed file 'debian/nova-xcp-network.init'
--- debian/nova-xcp-network.init	2012-02-20 01:43:23 +0000
+++ debian/nova-xcp-network.init	1970-01-01 00:00:00 +0000
@@ -1,167 +0,0 @@
-#!/bin/sh
-
-### BEGIN INIT INFO
-# Provides:          nova-xcp-network
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Apply initial OVS flows for Nova and network rules.
-# Description:       Apply initial OVS flows for Nova, and setup networking
-#                    host rules for multi tenancy protections.
-### END INIT INFO
-
-# Written by Thomas Goirand <[e-mail]> using
-# plugins/xenserver/networking/etc/init.d/{openvswitch-nova,host-up}
-# as examples.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-. /lib/init/vars.sh
-. /lib/lsb/init-functions
-
-DESC="XCP openvswitch networking rules"
-NAME="xcp-network"
-
-OVS_CONFIGURE_BASE_FLOWS=/usr/lib/xcp/plugins/ovs_configure_base_flows.py
-IPTABLES=/sbin/iptables
-EBTABLES=/sbin/ebtables
-ARPTABLES=/sbin/arptables
-
-# Quick check if everything is there...
-if ! [ -x ${OVS_CONFIGURE_BASE_FLOWS} ] ; then
-	exit 0
-fi
-if ! [ -x ${IPTABLES} -a -x ${EBTABLES} -a -x ${ARPTABLES} ] ; then
-	exit 0
-fi
-if ! [ -x /usr/bin/ovs-ofctl -a -x /usr/bin/ovs-vsctl -a -x /sbin/ip ] ; then
-	exit 0
-fi
-
-# Load the VERBOSE setting and other rcS variables
-[ -r /lib/init/vars.sh ] && . /lib/init/vars.sh
-
-# Get $INTERFACES from /etc/default/openvswitch-nova,
-# default to all what is available.
-if [ -r /etc/default/openvswitch-nova ] ; then
-	. /etc/default/openvswitch-nova
-fi
-if [ -z "${INTERFACES}" ] ; then
-	INTERFACES=$(cd /sys/class/net/; /bin/ls -d eth*)
-fi
-
-# Get $NETWORK_MODE from /etc/xcp/network.conf,
-# default to openvswitch
-if [ -e /etc/xcp/network.conf ] ; then
-	NETWORK_MODE=`cat /etc/xcp/network.conf`
-fi
-
-if [ -z "${NETWORK_MODE}" ] ; then
-	NETWORK_MODE=openvswitch
-fi
-
-# Check validity of $NETWORK_MODE
-case "${NETWORK_MODE}" in
-vswitch|openvswitch)
-	;;
-bridge)
-	exit 0
-	;;
-*)
-	echo "Open vSwitch disabled (/etc/xcp/network.conf is invalid)" >&2
-	exit 0
-	;;
-esac
-
-run_ovs_conf_base_flows () {
-	my_action="${1}"
-	my_all_interfaces=$(cd /sys/class/net/; /bin/ls -d eth*)
-	for i in ${INTERFACES} ; do
-		/usr/bin/python $OVS_CONFIGURE_BASE_FLOWS $my_action $i
-	done
-}
-
-# Functions to configure the firewall to work with openvswitch, XCP and nova
-iptables_up () {
-	${IPTABLES} -P FORWARD DROP
-	for i in ${INTERFACES} ; do
-		${IPTABLES} -A FORWARD -m physdev --physdev-in ${i} -j ACCEPT
-	done
-}
-ebtables_up () {
-	${EBTABLES} -P FORWARD DROP
-	for i in ${INTERFACES} ; do
-		${EBTABLES} -A FORWARD -o ${i} -j ACCEPT
-	done
-}
-arptables_up () {
-	${ARPTABLES} -P FORWARD DROP
-	for i in ${INTERFACES} ; do
-		${ARPTABLES} -A FORWARD --opcode Request --in-interface ${i} -j ACCEPT
-		${ARPTABLES} -A FORWARD --opcode Reply --in-interface ${i} -j ACCEPT
-	done
-}
-iptables_down () {
-	${IPTABLES} -P FORWARD ACCEPT
-	for i in ${INTERFACES} ; do
-		${IPTABLES} -D FORWARD -m physdev --physdev-in ${i} -j ACCEPT
-	done
-}
-ebtables_down () {
-	${EBTABLES} -P FORWARD ACCEPT
-	for i in ${INTERFACES} ; do
-		${EBTABLES} -D FORWARD -o ${i} -j ACCEPT
-	done
-}
-arptables_down () {
-	${ARPTABLES} -P FORWARD ACCEPT
-	for i in ${INTERFACES} ; do
-		${ARPTABLES} -D FORWARD --opcode Request --in-interface ${i} -j ACCEPT
-		${ARPTABLES} -D FORWARD --opcode Reply --in-interface ${i} -j ACCEPT
-	done
-}
-
-case "${1}" in
-start)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-	iptables_up
-	ebtables_up
-	arptables_up
-	run_ovs_conf_base_flows online
-	[ "$VERBOSE" != no ] && log_end_msg 0
-	;;
-stop)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-	run_ovs_conf_base_flows offline
-	iptables_down
-	ebtables_down
-	arptables_down
-	[ "$VERBOSE" != no ] && log_end_msg 0
-	;;
-reload|force-reload)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Restarting $DESC" "$NAME"
-	run_ovs_conf_base_flows reset
-	[ "$VERBOSE" != no ] && log_end_msg 0
-	;;
-restart)
-	$0 start
-	sleep 1
-	$0 stop
-	;;
-*)
-	echo "Usage: $0 {start|stop|status|restart|reload|force-reload}" >&2
-	;;
-esac
-
-exit 0

=== modified file 'debian/nova-xcp-plugins.install'
--- debian/nova-xcp-plugins.install	2012-02-29 02:55:07 +0000
+++ debian/nova-xcp-plugins.install	2013-03-01 14:23:35 +0000
@@ -1,6 +1,6 @@
-plugins/xenserver/xenapi/etc/xapi.d/plugins/agent		/usr/lib/xcp/plugins
-plugins/xenserver/xenapi/etc/xapi.d/plugins/glance		/usr/lib/xcp/plugins
-plugins/xenserver/xenapi/etc/xapi.d/plugins/migration		/usr/lib/xcp/plugins
-plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py	/usr/lib/xcp/plugins
-plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost		/usr/lib/xcp/plugins
-plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py		/usr/lib/xcp/plugins
+plugins/xenserver/xenapi/etc/xapi.d/plugins/agent               /usr/lib/xcp/plugins
+plugins/xenserver/xenapi/etc/xapi.d/plugins/glance              /usr/lib/xcp/plugins
+plugins/xenserver/xenapi/etc/xapi.d/plugins/migration           /usr/lib/xcp/plugins
+plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py   /usr/lib/xcp/plugins
+plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost             /usr/lib/xcp/plugins
+plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py         /usr/lib/xcp/plugins

=== removed file 'debian/nova-xvpvncproxy.init'
--- debian/nova-xvpvncproxy.init	2012-06-05 23:34:09 +0000
+++ debian/nova-xvpvncproxy.init	1970-01-01 00:00:00 +0000
@@ -1,97 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          nova-xvpvncproxy
-# Required-Start:    $network $local_fs $remote_fs $syslog
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Nova XVP VNC proxy
-# Description:       Nova XVP VNC proxy
-### END INIT INFO
-
-# Author: Julien Danjou <[e-mail]>
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="OpenStack XVP VNC proxy"
-NAME=nova-xvpvncproxy
-DAEMON=/usr/bin/nova-xvpvncproxy
-DAEMON_ARGS="--config-file=/etc/nova/nova.conf"
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-NOVA_USER=nova
-LOCK_DIR=/var/lock/nova/
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-mkdir -p ${LOCK_DIR}
-chown ${NOVA_USER} ${LOCK_DIR}
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-. /lib/lsb/init-functions
-
-do_start()
-{
-	start-stop-daemon --start --background --quiet --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null \
-		|| return 1
-	start-stop-daemon --start --background --quiet --chuid ${NOVA_USER}:nova --make-pidfile --pidfile $PIDFILE --startas $DAEMON -- \
-		$DAEMON_ARGS \
-		|| return 2
-}
-
-do_stop()
-{
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
-	RETVAL="$?"
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-case "$1" in
-  start)
-    log_daemon_msg "Starting $DESC " "$NAME"
-    do_start
-    case "$?" in
-		0|1) log_end_msg 0 ;;
-		2) log_end_msg 1 ;;
-	esac
-  ;;
-  stop)
-	log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) log_end_msg 0 ;;
-		2) log_end_msg 1 ;;
-	esac
-	;;
-  status)
-       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-       ;;
-  restart|force-reload)
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-		# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-:

=== modified file 'debian/nova-xvpvncproxy.manpages'
--- debian/nova-xvpvncproxy.manpages	2012-10-02 19:34:36 +0000
+++ debian/nova-xvpvncproxy.manpages	2013-03-01 14:23:35 +0000
@@ -1,1 +1,1 @@
-debian/mans/nova-xvpvncproxy.8
+doc/build/man/nova-xvpvncproxy.1

=== 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/patches/avoid_setuptools_git_dependency.patch'
--- debian/patches/avoid_setuptools_git_dependency.patch	2012-11-07 18:48:16 +0000
+++ debian/patches/avoid_setuptools_git_dependency.patch	2013-03-01 14:23:35 +0000
@@ -1,21 +1,11 @@
-Author: Adam Gandelman <[e-mail]>
-Date: Thu Oct 11 00:42:53 PDT 2012
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nova/+bug/1059907
-Subject: Avoid installation of python-setuptools-git.
-
-Remove setuptools_git from pip-requires so that it is not automatically
-added to the dependency list by dh_python2, and avoid having it and its
-dependencies (git!) installed with python-nova.
-
-
-diff -Naurp nova-2013.1.orig/tools/pip-requires nova-2013.1/tools/pip-requires
---- nova-2013.1.orig/tools/pip-requires	2012-11-07 12:06:53.000000000 -0600
-+++ nova-2013.1/tools/pip-requires	2012-11-07 12:47:21.279367076 -0600
-@@ -18,7 +18,6 @@ paramiko
+diff -Naurp nova-2013.1.a4723.ge807e19.orig/tools/pip-requires nova-2013.1.a4723.ge807e19/tools/pip-requires
+--- nova-2013.1.a4723.ge807e19.orig/tools/pip-requires	2013-02-28 08:59:17.000000000 -0600
++++ nova-2013.1.a4723.ge807e19/tools/pip-requires	2013-02-28 09:01:41.143142227 -0600
+@@ -20,7 +20,6 @@ pyasn1
  Babel>=0.9.6
  iso8601>=0.1.4
  httplib2
 -setuptools_git>=0.4
- python-cinderclient
- python-quantumclient>=2.1
+ python-cinderclient>=1.0.1
+ python-quantumclient>=2.1.2
  python-glanceclient>=0.5.0,<2

=== removed file 'debian/patches/fix-libvirt-tests.patch'
--- debian/patches/fix-libvirt-tests.patch	2012-11-19 02:25:45 +0000
+++ debian/patches/fix-libvirt-tests.patch	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-From 3fa7511a0a6a880fca53769c3bc522bf679e03df Mon Sep 17 00:00:00 2001
-From: Chuck Short <[e-mail]>
-Date: Mon, 5 Nov 2012 10:16:31 -0600
-Subject: [PATCH 2/2] Accept python-lxml 3.0.1 for tests
-
-Tests were failing when using lxml 3.0.1. Accept
-3.0.1 as a pip version and fix the apporiate tests.
-
-Change-Id: I84d53e69c61f684123eb6d2bc5541b5c02ddacc9
-Signed-off-by: Chuck Short <[e-mail]>
-diff -Naurp nova-2013.1.orig/nova/tests/test_libvirt_config.py nova-2013.1/nova/tests/test_libvirt_config.py
---- nova-2013.1.orig/nova/tests/test_libvirt_config.py	2012-11-18 20:12:07.000000000 -0600
-+++ nova-2013.1/nova/tests/test_libvirt_config.py	2012-11-18 20:24:43.738269795 -0600
-@@ -366,7 +366,7 @@ class LibvirtConfigGuestDiskTest(Libvirt
-         self.assertXmlEqual(xml, """
-             <disk type="network" device="disk">
-               <driver name="qemu" type="qcow2"/>
--              <source protocol="iscsi" name="foo.bar.com"/>
-+              <source name="foo.bar.com" protocol="iscsi"/>
-               <target bus="ide" dev="/dev/hda"/>
-             </disk>""")
- 
-@@ -535,7 +535,7 @@ class LibvirtConfigGuestInterfaceTest(Li
-             <interface type="direct">
-               <mac address="DE:AD:BE:EF:CA:FE"/>
-               <model type="virtio"/>
--              <source mode="private" dev="eth0"/>
-+              <source dev="eth0" mode="private"/>
-               <target dev="tap12345678"/>
-               <virtualport type="802.1Qbh"/>
-             </interface>""")
-diff -Naurp nova-2013.1.orig/tools/pip-requires nova-2013.1/tools/pip-requires
---- nova-2013.1.orig/tools/pip-requires	2012-11-18 20:12:07.000000000 -0600
-+++ nova-2013.1/tools/pip-requires	2012-11-18 20:24:58.498269804 -0600
-@@ -5,7 +5,7 @@ anyjson>=0.2.4
- boto==2.1.1
- eventlet>=0.9.17
- kombu==1.0.4
--lxml>=2.3,<=2.3.5
-+lxml>=2.3,<=3.0.1
- routes==1.12.3
- WebOb==1.0.8
- greenlet>=0.3.1

=== modified file 'debian/patches/fix-ubuntu-tests.patch'
--- debian/patches/fix-ubuntu-tests.patch	2012-11-01 16:31:36 +0000
+++ debian/patches/fix-ubuntu-tests.patch	2013-03-01 14:23:35 +0000
@@ -1,14 +1,12 @@
-Description: Fix tests in ubuntu.
-Author: Chuck Short <[e-mail]>
-Forwarded: no
---- a/nova/tests/test_api.py
-+++ b/nova/tests/test_api.py
-@@ -436,7 +436,7 @@ class ApiEc2TestCase(test.TestCase):
-                 raise self.failureException, 'EC2ResponseError not raised'
- 
-         # Invalid CIDR address
--        _assert('Invalid CIDR', 'tcp', 80, 81, '0.0.0.0/0444')
-+        #_assert('Invalid CIDR', 'tcp', 80, 81, '0.0.0.0/0444')
-         # Missing ports
-         _assert('Not enough parameters', 'tcp', '0.0.0.0/0')
-         # from port cannot be greater than to port
+diff -Naurp nova-2013.1.a4257.g4df4762.orig/tools/hacking.py nova-2013.1.a4257.g4df4762/tools/hacking.py
+--- nova-2013.1.a4257.g4df4762.orig/tools/hacking.py	2013-02-12 07:33:18.000000000 -0600
++++ nova-2013.1.a4257.g4df4762/tools/hacking.py	2013-02-12 07:51:45.212644383 -0600
+@@ -589,7 +589,7 @@ if __name__ == "__main__":
+     #include nova path
+     sys.path.append(os.getcwd())
+     #Run once tests (not per line)
+-    once_error = once_git_check_commit_title()
++    #once_error = once_git_check_commit_title()
+     #NOVA error codes start with an N
+     pep8.SELFTEST_REGEX = re.compile(r'(Okay|[EWN]\d{3}):\s(.*)')
+     pep8.ERRORCODE_REGEX = re.compile(r'[EWN]\d{3}')

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-11-20 15:45:24 +0000
+++ debian/patches/series	2013-03-01 14:23:35 +0000
@@ -3,5 +3,3 @@
 fix-ubuntu-tests.patch
 fix-docs-build-without-network.patch
 avoid_setuptools_git_dependency.patch
-fix-libvirt-tests.patch
-ubuntu-show-tests.patch

=== removed file 'debian/patches/ubuntu-show-tests.patch'
--- debian/patches/ubuntu-show-tests.patch	2012-11-08 14:10:12 +0000
+++ debian/patches/ubuntu-show-tests.patch	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-Description: Display the tests on the console as well in the log file.
-Author: Chuck Short <[e-mail]>
-Forwarded: Yes
-diff -Naurp nova-2013.1.orig/run_tests.sh nova-2013.1/run_tests.sh
---- nova-2013.1.orig/run_tests.sh	2012-11-07 12:06:53.000000000 -0600
-+++ nova-2013.1/run_tests.sh	2012-11-08 08:06:11.797024712 -0600
-@@ -88,7 +88,7 @@ function run_tests {
-   # Cleanup *pyc
-   ${wrapper} find . -type f -name "*.pyc" -delete
-   # Just run the test suites in current environment
--  ${wrapper} $NOSETESTS | tee nosetests.log
-+  ${wrapper} $NOSETESTS 2>&1 | tee nosetests.log
-   # If we get some short import error right away, print the error log directly
-   RESULT=$?
-   if [ "$RESULT" -ne "0" ];

=== modified file 'debian/pydist-overrides'
--- debian/pydist-overrides	2012-09-20 18:07:36 +0000
+++ debian/pydist-overrides	2013-03-01 14:23:35 +0000
@@ -1,4 +1,4 @@
-nosexcover
 coverage
 setuptools-git
 babel
+websockify

=== modified file 'debian/rules'
--- debian/rules	2012-11-12 16:51:21 +0000
+++ debian/rules	2013-03-01 14:23:35 +0000
@@ -33,25 +33,18 @@
 endif
 
 get-orig-source:
-	uscan --verbose --force-download --rename --destdir=../build-area
-
-
-UPSTREAM_GIT=git://github.com/openstack/nova.git
-DEBIAN_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
-DEBIAN_NAME=nova
-
-get-orig-source-git:
-	git clone $(UPSTREAM_GIT) $(DEBIAN_NAME)
-	cd $(DEBIAN_NAME) ; \
-		git archive master --format=tar.gz \
-			--output=../$(DEBIAN_NAME)_$(DEBIAN_VERSION).orig.tar.gz \
-			--prefix=$(DEBIAN_NAME)-$(DEBIAN_VERSION)/
+	uscan --verbose --rename --destdir=../build-area
+
+version_prefix := $(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
+get-vcs-source:
+	wget http://tarballs.openstack.org/nova/nova-master.tar.gz \
+		 -O ../nova_$(version_prefix).orig.tar.gz
 
 override_dh_install:
 	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
@@ -65,18 +58,9 @@
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	./run_tests.sh -N -P
+	testr init && testr run --parallel
 endif
 
-override_dh_installinit:
-	if dpkg-vendor --derives-from ubuntu ; then \
-		for i in debian/*.upstart.in ; do \
-			MYPKG=`echo $$i | cut -d. -f1` ; \
-			cp $$MYPKG.upstart.in $$MYPKG.upstart ; \
-		done ; \
-	fi
-	dh_installinit --error-handler=true
-
 override_dh_python2:
 	dh_python2
 	dh_python2  /usr/lib/xcp
@@ -85,3 +69,6 @@
 	dh_installlogrotate
 	dh_installlogrotate --name=nova-manage
 	dh_installlogrotate --name=nova-dhcpbridge
+
+override_dh_installchangelogs:
+	dh_installchangelogs ChangeLog

=== modified file 'debian/watch'
--- debian/watch	2012-08-29 14:13:07 +0000
+++ debian/watch	2013-03-01 14:23:35 +0000
@@ -1,3 +1,3 @@
 version=3
-opts="uversionmangle=s/%7E/~/" https://launchpad.net/nova/+download https://launchpad.net/nova/.*/.*/.*/nova-(.*)\.tar\.gz
-http://tarballs.openstack.org/nova/ nova-(\d.*).tar.gz
+opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/" \
+ https://launchpad.net/nova/+download https://launchpad.net/nova/.*/.*/.*/nova-(.*)\.tar\.gz