From 9d312fbeec5ad3bc6a202dcbbe2ce771c36df78e Mon Sep 17 00:00:00 2001
From: Stefano Rivera <stefanor@ubuntu.com>
Date: Wed, 24 Nov 2010 22:17:23 +0200
Subject: [PATCH] Add configurable debian directory location

---
 debian/changelog    |  3 ++-
 doc/wrap-and-sort.1 |  3 +++
 wrap-and-sort       | 45 ++++++++++++++++++++++++++-------------------
 3 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 681e61f..a2a0872 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ ubuntu-dev-tools (0.107) UNRELEASED; urgency=low
     - Sort debian/install as well as debian/*.install
     - Add one-space-indentation option: --short-indent
     - Remove null-entry from trailing comma in sorted lists
+    - Add configurable debian directory location
   * dgetlp, grab-merge, pull-lp-source, syncpackage: Export DEB_VENDOR=Ubuntu
     when unpacking source packages. 3.0 (quilt) has optional per-vendor patch
     series.
@@ -15,7 +16,7 @@ ubuntu-dev-tools (0.107) UNRELEASED; urgency=low
   [ Benjamin Drung ]
   * wrap-and-sort: Remove duplicate items from sorted lists.
 
- -- Benjamin Drung <bdrung@ubuntu.com>  Wed, 24 Nov 2010 21:00:40 +0100
+ -- Stefano Rivera <stefanor@ubuntu.com>  Wed, 24 Nov 2010 22:12:57 +0200
 
 ubuntu-dev-tools (0.106) experimental; urgency=low
 
diff --git a/doc/wrap-and-sort.1 b/doc/wrap-and-sort.1
index e7a88dd..54f78d3 100644
--- a/doc/wrap-and-sort.1
+++ b/doc/wrap-and-sort.1
@@ -47,6 +47,9 @@ field name)
 \fB\-n\fR, \fB\-\-no\-cleanup\fR
 do not remove trailing whitespaces
 .TP
+\fB\-d\fIPATH\fR, \fB\-\-debian\-directory\fR=\fIPATH\fR
+location of the \fIdebian\fR directory. Default: \fB./debian\fR
+.TP
 \fB\-v\fR, \fB\-\-verbose\fR
 print all files that are touched
 
diff --git a/wrap-and-sort b/wrap-and-sort
index d44ce11..c6c653c 100755
--- a/wrap-and-sort
+++ b/wrap-and-sort
@@ -18,6 +18,7 @@ import debian.deb822
 import glob
 import optparse
 import os
+import os.path
 import sys
 
 CONTROL_LIST_FIELDS = (
@@ -123,33 +124,30 @@ def sort_list(l):
     param = filter(lambda x: x.startswith("${"), l)
     return sorted(normal) + sorted(param)
 
-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)
-        sys.exit(1)
+def main(options):
+    debdir = lambda x: os.path.join(options.debian_directory, x)
 
     control_files = filter(os.path.isfile,
-            ["debian/control", "debian/control.in"])
+            [debdir("control"), debdir("control.in")])
     for control_file in control_files:
-        if verbose:
+        if options.verbose:
             print control_file
-        control = Control(control_file, cleanup)
-        control.wrap_and_sort(wrap_always, short_indent)
+        control = Control(control_file, options.cleanup)
+        control.wrap_and_sort(options.wrap_always, options.short_indent)
         control.save()
 
     copyright_files = filter(os.path.isfile,
-            ["debian/copyright", "debian/copyright.in"])
+            [debdir("copyright"), debdir("copyright.in")])
     for copyright_file in copyright_files:
-        if verbose:
+        if options.verbose:
             print copyright_file
         remove_trailing_whitespaces(copyright_file)
 
-    install_files = sorted(glob.glob("debian/*.install"))
-    if os.path.isfile("debian/install"):
-        install_files.insert(0, "debian/install")
+    install_files = sorted(glob.glob(debdir("*.install")))
+    if os.path.isfile(debdir("install")):
+        install_files.insert(0, debdir("install"))
     for install_file in install_files:
-        if verbose:
+        if options.verbose:
             print install_file
         install = Install(install_file)
         install.sort()
@@ -166,10 +164,14 @@ if __name__ == "__main__":
                            "long line", action="store_true", default=False)
     parser.add_option("-s", "--short-indent", dest="short_indent",
                       help="only indent wrapped lines by one space (default is "
-                           "in-line with the field name)", action="store_true",
-                      default=False)
+                           "in-line with the field name)",
+                      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("-d", "--debian-directory",
+                      help="location of the 'debian' directory. "
+                      "Default: ./debian", dest="debian_directory",
+                      metavar="PATH", default="debian")
     parser.add_option("-v", "--verbose", help="print more information",
                       dest="verbose", action="store_true", default=False)
 
@@ -180,5 +182,10 @@ if __name__ == "__main__":
                               "specified: %s") % (script_name, ", ".join(args))
         sys.exit(1)
 
-    main(script_name, options.cleanup, options.wrap_always,
-         options.short_indent, options.verbose)
+    if not os.path.isdir(options.debian_directory):
+        print >> sys.stderr, (
+                '%s: Error: Debian directory not found, expecting "%s"'
+                % (script_name, options.debian_directory))
+        sys.exit(1)
+
+    main(options)