Rebase on upstream

2 files changed, 1 insertions, 22 deletions

diff --git a/packages/debian/control.in b/packages/debian/control.in
index fd9f3ffd..7e42b94b 100644
--- a/packages/debian/control.in
+++ b/packages/debian/control.in
@@ -25,6 +25,7 @@ Depends: procps,
 #end for
          python-software-properties | software-properties-common,
          \${misc: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.