merge from trunk

6 files changed, 4 insertions, 27 deletions

diff --git a/packages/bddeb b/packages/bddeb
index 8de4d466..9552aa40 100755
--- a/packages/bddeb
+++ b/packages/bddeb
@@ -29,10 +29,9 @@ import argparse
 # file pypi package name to a debian/ubuntu package name.
 PKG_MP = {
     'argparse': 'python-argparse',
-    'boto': 'python-boto',
     'cheetah': 'python-cheetah',
     'configobj': 'python-configobj',
-    'jsonpatch': 'python-json-patch',
+    'jsonpatch': 'python-jsonpatch | python-json-patch',
     'oauth': 'python-oauth',
     'prettytable': 'python-prettytable',
     'pyserial': 'python-serial',
diff --git a/packages/brpm b/packages/brpm
index 8c90a0ab..f8ba1db1 100755
--- a/packages/brpm
+++ b/packages/brpm
@@ -36,7 +36,6 @@ from cloudinit import util
 PKG_MP = {
     'redhat': {
         'argparse': 'python-argparse',
-        'boto': 'python-boto',
         'cheetah': 'python-cheetah',
         'configobj': 'python-configobj',
         'jsonpatch': 'python-jsonpatch',
@@ -48,7 +47,6 @@ PKG_MP = {
     },
     'suse': {
         'argparse': 'python-argparse',
-        'boto': 'python-boto',
         'cheetah': 'python-cheetah',
         'configobj': 'python-configobj',
         'jsonpatch': 'python-jsonpatch',
diff --git a/packages/debian/control.in b/packages/debian/control.in
index b9352f5b..7e42b94b 100644
--- a/packages/debian/control.in
+++ b/packages/debian/control.in
@@ -25,7 +25,7 @@ Depends: procps,
 #end for
          python-software-properties | software-properties-common,
          \${misc:Depends},
-         \${python:Depends}
+Recommends: sudo
 XB-Python-Version: \${python:Versions}
 Description: Init scripts for cloud instances
  Cloud instances need special scripts to run during initialisation
diff --git a/packages/debian/copyright b/packages/debian/copyright
index dc993525..f55bb7a3 100644
--- a/packages/debian/copyright
+++ b/packages/debian/copyright
@@ -27,25 +27,3 @@ License: GPL-3
 
  The complete text of the GPL version 3 can be seen in
  /usr/share/common-licenses/GPL-3.
-
-Files: cloudinit/boto_utils.py
-Copyright: 2006,2007, Mitch Garnaat http://garnaat.org/
-License: MIT
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish, dis-
- tribute, sublicense, and/or sell copies of the Software, and to permit
- persons to whom the Software is furnished to do so, subject to the fol-
- lowing conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
- ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
- SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- IN THE SOFTWARE.
diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in
index 30bcd050..9614e2f1 100644
--- a/packages/redhat/cloud-init.spec.in
+++ b/packages/redhat/cloud-init.spec.in
@@ -34,6 +34,7 @@ Requires:       e2fsprogs
 Requires:       net-tools
 Requires:       procps
 Requires:       shadow-utils
+Requires:       sudo
 
 # Install pypi 'dynamic' requirements
 #for $r in $requires
diff --git a/packages/suse/cloud-init.spec.in b/packages/suse/cloud-init.spec.in
index 296505c6..c30a6fae 100644
--- a/packages/suse/cloud-init.spec.in
+++ b/packages/suse/cloud-init.spec.in
@@ -43,6 +43,7 @@ Requires:       iproute2
 Requires:       e2fsprogs
 Requires:       net-tools
 Requires:       procps
+Requires:       sudo
 
 # Install pypi 'dynamic' requirements
 #for $r in $requires