add dependency for 'pkg_resources'

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)
 0.7.0:

packages/bddeb

@@ -33,6 +33,7 @@ PKG_MP = {
     'cheetah': 'python-cheetah',
     'configobj': 'python-configobj',
     'oauth': 'python-oauth',
+    'pkg_resources': 'python-pkg-resources',
     'prettytable': 'python-prettytable',
     'pyyaml': 'python-yaml',
 }

packages/brpm

@@ -39,6 +39,7 @@ PKG_MP = {
     'cheetah': 'python-cheetah',
     'configobj': 'python-configobj',
     'oauth': 'python-oauth',
+    'pkg_resources': 'python-setuptools',
     'prettytable': 'python-prettytable',
     'pyyaml': 'PyYAML',
 }

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