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

Benjamin Drung bdrung at debian.org
Tue Feb 12 22:53:59 UTC 2013


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

    wrap-and-sort: Sort debian/control*.in files too.

diff --git a/debian/changelog b/debian/changelog
index f6f177d..f510700 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,7 @@ devscripts (2.12.6+exp1) UNRELEASED; urgency=low
     mime-types.
   * wrap-and-sort:
     - Put special entries (variables and placeholders) at the end of the list.
+    - Sort debian/control*.in files too.
 
   [ 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 bbe1d05..bbb35a4 100755
--- a/scripts/wrap-and-sort
+++ b/scripts/wrap-and-sort
@@ -41,7 +41,7 @@ CONTROL_LIST_FIELDS = (
 
 SUPPORTED_FILES = (
     "control",
-    "control.in",
+    "control*.in",
     "copyright",
     "copyright.in",
     "install",

-- 
Git repository for devscripts



More information about the devscripts-devel mailing list