merge from trunk

4 files changed, 9 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 23612228..fccc9239 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,7 +40,7 @@
    dictionary and force it to full expand so that if cloud-init blocks the ec2
    metadata port the lazy loaded dictionary will continue working properly 
    instead of trying to make additional url calls which will fail (LP: #1068801)
-    - Added dependency on distribute's python-pkg-resources
+    - Added dependency: python-pkg-resources (deb), python-setuptools (rpm)
  - use a set of helper/parsing classes to perform system configuration
    for easier test.  (/etc/sysconfig, /etc/hostname, resolv.conf, /etc/hosts)
  - add power_state_change config module for shutting down stystem after
diff --git a/packages/bddeb b/packages/bddeb
index 2cfddb99..a92dad70 100755
--- a/packages/bddeb
+++ b/packages/bddeb
@@ -28,13 +28,14 @@ import argparse
 # use in our debian 'control' file, this is a translation of the 'requires'
 # file pypi package name to a debian/ubuntu package name.
 PKG_MP = {
+    'argparse': 'python-argparse',
     'boto': 'python-boto',
+    'cheetah': 'python-cheetah',
     'configobj': 'python-configobj',
     'oauth': 'python-oauth',
-    'pyyaml': 'python-yaml',
+    'pkg_resources': 'python-pkg-resources',
     'prettytable': 'python-prettytable',
-    'argparse': 'python-argparse',
-    'cheetah': 'python-cheetah',
+    'pyyaml': 'python-yaml',
 }
 DEBUILD_ARGS = ["-us", "-S", "-uc"]
 
diff --git a/packages/brpm b/packages/brpm
index e6b03609..0b1e33cf 100755
--- a/packages/brpm
+++ b/packages/brpm
@@ -34,13 +34,14 @@ from cloudinit import util
 # this is a translation of the 'requires'
 # file pypi package name to a redhat/fedora package name.
 PKG_MP = {
+    'argparse': 'python-argparse',
     'boto': 'python-boto',
     'cheetah': 'python-cheetah',
-    'prettytable': 'python-prettytable',
-    'oauth': 'python-oauth',
     'configobj': 'python-configobj',
+    'oauth': 'python-oauth',
+    'pkg_resources': 'python-setuptools',
+    'prettytable': 'python-prettytable',
     'pyyaml': 'PyYAML',
-    'argparse': 'python-argparse',
 }
 
 # Subdirectories of the ~/rpmbuild dir
diff --git a/packages/debian/control.in b/packages/debian/control.in
index dace0356..edb5aff5 100644
--- a/packages/debian/control.in
+++ b/packages/debian/control.in
@@ -19,7 +19,6 @@ Standards-Version: 3.9.3
 Package: cloud-init
 Architecture: all
 Depends: cloud-utils,
-         distribute,
          procps,
          python,
 #for $r in $requires