From b04aa7844f2bcb2221a7b32eef581b680779f6a2 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Wed, 24 Nov 2010 18:47:50 +0200 Subject: [PATCH] Sort debian/install as well as debian/*.install --- debian/changelog | 3 ++- wrap-and-sort | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6b9f204..559429d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ ubuntu-dev-tools (0.107) UNRELEASED; urgency=low patches yet. * wrap-and-sort: - Correct typo in options --wrap-allways -> --wrap-always + - Sort debian/install as well as debian/*.install - -- Stefano Rivera Wed, 24 Nov 2010 18:37:49 +0200 + -- Stefano Rivera Wed, 24 Nov 2010 18:47:21 +0200 ubuntu-dev-tools (0.106) experimental; urgency=low diff --git a/wrap-and-sort b/wrap-and-sort index 7025c0a..6d4cbaf 100755 --- a/wrap-and-sort +++ b/wrap-and-sort @@ -132,7 +132,10 @@ def main(script_name, cleanup, wrap_always, 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)