[lintian] 01/01: Revert "Rename application-in-library-section and library-package-name-for-application (+ should-not)"
This is an automated email from the git hooks/post-receive script.
abe pushed a commit to branch master
in repository lintian.
commit 8ce9497d9b92b5c72a3b063b85ad7606205056d2
Author: Axel Beckert <abe@deuxchevaux.org>
Date: Tue Aug 18 02:02:04 2015 +0200
Revert "Rename application-in-library-section and library-package-name-for-application (+ should-not)"
This reverts commit f39fd616a40b09bff8d254b0ac7258a8bcc0bb39 for now
until a policy about lintian tag naming is in place.
Signed-off-by: Axel Beckert <abe@deuxchevaux.org>
---
checks/application-not-library.desc | 4 ++--
checks/application-not-library.pm | 5 ++---
data/override/renamed-tags | 2 --
t/tests/application-not-library/desc | 2 +-
t/tests/application-not-library/tags | 20 ++++++++++----------
5 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/checks/application-not-library.desc b/checks/application-not-library.desc
index 0b3516f..a9c98c9 100644
--- a/checks/application-not-library.desc
+++ b/checks/application-not-library.desc
@@ -17,7 +17,7 @@ Info: This package contains a program in $PATH and is named
package.
Ref: http://pkg-perl.alioth.debian.org/policy.html#package_naming_policy
-Tag: application-should-not-have-library-package-name
+Tag: library-package-name-for-application
Severity: normal
Certainty: wild-guess
Experimental: yes
@@ -33,7 +33,7 @@ Info: This package contains a program in $PATH but is named like a
primarily a library, please add a lintian override for this tag.
Ref: http://pkg-perl.alioth.debian.org/policy.html#package_naming_policy
-Tag: application-should-not-be-in-library-section
+Tag: application-in-library-section
Severity: normal
Certainty: wild-guess
Experimental: yes
diff --git a/checks/application-not-library.pm b/checks/application-not-library.pm
index 4223584..7290e64 100644
--- a/checks/application-not-library.pm
+++ b/checks/application-not-library.pm
@@ -66,15 +66,14 @@ sub run {
if ($pkg =~ /^libapp(?:.+)-perl$/) {
tag 'libapp-perl-package-name', @programs;
} else {
- tag 'application-should-not-have-library-package-name', @programs;
+ tag 'library-package-name-for-application', @programs;
}
}
# Check for wrong section
my $section = $info->field('section', '');
if ($section =~ /perl|python|ruby|(?:^|\/)libs/) { # oldlibs is ok
- tag 'application-should-not-be-in-library-section',
- "$section", @programs;
+ tag 'application-in-library-section', "$section", @programs;
}
return;
diff --git a/data/override/renamed-tags b/data/override/renamed-tags
index 087c769..7dab546 100644
--- a/data/override/renamed-tags
+++ b/data/override/renamed-tags
@@ -1,7 +1,5 @@
# list of renamed tag old name => new name. Please alpha sort by old name
-application-in-library-section => application-should-not-be-in-library-section
dep5-file-paragraph-reference-header-paragraph => dep5-file-paragraph-references-header-paragraph
-library-package-name-for-application => application-should-not-have-library-package-name
package-install-apt-preferences => package-installs-apt-preferences
package-install-apt-sources => package-installs-apt-sources
package-install-ieee-data => package-installs-ieee-data
diff --git a/t/tests/application-not-library/desc b/t/tests/application-not-library/desc
index 2d677b4..265d09b 100644
--- a/t/tests/application-not-library/desc
+++ b/t/tests/application-not-library/desc
@@ -2,4 +2,4 @@ Testname: application-not-library
Sequence: 6000
Version: 1.0
Description: Test cases where packages look like libraries but are applications
-Test-For: libapp-perl-package-name application-should-not-have-library-package-name application-should-not-be-in-library-section
+Test-For: libapp-perl-package-name library-package-name-for-application application-in-library-section
diff --git a/t/tests/application-not-library/tags b/t/tests/application-not-library/tags
index 7d4cb1d..c3f3d96 100644
--- a/t/tests/application-not-library/tags
+++ b/t/tests/application-not-library/tags
@@ -1,11 +1,11 @@
E: libapp-something-perl: libapp-perl-package-name usr/bin/libapp-something-perl
-X: libapp-something-perl: application-should-not-be-in-library-section perl usr/bin/libapp-something-perl
-X: libsomething-else-perl: application-should-not-be-in-library-section perl usr/bin/libsomething-else-perl
-X: libsomething-else-perl: application-should-not-have-library-package-name usr/bin/libsomething-else-perl
-X: python-something: application-should-not-be-in-library-section python usr/bin/python-something
-X: python-something: application-should-not-have-library-package-name usr/bin/python-something
-X: ruby-something: application-should-not-be-in-library-section ruby usr/bin/ruby-something
-X: ruby-something: application-should-not-have-library-package-name usr/bin/ruby-something
-X: unspecified-something-pl: application-should-not-be-in-library-section perl usr/bin/unspecified-something-pl
-X: unspecified-something-py: application-should-not-be-in-library-section python usr/bin/unspecified-something-py
-X: unspecified-something-rb: application-should-not-be-in-library-section ruby usr/bin/unspecified-something-rb
+X: libapp-something-perl: application-in-library-section perl usr/bin/libapp-something-perl
+X: libsomething-else-perl: application-in-library-section perl usr/bin/libsomething-else-perl
+X: libsomething-else-perl: library-package-name-for-application usr/bin/libsomething-else-perl
+X: python-something: application-in-library-section python usr/bin/python-something
+X: python-something: library-package-name-for-application usr/bin/python-something
+X: ruby-something: application-in-library-section ruby usr/bin/ruby-something
+X: ruby-something: library-package-name-for-application usr/bin/ruby-something
+X: unspecified-something-pl: application-in-library-section perl usr/bin/unspecified-something-pl
+X: unspecified-something-py: application-in-library-section python usr/bin/unspecified-something-py
+X: unspecified-something-rb: application-in-library-section ruby usr/bin/unspecified-something-rb
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: