Update to code on trunk.

4 files changed, 22 insertions, 12 deletions

diff --git a/packages/bddeb b/packages/bddeb
index 2cfddb99..61399739 100755
--- a/packages/bddeb
+++ b/packages/bddeb
@@ -28,18 +28,18 @@ 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',
     'prettytable': 'python-prettytable',
-    'argparse': 'python-argparse',
-    'cheetah': 'python-cheetah',
+    'pyyaml': 'python-yaml',
 }
-DEBUILD_ARGS = ["-us", "-S", "-uc"]
+DEBUILD_ARGS = ["-us", "-S", "-uc", "-d"]
 
 
-def write_debian_folder(root, version, revno):
+def write_debian_folder(root, version, revno, append_requires=[]):
     deb_dir = util.abs_join(root, 'debian')
     os.makedirs(deb_dir)
 
@@ -58,7 +58,7 @@ def write_debian_folder(root, version, revno):
     pkgs = [p.lower().strip() for p in stdout.splitlines()]
 
     # Map to known packages
-    requires = []
+    requires = append_requires
     for p in pkgs:
         tgt_pkg = PKG_MP.get(p)
         if not tgt_pkg:
@@ -87,6 +87,11 @@ def main():
                               " (default: %(default)s)"),
                         default=False,
                         action='store_true')
+    parser.add_argument("--no-cloud-utils", dest="no_cloud_utils",
+                        help=("don't depend on cloud-utils package"
+                              " (default: %(default)s)"),
+                        default=False,
+                        action='store_true')
 
     for ent in DEBUILD_ARGS:
         parser.add_argument(ent, dest="debuild_args", action='append_const',
@@ -128,7 +133,11 @@ def main():
         shutil.move(extracted_name, xdir)
 
         print("Creating a debian/ folder in %r" % (xdir))
-        write_debian_folder(xdir, version, revno)
+        if not args.no_cloud_utils:
+            append_requires=['cloud-utils']
+        else:
+            append_requires=[]
+        write_debian_folder(xdir, version, revno, append_requires)
 
         # The naming here seems to follow some debian standard
         # so it will whine if it is changed...
diff --git a/packages/brpm b/packages/brpm
index e6b03609..eea2a046 100755
--- a/packages/brpm
+++ b/packages/brpm
@@ -34,13 +34,13 @@ 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',
+    '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 edb5aff5..b9352f5b 100644
--- a/packages/debian/control.in
+++ b/packages/debian/control.in
@@ -18,8 +18,7 @@ Standards-Version: 3.9.3
 
 Package: cloud-init
 Architecture: all
-Depends: cloud-utils,
-         procps,
+Depends: procps,
          python,
 #for $r in $requires
          ${r},
diff --git a/packages/debian/watch b/packages/debian/watch
new file mode 100644
index 00000000..0f7a600b
--- /dev/null
+++ b/packages/debian/watch
@@ -0,0 +1,2 @@
+version=3
+https://launchpad.net/cloud-init/+download .*/\+download/cloud-init-(.+)\.tar.gz