Merge lp:~ubuntu-branches/ubuntu/natty/eucalyptus/natty-201103250208 into lp:ubuntu/natty/eucalyptus

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/natty/eucalyptus now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/eucalyptus/natty-201103250208. A merge should be performed if necessary.

Unmerged revisions

174. By Dustin Kirkland  on 2010-11-23

* debian/control: eucalyptus-nc actually depends on parted to create vm backing
  disks; normally we get this for free from the Ubuntu server seed, but building
  the LiveISO with minimal seeds exposed this missing hard dependency
* debian/control:

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-04 17:25:04 +0000
+++ debian/changelog	2011-03-28 07:10:43 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 eucalyptus (2.0.1+bzr1256-0ubuntu2) natty; urgency=low
 
   [ Andres Rodriguez ]
@@ -47,13 +48,28 @@
 
  -- Dave Walker (Daviey) <[e-mail]>  Tue, 15 Feb 2011 10:16:03 +0000
 
+=======
+eucalyptus (2.0+bzr1241-0ubuntu5) UNRELEASED; urgency=low
+
+  [ Dustin Kirkland ]
+  * debian/control: eucalyptus-nc actually depends on parted to create vm backing
+    disks;  normally we get this for free from the Ubuntu server seed, but building
+    the LiveISO with minimal seeds exposed this missing hard dependency
+
+ -- Dustin Kirkland <[e-mail]>  Mon, 22 Nov 2010 18:23:12 -0600
+
+>>>>>>> MERGE-SOURCE
 eucalyptus (2.0+bzr1241-0ubuntu4) maverick; urgency=low
 
+  [ Dave Walker (Daviey) ]
   * debian/eucalyptus-java-common.postinst: On upgrades from Lucid/10.04,
     ensure eucalyptus is stopped before attempting to upgrade the database
     schema. (LP: #649799)
 
- -- Dave Walker (Daviey) <[e-mail]>  Tue, 28 Sep 2010 19:42:41 +0100
+  [ Dustin Kirkland ]
+  * debian/control:
+
+ -- Dustin Kirkland <[e-mail]>  Mon, 22 Nov 2010 18:23:06 -0600
 
 eucalyptus (2.0+bzr1241-0ubuntu3) maverick; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2011-03-04 17:25:04 +0000
+++ debian/control	2011-03-28 07:10:43 +0000
@@ -73,8 +73,13 @@
  openssh-server (>= 1:5.2p1-1ubuntu1),
  openssh-client,
  avahi-utils,
+<<<<<<< TREE
  python,
  python-boto
+=======
+ parted,
+ python
+>>>>>>> MERGE-SOURCE
 Recommends:
  unzip,
  munin-node