[lintian] 01/05: data/common/dh_addons: Move/create from data/debhelper/dh_addons as we plan to use it elsewhere.

[Chris Lamb <chris@chris-lamb.co.uk>]

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

lamby pushed a commit to branch master
in repository lintian.

commit 5a181d6202c0c7f5f5822c011ae233562d37feae
Author: Chris Lamb <lamby@debian.org>
Date:   Mon Jan 29 19:42:47 2018 +0000

    data/common/dh_addons: Move/create from data/debhelper/dh_addons as we plan to use it elsewhere.
---
 checks/debhelper.pm                  | 2 +-
 data/{debhelper => common}/dh_addons | 0
 data/debhelper/dh_addons-manual      | 2 +-
 debian/changelog                     | 3 +++
 private/refresh-debhelper-data       | 9 ++++++++-
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/checks/debhelper.pm b/checks/debhelper.pm
index 6331fff..d5d17bc 100644
--- a/checks/debhelper.pm
+++ b/checks/debhelper.pm
@@ -41,7 +41,7 @@ my $maint_commands = Lintian::Data->new('debhelper/maint_commands');
 my $dh_commands_depends = Lintian::Data->new('debhelper/dh_commands', '=');
 my $filename_configs = Lintian::Data->new('debhelper/filename-config-files');
 my $dh_ver_deps= Lintian::Data->new('debhelper/dh_commands-manual', qr/\|\|/o);
-my $dh_addons = Lintian::Data->new('debhelper/dh_addons', '=');
+my $dh_addons = Lintian::Data->new('common/dh_addons', '=');
 my $dh_addons_manual
   = Lintian::Data->new('debhelper/dh_addons-manual', qr/\|\|/o);
 my $compat_level = Lintian::Data->new('debhelper/compat-level',qr/=/);
diff --git a/data/debhelper/dh_addons b/data/common/dh_addons
similarity index 100%
rename from data/debhelper/dh_addons
rename to data/common/dh_addons
diff --git a/data/debhelper/dh_addons-manual b/data/debhelper/dh_addons-manual
index 3e05c3c..8133f14 100644
--- a/data/debhelper/dh_addons-manual
+++ b/data/debhelper/dh_addons-manual
@@ -1,5 +1,5 @@
 # Manually maintained list of dependencies needed for dh addons. This overrides
-# information from data/debhelper/dh_addons (the latter file is automatically
+# information from data/common/dh_addons (the latter file is automatically
 # generated).
 #
 # Please keep this sorted.
diff --git a/debian/changelog b/debian/changelog
index e240d0a..068c5a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,9 @@ lintian (2.5.73) UNRELEASED; urgency=medium
       first paragraph. Thank to Christoph Biedl for the report and idea.
       (Closes: #879235)
 
+  * data/common/dh_addons:
+    + [CL] Move/create from data/debhelper/dh_addons as we plan to use
+      it elsewhere.
   * data/files/python-generic-modules:
     + [CL] Detect "backports" (and "backport") as overly generic Python
       module names.  (Closes: #888559)
diff --git a/private/refresh-debhelper-data b/private/refresh-debhelper-data
index 8cc1515..35b0022 100755
--- a/private/refresh-debhelper-data
+++ b/private/refresh-debhelper-data
@@ -134,13 +134,20 @@ else
     cat dh_commands \
         | cut -d '=' -f 2 | sort -u > dh_packages
 
-    for f in commands addons packages; do
+    for f in commands packages; do
         rf="$lintian_data/debhelper/dh_$f"
         [ ! -f "$rf" ] ||
             mv "$rf" "${rf}.old"
         create_data_file "$rf" < "dh_$f"
     done
 
+    for f in addons; do
+        rf="$lintian_data/general/dh_$f"
+        [ ! -f "$rf" ] ||
+            mv "$rf" "${rf}.old"
+        create_data_file "$rf" < "dh_$f"
+    done
+
     wget dists/sid/main/binary-i386/Packages.gz
     gunzip Packages.gz
     for package in $(cat dh_packages); do

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