Merge lp:~soren/nova/essex-stable-catchup into lp:~ubuntu-server-dev/nova/essex

[Soren Hansen]

Update packaging to work with Essex stable branch.

Note: "work" == "can at least build a source package"

[Martin Pitt (pitti)]

This looks vastly obsolete, closing.

Unmerged revisions

370. By Soren Hansen on 2012-05-25

* Snapshot of upstream stable/essex branch.
* Remove local copies of upstream patch set as upstream is nice
  enough to publish tarballs with everything included.

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-12 18:14:31 +0000
+++ debian/changelog	2012-05-30 20:30:26 +0000
@@ -1,3 +1,11 @@
+nova (2012.1~20120518.13585-0ubuntu1) UNRELEASED; urgency=low
+
+  * Snapshot of upstream stable/essex branch.
+  * Remove local copies of upstream patch set as upstream is nice
+    enough to publish tarballs with everything included.
+
+ -- Soren Hansen <[e-mail]>  Fri, 25 May 2012 11:56:44 +0200
+
 nova (2012.1-0ubuntu2) precise; urgency=low
 
   [ Adam Gandelman ]

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-04-12 18:01:13 +0000
+++ debian/patches/series	2012-05-30 20:30:26 +0000
@@ -6,11 +6,3 @@
 fix-ubuntu-tests.patch
 fix-docs-build-without-network.patch
 0001-fix-useexisting-deprecation-warnings.patch
-# stable/essex patch series - remove these patches 
-# when 2012.1.1 is released.
-upstream/0001-fix-bug-where-nova-ignores-glance-host-in-imageref.patch
-upstream/0002-Stop-libvirt-test-from-deleting-instances-dir.patch
-upstream/0003-Allow-unprivileged-RADOS-users-to-access-rbd-volumes.patch
-upstream/0004-Fixed-bug-962840-added-a-test-case.patch
-upstream/0005-Populate-image-properties-with-project_id-again.patch
-upstream/0006-Use-project_id-in-ec2.cloud._format_image.patch