[SCM] Git repository for devscripts branch, master, updated. v2.12.4-140-g3776e88

[Benjamin Drung]

The following commit has been merged in the master branch:
commit a48b4e6c846e301fa12da2c111cc51cedc0604e3
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Feb 12 23:53:09 2013 +0100

    wrap-and-sort: Put special entries (variables and placeholders) at the end of the list.

diff --git a/debian/changelog b/debian/changelog
index 3511d11..f6f177d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,8 @@ devscripts (2.12.6+exp1) UNRELEASED; urgency=low
     Thanks to Colin Watson. (Closes: #694760)
   * suspicious-source: Add inode/symlink and image/x-xpmi to whitelisted
     mime-types.
+  * wrap-and-sort:
+    - Put special entries (variables and placeholders) at the end of the list.
 
   [ Cyril Brulebois ]
   * Don't auto reverse diffs when DEBDIFF_AUTO_VER_SORT is set to yes, and
diff --git a/scripts/wrap-and-sort b/scripts/wrap-and-sort
index 82c5dda..bbe1d05 100755
--- a/scripts/wrap-and-sort
+++ b/scripts/wrap-and-sort
@@ -129,9 +129,9 @@ def remove_trailing_whitespaces(filename):
     f.close()
 
 def sort_list(unsorted_list):
-    normal = [x for x in unsorted_list if not x.startswith("${")]
-    param = [x for x in unsorted_list if x.startswith("${")]
-    return sorted(normal) + sorted(param)
+    packages = [x for x in unsorted_list if re.match("[a-z0-9]", x)]
+    special = [x for x in unsorted_list if not re.match("[a-z0-9]", x)]
+    return sorted(packages) + sorted(special)
 
 def wrap_and_sort(options):
     control_files = [f for f in options.files if re.search("/control[^/]*$", f)]

-- 
Git repository for devscripts