[devscripts] 06/06: wrap-and-sort: Add dirs, docs, examples, info, links, maintscript and

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch master
in repository devscripts.

commit e339a89adab31e17a7701a4dff53607c02e1f697
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Mon Oct 20 17:03:37 2014 +0200

    wrap-and-sort: Add dirs, docs, examples, info, links, maintscript and
    
    manpages (all can also be prefixed by the binary package name) to the
    files in the debian/ directory that get sorted alphabetically.
    
    Thanks to David Prévot for completing this list (Closes: #765338).
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog      |  5 +++++
 scripts/wrap-and-sort | 17 ++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d945290..0ce57fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,11 @@ devscripts (2.15.1+exp1) UNRELEASED; urgency=medium
   [ Iain Lane ]
   * rmadison: The short option for --regex is -r, not -s.
 
+  [ Fabian Greffrath ]
+  * wrap-and-sort: Add dirs, docs, examples, info, links, maintscript and
+    manpages (all can also be prefixed by the binary package name) to the
+    files in the debian/ directory that get sorted alphabetically.  (Closes: #765338)
+
  -- James McCoy <jamessan at debian.org>  Sat, 03 Jan 2015 00:47:36 -0500
 
 devscripts (2.15.1) unstable; urgency=medium
diff --git a/scripts/wrap-and-sort b/scripts/wrap-and-sort
index 48b6ce0..b66e3e2 100755
--- a/scripts/wrap-and-sort
+++ b/scripts/wrap-and-sort
@@ -44,8 +44,22 @@ SUPPORTED_FILES = (
     "control*.in",
     "copyright",
     "copyright.in",
+    "dirs",
+    "*.dirs",
+    "docs",
+    "*.docs",
+    "examples",
+    "*.examples",
+    "info",
+    "*.info",
     "install",
     "*.install",
+    "links",
+    "*.links",
+    "mainscript",
+    "*.maintscript",
+    "manpages",
+    "*.manpages",
 )
 
 
@@ -167,7 +181,8 @@ def wrap_and_sort(options):
             print(copyright_file)
         remove_trailing_whitespaces(copyright_file)
 
-    install_files = [f for f in options.files if re.search("install$", f)]
+    pattern = "(dirs|docs|examples|info|install|links|maintscript|manpages)$"
+    install_files = [f for f in options.files if re.search(pattern, f)]
     for install_file in sorted(install_files):
         if options.verbose:
             print(install_file)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git