summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rwxr-xr-xpackages/bddeb1
-rwxr-xr-xpackages/brpm1
-rw-r--r--packages/debian/control.in1
4 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 21584bb7..14efc4b1 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)
0.7.0:
diff --git a/packages/bddeb b/packages/bddeb
index bda3170d..a92dad70 100755
--- a/packages/bddeb
+++ b/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',
}
diff --git a/packages/brpm b/packages/brpm
index eea2a046..0b1e33cf 100755
--- a/packages/brpm
+++ b/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',
}
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