From a1b309111a7c6e983d0292424af158821dd243ab Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 1 Oct 2017 01:34:32 +0100
Subject: [PATCH] Rename lintian-overrides template files to be consistent

---
 debian/bin/gencontrol.py                                      | 4 ++--
 debian/changelog                                              | 1 +
 ...dbg.lintian-override.in => image-dbg.lintian-overrides.in} | 0
 .../{lintian-overrides.perf.in => perf.lintian-overrides.in}  | 0
 4 files changed, 3 insertions(+), 2 deletions(-)
 rename debian/templates/{image-dbg.lintian-override.in => image-dbg.lintian-overrides.in} (100%)
 rename debian/templates/{lintian-overrides.perf.in => perf.lintian-overrides.in} (100%)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index eae272d55..52ef6736e 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -118,7 +118,7 @@ class Gencontrol(Base):
         if self.config.merge('packages').get('tools', True):
             packages.extend(self.process_packages(self.templates["control.tools"], self.vars))
 
-        self._substitute_file('lintian-overrides.perf', self.vars,
+        self._substitute_file('perf.lintian-overrides', self.vars,
                               'debian/linux-perf-%s.lintian-overrides' %
                               self.vars['version'])
 
@@ -499,7 +499,7 @@ class Gencontrol(Base):
             self._substitute_file('image.%s' % name, vars,
                                   'debian/%s.%s' % (image_main['Package'], name))
         if build_debug:
-            self._substitute_file('image-dbg.lintian-override', vars,
+            self._substitute_file('image-dbg.lintian-overrides', vars,
                                   'debian/linux-image-%s%s-dbg.lintian-overrides' %
                                   (vars['abiname'], vars['localversion']))
 
diff --git a/debian/changelog b/debian/changelog
index 1d42f08fb..1e02b50a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ linux (4.13.4-1~exp1) UNRELEASED; urgency=medium
   * debian/control: Move many build dependencies to Build-Depends-Arch field
   * debian/control: Remove obsolete workarounds and alternate build deps
   * usbip: Stop building broken libusbip-dev package
+  * Rename lintian-overrides template files to be consistent
 
   [ Uwe Kleine-König ]
   * [arm64] really enable NET_DSA_MV88E6XXX for Espressobin
diff --git a/debian/templates/image-dbg.lintian-override.in b/debian/templates/image-dbg.lintian-overrides.in
similarity index 100%
rename from debian/templates/image-dbg.lintian-override.in
rename to debian/templates/image-dbg.lintian-overrides.in
diff --git a/debian/templates/lintian-overrides.perf.in b/debian/templates/perf.lintian-overrides.in
similarity index 100%
rename from debian/templates/lintian-overrides.perf.in
rename to debian/templates/perf.lintian-overrides.in