* wrap-and-sort:

- Correct typo in options --wrap-allways -> --wrap-always
  - Sort debian/install as well as debian/*.install
  - Add one-space-indentation option: --short-indent
  - Remove null-entry from trailing comma in sorted lists

debian/changelog

@@ -2,8 +2,13 @@ ubuntu-dev-tools (0.107) UNRELEASED; urgency=low
 
   * edit-patch: Detect quilt patch-system in 3.0 (quilt) packages without any
     patches yet.
+  * wrap-and-sort:
+    - Correct typo in options --wrap-allways -> --wrap-always
+    - Sort debian/install as well as debian/*.install
+    - Add one-space-indentation option: --short-indent
+    - Remove null-entry from trailing comma in sorted lists
 
- -- Stefano Rivera <stefanor@ubuntu.com>  Wed, 24 Nov 2010 17:58:18 +0200
+ -- Stefano Rivera <stefanor@ubuntu.com>  Wed, 24 Nov 2010 20:02:21 +0200
 
 ubuntu-dev-tools (0.106) experimental; urgency=low
 

wrap-and-sort

@@ -53,24 +53,35 @@ class Control(object):
         f.write(content.encode("utf-8"))
         f.close()
 
-	def wrap_and_sort(self, wrap_allways=True):
+    def wrap_and_sort(self, wrap_always, short_indent):
         for paragraph in self.paragraphs:
             for field in CONTROL_LIST_FIELDS:
                 if field in paragraph:
-					self._wrap_field(paragraph, field, wrap_allways)
+                    self._wrap_field(paragraph, field, wrap_always,
+                                     short_indent)
             if "Uploaders" in paragraph:
-				self._wrap_field(paragraph, "Uploaders", wrap_allways, False)
+                self._wrap_field(paragraph, "Uploaders", wrap_always,
+                                 short_indent, False)
 
-	def _wrap_field(self, control, entry, wrap_allways, sort=True):
+    def _wrap_field(self, control, entry, wrap_always, short_indent, sort=True):
         packages = map(lambda x: x.strip(), control[entry].split(","))
         if sort:
             packages = sort_list(packages)
+            # Not explicitly disallowed by Policy but known to break QA tools:
+            if "" in packages:
+                packages.remove("")
 
-		lenght = len(entry) + 2 * len(packages) + sum(map(len, packages))
-		if wrap_allways or lenght > 80:
-			indentation = " " * (len(entry) + 2)
+        length = len(entry) + 2 * len(packages) + sum(map(len, packages))
+        if wrap_always or length > 80:
+            indentation = " "
+            if not short_indent:
+                indentation *= len(entry) + 2
             packages_with_indention = map(lambda x: indentation + x, packages)
-			control[entry] = ",\n".join(packages_with_indention).strip()
+            packages_with_indention = ",\n".join(packages_with_indention)
+            if short_indent:
+                control[entry] = "\n" + packages_with_indention
+            else:
+                control[entry] = packages_with_indention.strip()
         else:
             control[entry] = ", ".join(packages).strip()
 
@@ -110,7 +121,7 @@ def sort_list(l):
     param = filter(lambda x: x.startswith("${"), l)
     return sorted(normal) + sorted(param)
 
-def main(script_name, cleanup, wrap_allways, verbose=False):
+def main(script_name, cleanup, wrap_always, short_indent, verbose=False):
     if not os.path.isdir("debian"):
         print >> sys.stderr, "%s: Error: No debian directory found." % \
                 (script_name)
@@ -122,7 +133,7 @@ def main(script_name, cleanup, wrap_allways, verbose=False):
         if verbose:
             print control_file
         control = Control(control_file, cleanup)
-		control.wrap_and_sort(wrap_allways)
+        control.wrap_and_sort(wrap_always, short_indent)
         control.save()
 
     copyright_files = filter(os.path.isfile,
@@ -132,7 +143,10 @@ def main(script_name, cleanup, wrap_allways, verbose=False):
             print copyright_file
         remove_trailing_whitespaces(copyright_file)
 
-	for install_file in sorted(glob.glob("debian/*.install")):
+    install_files = sorted(glob.glob("debian/*.install"))
+    if os.path.isfile("debian/install"):
+        install_files.insert(0, "debian/install")
+    for install_file in install_files:
         if verbose:
             print install_file
         install = Install(install_file)
@@ -145,9 +159,13 @@ if __name__ == "__main__":
     epilog = "See %s(1) for more info." % (script_name)
     parser = optparse.OptionParser(usage=usage, epilog=epilog)
 
-	parser.add_option("-a", "--wrap-allways",
+    parser.add_option("-a", "--wrap-always",
             help="wrap lists even if they fit into one 80 character long line",
-			dest="wrap_allways", action="store_true", default=False)
+            dest="wrap_always", action="store_true", default=False)
+    parser.add_option("-s", "--short-indent",
+            help="only indent wrapped lines by one space (default is in-line "
+                 "with the field name)",
+                 dest="short_indent", action="store_true", default=False)
     parser.add_option("-n", "--no-cleanup", help="don't cleanup whitespaces",
             dest="cleanup", action="store_false", default=True)
     parser.add_option("-v", "--verbose", help="print more information",
@@ -160,4 +178,5 @@ if __name__ == "__main__":
                 "Unsupported additional parameters specified", ", ".join(args))
         sys.exit(1)
 
-	main(script_name, options.cleanup, options.wrap_allways, options.verbose)
+    main(script_name, options.cleanup, options.wrap_always,
+         options.short_indent, options.verbose)