Merge lp:~ubuntu-branches/ubuntu/lucid/eucalyptus/lucid-201003031429 into lp:ubuntu/lucid/eucalyptus

[James Westby]

[James Westby (james-w)]

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

[James Westby (james-w)]

Hi Chuck,

Your change to the apport hook that was pushed to bzr
wasn't in the last upload, would you merge it in again?

Thanks,

James

[Chuck Short (zulcss)]

Sure

On Wed, 2010-03-03 at 16:50 +0000, James Westby wrote:
> Hi Chuck,
>
> Your change to the apport hook that was pushed to bzr
> wasn't in the last upload, would you merge it in again?
>
> Thanks,
>
> James
>

Unmerged revisions

128. By Chuck Short on 2010-03-01

debian/source_eucalyptus.py: Fix typo (LP: #520775)

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-03 14:02:24 +0000
+++ debian/changelog	2010-03-03 14:34:18 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 eucalyptus (1.6.2-0ubuntu7) lucid; urgency=low
 
   [ Dustin Kirkland ]
@@ -17,6 +18,14 @@
 
  -- Thierry Carrez <[e-mail]>  Wed, 03 Mar 2010 14:02:24 +0100
 
+=======
+eucalyptus (1.6.2-0ubuntu7) lucid; urgency=low
+
+  * debian/source_eucalyptus.py: Fix typo (LP: #520775) 
+
+ -- chuck <chuck@cartman>  Mon, 01 Mar 2010 08:09:58 -0500
+
+>>>>>>> MERGE-SOURCE
 eucalyptus (1.6.2-0ubuntu6) lucid; urgency=low
 
   * debian/eucalyptus-cc.config, debian/eucalyptus-udeb.finish-install,
 
=== modified file 'debian/source_eucalyptus.py'
--- debian/source_eucalyptus.py	2010-01-27 09:01:56 +0000
+++ debian/source_eucalyptus.py	2010-03-03 14:34:18 +0000
@@ -10,7 +10,7 @@
     version = ''
     for package in packages:
 	try:
-		vesion = packaging.get_versions(package)
+		vesion = packaging.get_version(package)
 	except ValueError:
 		version = 'N/A'
 	if version is None: