[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[lintian] 01/01: Ensure xfonts-foo are recognised as part of the "x11" section to match the definition on https://packages.debian.org/en/sid/. (Closes: #878609)



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

lamby pushed a commit to branch master
in repository lintian.

commit 9df7f66ef14f64f3bf1de49bfb188c7ee817eb67
Author: Chris Lamb <lamby@debian.org>
Date:   Tue Jan 23 14:51:28 2018 +1100

    Ensure xfonts-foo are recognised as part of the "x11" section to match the definition on https://packages.debian.org/en/sid/. (Closes: #878609)
---
 data/fields/name_section_mappings                  |  3 ++-
 debian/changelog                                   |  5 +++++
 .../fields-wrong-section/debian/debian/control.in  | 23 ++++++++++++++++++++++
 t/tests/fields-wrong-section/tags                  |  2 ++
 4 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/data/fields/name_section_mappings b/data/fields/name_section_mappings
index fba241b..6c67cae 100644
--- a/data/fields/name_section_mappings
+++ b/data/fields/name_section_mappings
@@ -33,7 +33,8 @@ lib.*-cil(?:-dev)?$          => cli-mono
 ^lib.*-(tcl|lua|gst)$                   => interpreters
 # data files
 ^gir\d+\.\d+-.*-\d+\.\d+$    => introspection
-^(?:x?fonts|ttf)-                       => fonts
+^xfonts-                                => x11
+^(?:fonts|ttf)-                       => fonts
 ^lib(?:nss|pam)-                                => admin
 ^(?:aspell|hunspell|myspell|mythes)-    => localization
 ^hyphen-[a-z]{2}(?:-[a-z]{2})?$         => localization
diff --git a/debian/changelog b/debian/changelog
index 9d223c0..9355142 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,11 @@ lintian (2.5.72) UNRELEASED; urgency=medium
     + [CL] Clarify that paragraph ordering matters in the description of
       the unused-file-paragraph-in-dep5-copyright tag.  (Closes: #762261)
 
+  * data/fields/name_section_mappings:
+    + [CL] Ensure xfonts-foo are recognised as part of the "x11" section to
+      match the definition on https://packages.debian.org/en/sid/.
+      (Closes: #878609)
+
   * debian/copyright:
     + [CL] Add missing initials for Gergely Nagy, Sylvestre Ledru and Steve
       Langasek.  (Closes: #831729)
diff --git a/t/tests/fields-wrong-section/debian/debian/control.in b/t/tests/fields-wrong-section/debian/debian/control.in
index 73bc853..e745d90 100644
--- a/t/tests/fields-wrong-section/debian/debian/control.in
+++ b/t/tests/fields-wrong-section/debian/debian/control.in
@@ -228,3 +228,26 @@ Description: {$description} (PAM module with number suffix)
  Lintian.  It is part of the Lintian test suite and may do very odd
  things.  It should not be installed like a regular package.  It may
  be an empty package.
+
+Package: fonts-{$source}1
+Architecture: all
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Multi-Arch: foreign
+Description: {$description} (fonts)
+ Test for font modules.
+ .
+ This is a test package designed to exercise some feature or tag of
+ Lintian.  It is part of the Lintian test suite and may do very odd
+ things.  It should not be installed like a regular package.  It may
+ be an empty package.
+
+Package: xfonts-{$source}1
+Architecture: all
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Description: {$description} (xfonts)
+ Test for xfonts modules.
+ .
+ This is a test package designed to exercise some feature or tag of
+ Lintian.  It is part of the Lintian test suite and may do very odd
+ things.  It should not be installed like a regular package.  It may
+ be an empty package.
diff --git a/t/tests/fields-wrong-section/tags b/t/tests/fields-wrong-section/tags
index ac9a891..d6e8996 100644
--- a/t/tests/fields-wrong-section/tags
+++ b/t/tests/fields-wrong-section/tags
@@ -2,6 +2,7 @@ I: fields-wrong-section source: debian-control-has-obsolete-dbg-package fields-w
 I: fields-wrong-section-contrib-doc: wrong-section-according-to-package-name fields-wrong-section-contrib-doc => contrib/doc
 I: fields-wrong-section-dbg: wrong-section-according-to-package-name fields-wrong-section-dbg => debug
 I: fields-wrong-section-doc: wrong-section-according-to-package-name fields-wrong-section-doc => doc
+I: fonts-fields-wrong-section1: wrong-section-according-to-package-name fonts-fields-wrong-section1 => fonts
 I: gir1.2-fields-wrong-section-0.1: wrong-section-according-to-package-name gir1.2-fields-wrong-section-0.1 => introspection
 I: libfields-wrong-section-cil: wrong-section-according-to-package-name libfields-wrong-section-cil => cli-mono
 I: libfields-wrong-section-dev: wrong-section-according-to-package-name libfields-wrong-section-dev => libdevel
@@ -18,3 +19,4 @@ I: libphp-fields-wrong-section: wrong-section-according-to-package-name libphp-f
 I: python-fields-wrong-section: wrong-section-according-to-package-name python-fields-wrong-section => python
 I: python3-fields-wrong-section: wrong-section-according-to-package-name python3-fields-wrong-section => python
 I: r-cran-fields-wrong-section: wrong-section-according-to-package-name r-cran-fields-wrong-section => gnu-r
+I: xfonts-fields-wrong-section1: wrong-section-according-to-package-name xfonts-fields-wrong-section1 => x11

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


Reply to: