[Merge] lp:~gandelman-a/ubuntu/lucid/facter/lp732953_876130 into lp:ubuntu/lucid-updates/facter

[Adam Gandelman]

Adam Gandelman has proposed merging lp:~gandelman-a/ubuntu/lucid/facter/lp732953_876130 into lp:ubuntu/lucid-updates/facter.

Requested reviews:
  Ubuntu Development Team (ubuntu-dev)
Related bugs:
  Bug #732953 in facter (Ubuntu Lucid): "can_connect function inside ec2.rb always return false"
  https://bugs.launchpad.net/ubuntu/lucid/+source/facter/+bug/732953
  Bug #876130 in facter (Ubuntu Lucid): "Incorrect operatingsystem reported in puppet run"
  https://bugs.launchpad.net/ubuntu/lucid/+source/facter/+bug/876130

For more details, see:
https://code.launchpad.net/~gandelman-a/ubuntu/lucid/facter/lp732953_876130/+merge/80366

Rebased a previous MP on lucid-updates. Properly versioned and applied patches as per feedback from James Page on original MP:

A few comments that need resolution before we can upload:

1) The branch is currently based on 1.5.6-2ubuntu2 from the lucid release pocket; it needs to be based on 1.5.6-2ubuntu2.1 from lucid-updates - this is why the merge shows a conflict in debian/changelog

2) This package in Lucid uses an earlier version of debhelper and is source format 1.0; so patches don't get automatically applied.  The correct course of action (as one patch has already be directly applied in 1.5.6-2ubuntu2.1) is to directly apply the patches to the upstream source tree.  Ugly but its the most minimal change for the SRU and does not impact the update that has already been made
-- 
https://code.launchpad.net/~gandelman-a/ubuntu/lucid/facter/lp732953_876130/+merge/80366
Your team Ubuntu Development Team is requested to review the proposed merge of lp:~gandelman-a/ubuntu/lucid/facter/lp732953_876130 into lp:ubuntu/lucid-updates/facter.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 1646 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20111025/6f7d577c/attachment.diff>