[lintian] 01/01: Apply patch from Guillem Jover to add more section mappings. (Closes: #874121)
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository lintian.
commit c85f00e3806852db8d8adbe4cd6b94f73b0424cf
Author: Guillem Jover <guillem@debian.org>
Date: Mon Sep 4 22:18:56 2017 +0100
Apply patch from Guillem Jover to add more section mappings. (Closes: #874121)
Signed-off-by: Chris Lamb <lamby@debian.org>
---
data/fields/name_section_mappings | 32 ++++++++++++++++++++--
debian/changelog | 2 ++
.../debian/debian/control.in | 2 +-
.../debian/debian/control.in | 1 +
.../debian/debian/control.in | 1 +
.../debian/debian/control.in | 2 ++
t/tests/fields-aspell/debian/debian/control.in | 2 +-
.../debian/debian/control.in | 2 +-
t/tests/files-fonts/debian/debian/control.in | 1 +
.../debian/debian/control.in | 1 +
10 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/data/fields/name_section_mappings b/data/fields/name_section_mappings
index 116fa38..12e9bb8 100644
--- a/data/fields/name_section_mappings
+++ b/data/fields/name_section_mappings
@@ -2,18 +2,44 @@
# this list is tried from top to bottom
-docs?$ => doc
-dbg(?:sym)?$ => debug
+# application or framework specific
+^lib(?:apache2|nginx)-mod- => httpd
+^lighttpd-mod => httpd
+\.(?:framework|tool|app)(?:-common)?$ => gnustep
+^gnustep- => gnustep
+^moblin- => embedded
+# language-specific
^node- => javascript
^(?:python-)?zope => zope
^python3?- => python
^r-(?:cran|bioc|other)- => gnu-r
+^(?:cl|elpa)- => lisp
+-elisp(?:-.*)$ => lisp
+^lib.*-guile$ => lisp
+^guile- => lisp
^lib.*-perl$ => perl
lib.*-cil(?:-dev)?$ => cli-mono
-^lib.*-(?:java|gcj)$ => java
-^(?:lib)php- => php
+^lib.*-(?:java|gcj|jni)$ => java
+^(?:lib)?php(?:\d(?:\.\d)?)?- => php
+^lib-.*-php$ => php
+^haskell- => haskell
^lib(?:hugs|ghc6?)- => haskell
^lib.*-ruby(?:1\.\d)?$ => ruby
+^ruby- => ruby
+^lib.*-rust-dev$ => rust
+^rust- => rust
^lib.*-(?:ocaml|camlp4)-dev$ => ocaml
^libjs- => javascript
+^lib.*-(tcl|lua|gst) => interpreters
+# data files
^gir\d+\.\d+-.*-\d+\.\d+$ => introspection
+^(?:x?fonts|ttf)- => fonts
+^(?:aspell|hunspell|myspell|mythes)- => localization
+^hyphen-[a-z]{2}(?:-[a-z]{2})?$ => localization
+^dict-freedict- => localization
+^gcompris-sound- => localization
+-l10n(?:-.*)?$ => localization
+-(dkms|firmware)$ => kernel
# catch remaining should be after specific lib
-^lib.*-dev$ => libdevel
+^lib.*-(dev|headers)$ => libdevel
+^lib.*\d[ad]?$ => libs
diff --git a/debian/changelog b/debian/changelog
index c605635..986c271 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -113,6 +113,8 @@ lintian (2.5.53) UNRELEASED; urgency=medium
openjpeg2. (Closes: #762956)
* data/fields/name_section_mappings:
+ [BR] node- package section is javascript.
+ + [CL] Apply patch from Guillem Jover to add more section mappings.
+ (Closes: #874121)
* data/fields/obsolete-packages:
+ [MR] Add dh-systemd. (Closes: #872076)
* data/files/obsolete-paths:
diff --git a/t/tests/apache2-modules-general/debian/debian/control.in b/t/tests/apache2-modules-general/debian/debian/control.in
index f2f2aab..f908970 100644
--- a/t/tests/apache2-modules-general/debian/debian/control.in
+++ b/t/tests/apache2-modules-general/debian/debian/control.in
@@ -1,5 +1,5 @@
Source: {$source}
-Section: web
+Section: httpd
Priority: extra
Maintainer: Big Kahuna <kahuna@example.com>
Uploaders: {$author}
diff --git a/t/tests/binaries-missing-depends-on-libc/debian/debian/control.in b/t/tests/binaries-missing-depends-on-libc/debian/debian/control.in
index aaf0358..bee5092 100644
--- a/t/tests/binaries-missing-depends-on-libc/debian/debian/control.in
+++ b/t/tests/binaries-missing-depends-on-libc/debian/debian/control.in
@@ -6,6 +6,7 @@ Standards-Version: {$standards_version}
Build-Depends: {$build_depends}, perl
Package: libbasic2
+Section: libs
Architecture: any
Depends: some-pkg, $\{misc:Depends\}, $\{shlib:Depends\}
Description: {$description}
diff --git a/t/tests/binaries-missing-depends/debian/debian/control.in b/t/tests/binaries-missing-depends/debian/debian/control.in
index e627217..3350fca 100644
--- a/t/tests/binaries-missing-depends/debian/debian/control.in
+++ b/t/tests/binaries-missing-depends/debian/debian/control.in
@@ -7,6 +7,7 @@ Build-Depends: {$build_depends}, perl
Package: libbasic2
Architecture: any
+Section: libs
Depends: $\{misc:Depends\}, $\{shlib:Depends\}
Description: {$description}
This is a test package designed to exercise some feature or tag of
diff --git a/t/tests/control-file-library-dev/debian/debian/control.in b/t/tests/control-file-library-dev/debian/debian/control.in
index f16da14..e166c13 100644
--- a/t/tests/control-file-library-dev/debian/debian/control.in
+++ b/t/tests/control-file-library-dev/debian/debian/control.in
@@ -6,6 +6,7 @@ Standards-Version: {$standards_version}
Build-Depends: {$build_depends}
Package: libcontrol-file-foo1
+Section: libs
Architecture: {$architecture}
Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
Description: {$description} (shared lib 1)
@@ -43,6 +44,7 @@ Description: {$description} (dev package)
be an empty package.
Package: libcontrol-file-baz9-4
+Section: libs
Architecture: {$architecture}
Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
Description: {$description} (shared lib 3)
diff --git a/t/tests/fields-aspell/debian/debian/control.in b/t/tests/fields-aspell/debian/debian/control.in
index f2bed58..e6e978c 100644
--- a/t/tests/fields-aspell/debian/debian/control.in
+++ b/t/tests/fields-aspell/debian/debian/control.in
@@ -1,6 +1,6 @@
Source: {$source}
Priority: extra
-Section: devel
+Section: localization
Maintainer: {$author}
Standards-Version: {$standards_version}
Build-Depends: {$build_depends}
diff --git a/t/tests/fields-font-not-multiarch-foreign/debian/debian/control.in b/t/tests/fields-font-not-multiarch-foreign/debian/debian/control.in
index cdc202f..8be633b 100644
--- a/t/tests/fields-font-not-multiarch-foreign/debian/debian/control.in
+++ b/t/tests/fields-font-not-multiarch-foreign/debian/debian/control.in
@@ -1,6 +1,6 @@
Source: {$source}
Priority: extra
-Section: {$section}
+Section: fonts
Maintainer: {$author}
Standards-Version: {$standards_version}
Build-Depends: {$build_depends}
diff --git a/t/tests/files-fonts/debian/debian/control.in b/t/tests/files-fonts/debian/debian/control.in
index 01ccb05..61cc4b5 100644
--- a/t/tests/files-fonts/debian/debian/control.in
+++ b/t/tests/files-fonts/debian/debian/control.in
@@ -17,6 +17,7 @@ Description: {$description}
things. It should not be installed like a regular package.
Package: ttf-{$source}
+Section: fonts
Architecture: {$architecture}
# Due to file-conflict
Conflicts: {$source}
diff --git a/t/tests/files-wrong-ma-foreign/debian/debian/control.in b/t/tests/files-wrong-ma-foreign/debian/debian/control.in
index 5daf9a2..c7f4d0c 100644
--- a/t/tests/files-wrong-ma-foreign/debian/debian/control.in
+++ b/t/tests/files-wrong-ma-foreign/debian/debian/control.in
@@ -6,6 +6,7 @@ Standards-Version: {$standards_version}
Build-Depends: {$build_depends}
Package: libpublic1
+Section: libs
Architecture: any
Depends: $\{misc:Depends\}, $\{shlibs:Depends\},
Multi-Arch: same
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: