The following commit has been merged in the master branch:
commit dcba7168b753d504aefe0890efbdc44d31efed9d
Author: Niels Thykier <ni...@thykier.net>
Date:   Fri Dec 24 12:50:13 2010 +0100

    Fixed spelling of metapackage (#591300)
    
      * checks/fields{,.desc}:
        + [NT] Fixed spelling of metapackage in tag descriptions.
      * checks/files{,.desc}:
        + [NT] Fixed spelling of metapackage in empty-binary-package tag
          description.  (Closes: #591300)

diff --git a/checks/debhelper b/checks/debhelper
index 32adec2..9bd089a 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -120,7 +120,7 @@ while (<RULES>) {
            if ($dh_commands_depends->known($dhcommand)) {
                my $dep = $dh_commands_depends->value($dhcommand);
 
-               # Special-case gcj-native-helper, which is a meta-package to
+               # Special-case gcj-native-helper, which is a metapackage to
                # pull this helper. default-jdk-builddep is obsolete, but
                # we keep it for backwards compatibility, because it used to
                # serve this purpose.
diff --git a/checks/fields b/checks/fields
index af5fae5..e1f2043 100644
--- a/checks/fields
+++ b/checks/fields
@@ -495,8 +495,8 @@ if (defined $info->field('installer-menu-item')) {
 
 #---- Package relations (binary package)
 
-# Check whether the package looks like a meta-package, used for later
-# dependency checks.  We consider a package to possibly be a meta-package if
+# Check whether the package looks like a metapackage, used for later
+# dependency checks.  We consider a package to possibly be a metapackage if
 # it is a binary package with no files outside of /usr/share/doc and a few
 # other directories found in metapackges.  This also catches documentation
 # packages, but that doesn't matter for our purposes.
diff --git a/checks/fields.desc b/checks/fields.desc
index cf91829..672b9d2 100644
--- a/checks/fields.desc
+++ b/checks/fields.desc
@@ -837,7 +837,7 @@ Info: You use the Bugs field though the field value is the 
default
 
 Tag: build-depends-on-build-essential
 Info: You depend on the build-essential package, which is only a
- meta-package depending on build tools that have to be installed in all
+ metapackage depending on build tools that have to be installed in all
  build environments.
 Severity: important
 Certainty: certain
diff --git a/checks/files.desc b/checks/files.desc
index 462a075..bf7786f 100644
--- a/checks/files.desc
+++ b/checks/files.desc
@@ -1138,13 +1138,13 @@ Tag: empty-binary-package
 Severity: important
 Certainty: wild-guess
 Info: This binary package appears to be empty, and its description does
- not say that it's a meta-package or a transitional package.  This is
+ not say that it's a metapackage or a transitional package.  This is
  often due to problems with updating debhelper *.install files during
  package renames or similar problems where installation rules don't put
  files in the correct place.
  .
  If the package is deliberately empty, please mention in the package long
- description one of the phrases "meta-package," "dummy," "dependency
+ description one of the phrases "metapackage," "dummy," "dependency
  package," "empty package," or "virtual package."
 
 Tag: star-file
diff --git a/debian/changelog b/debian/changelog
index b2fb62f..31e3b9d 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,12 +29,15 @@ lintian (2.4.4) UNRELEASED; urgency=low
     + [NT] Added check for packages (build) depending on openjdk-X-doc or
       classpath-doc instead of the default-jdk-doc metapackage.
       (Closes: #593837)
-  * checks/files:
+    + [NT] Fixed spelling of metapackage in tag descriptions.
+  * checks/files{,.desc}:
     + [NT] Fixed false-positive extra-license-file for license.ui files.
       Thanks to Jeremy Sanders for the report.  (Closes: #595941)
     + [NT] Added hurd-udeb to the list of packages allowed to ship
       unusual top-level directories.  Thanks to Samual Thibault for
       the patch.  (Closes: #591331)
+    + [NT] Fixed spelling of metapackage in empty-binary-package tag
+      description.  (Closes: #591300)
   * checks/menu-format.desc:
     + [CW] Fix several typos.
   * checks/menus.desc:

-- 
Debian package checker


-- 
To UNSUBSCRIBE, email to debian-lint-maint-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pw6cz-0004qk...@alioth.debian.org

Reply via email to