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

[SCM] Debian package checker branch, master, updated. 2.5.4-135-g1b0a812



The following commit has been merged in the master branch:
commit 1b0a812c2fea824b99ef256d4febd830a60b1b37
Author: intrigeri <intrigeri@debian.org>
Date:   Mon Jan 30 23:14:56 2012 +0100

    Remove the *-not-full-name checks (Closes: #658031).
    
    Acked-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/fields.desc b/checks/fields.desc
index 6b503c9..d5906dd 100644
--- a/checks/fields.desc
+++ b/checks/fields.desc
@@ -167,12 +167,6 @@ Info: The maintainer field could not be parsed according to the rules in
  the Policy Manual.
 Ref: policy 5.6.2
 
-Tag: maintainer-not-full-name
-Severity: normal
-Certainty: possible
-Info: The "name" part of this maintainer field is just one word, so it
- might not be a full name.
-
 Tag: maintainer-address-looks-weird
 Severity: normal
 Certainty: possible
@@ -213,12 +207,6 @@ Info: The uploader field could not be parsed according to the rules in
  the Policy Manual.
 Ref: policy 5.6.3
 
-Tag: uploader-not-full-name
-Severity: normal
-Certainty: possible
-Info: The "name" part of this uploader field is just one word, so it
- might not be a full name.
-
 Tag: uploader-address-looks-weird
 Severity: normal
 Certainty: possible
diff --git a/debian/changelog b/debian/changelog
index 8c2062b..e9064ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,9 +18,11 @@ lintian (2.5.5) UNRELEASED; urgency=low
       - syntax-error-in-debconf-template
     + Removed:
       - dh_dhelp-is-deprecated
+      - maintainer-not-full-name
       - maintainer-script-calls-deprecated-wm-menu-config
       - maintainer-script-does-not-check-for-existence-of-wm-menu-config
       - uploader-address-missing
+      - uploader-not-full-name
 
   * checks/*:
     + [NT] Fixed assumptions about certain fields being present.
@@ -76,6 +78,8 @@ lintian (2.5.5) UNRELEASED; urgency=low
       (Closes: #655907)
     + [NT] Ignore self relations in Replaces and Provides.  This
       is allowed according to §7.6.2.  (Closes: #657034)
+    + [NT] Applied patch from intrigeri to remove "not-full-name"
+      tags.  (Closes: #658031)
   * checks/files:
     + [JW,NT] Skip "Multi-Arch: same" check of gzip files if their
       install path contains the architecture.  (Closes: #650665)
@@ -188,6 +192,8 @@ lintian (2.5.5) UNRELEASED; urgency=low
   * lib/Lintian/Check.pm:
     + [NT] Do not check for missing uploader address as it cannot be
       done reliably anymore.
+    + [NT] Applied patch from intrigeri to remove the "not-full-name"
+      tags.
   * lib/Lintian/CheckScript.pm:
     + [NT] New file.
   * lib/Lintian/Collect/{Binary,Source}.pm:
diff --git a/lib/Lintian/Check.pm b/lib/Lintian/Check.pm
index 8da067d..1cd4c44 100644
--- a/lib/Lintian/Check.pm
+++ b/lib/Lintian/Check.pm
@@ -109,11 +109,6 @@ MAINTAINER does not contain an e-mail address in angle brackets (<>).
 MAINTAINER does not contain a full name before the address, or the e-mail
 address was not in angle brackets.
 
-=item %s-not-full-name
-
-The name portion of MAINTAINER is a single word.  This tag is not issued
-for a FIELD of C<changed-by>.
-
 =item wrong-debian-qa-address-set-as-maintainer
 
 MAINTAINER appears to be the Debian QA Group, but the e-mail address
@@ -163,15 +158,8 @@ sub check_maintainer {
     tag "$field-address-looks-weird", $maintainer
         if (not $del and $name and $mail);
 
-    # Wookey really only has one name.  If we get more of these, consider
-    # removing the check.  Skip the full name check for changes files as it's
-    # not important there; we'll get it from the debian/control checks if
-    # needed.
     if (not $name) {
         tag "$field-name-missing", $maintainer;
-    } elsif ($name !~ /^\S+\s+\S+/ and $name ne 'Wookey') {
-        tag "$field-not-full-name", $name
-            if $field ne 'changed-by';
     }
 
     # Don't issue the malformed tag twice if we already saw problems.
diff --git a/t/scripts/implemented-tags.t b/t/scripts/implemented-tags.t
index 562422a..2575748 100755
--- a/t/scripts/implemented-tags.t
+++ b/t/scripts/implemented-tags.t
@@ -33,7 +33,6 @@ our $EXCLUDE =
                  .*-name-missing$
                  .*-address-missing$
                  .*-address-malformed$
-                 .*-not-full-name$
                  .*-address-looks-weird$
                  .*-address-is-on-localhost$
                  .*-address-causes-mail-loops-or-bounces$
diff --git a/t/tests/fields-uploaders/debian/debian/control.in b/t/tests/fields-uploaders/debian/debian/control.in
index f3e3e93..450018b 100644
--- a/t/tests/fields-uploaders/debian/debian/control.in
+++ b/t/tests/fields-uploaders/debian/debian/control.in
@@ -4,7 +4,6 @@ Section: devel
 Maintainer: {$author}
 Uploaders: Mrs. Localhost <user@localhost>,
            Mr. Weird<no-space@somewhere.com>,
-           One-name <has-only-1-name@elsewhere.com>,
            Malformed Email <@ddress@myspace.com>,
            John A. J. Doe <i.am.ok@somewhere.com>,
            Doris Double-Email <Doris Double-Email <doris@demail.com>>
diff --git a/t/tests/fields-uploaders/desc b/t/tests/fields-uploaders/desc
index c1a6fc5..92ab0b2 100644
--- a/t/tests/fields-uploaders/desc
+++ b/t/tests/fields-uploaders/desc
@@ -6,4 +6,3 @@ Test-For:
  uploader-address-is-on-localhost
  uploader-address-looks-weird
  uploader-address-malformed
- uploader-not-full-name
diff --git a/t/tests/fields-uploaders/tags b/t/tests/fields-uploaders/tags
index 5aaa723..795e4b6 100644
--- a/t/tests/fields-uploaders/tags
+++ b/t/tests/fields-uploaders/tags
@@ -3,4 +3,3 @@ E: fields-uploaders source: uploader-address-malformed Doris Double-Email <Doris
 E: fields-uploaders source: uploader-address-malformed Malformed Email <@ddress@myspace.com>
 E: fields-uploaders source: uploader-address-malformed Mrs. Localhost <user@localhost>
 W: fields-uploaders source: uploader-address-looks-weird Mr. Weird<no-space@somewhere.com>
-W: fields-uploaders source: uploader-not-full-name One-name
diff --git a/t/tests/generic-empty/desc b/t/tests/generic-empty/desc
index a994997..9324bc8 100644
--- a/t/tests/generic-empty/desc
+++ b/t/tests/generic-empty/desc
@@ -9,7 +9,6 @@ Test-For:
  changelog-should-mention-nmu
  debian-rules-missing-required-target
  maintainer-address-missing
- maintainer-not-full-name
  no-copyright-file
  no-priority-field
  no-section-field
diff --git a/t/tests/generic-empty/tags b/t/tests/generic-empty/tags
index b04062d..9ddcba6 100644
--- a/t/tests/generic-empty/tags
+++ b/t/tests/generic-empty/tags
@@ -11,11 +11,9 @@ E: generic-empty: package-has-no-description
 W: generic-empty source: changelog-should-mention-nmu
 W: generic-empty source: debian-rules-missing-recommended-target build-arch
 W: generic-empty source: debian-rules-missing-recommended-target build-indep
-W: generic-empty source: maintainer-not-full-name a
 W: generic-empty source: no-debian-copyright
 W: generic-empty source: no-section-field-for-source
 W: generic-empty source: source-nmu-has-incorrect-version-number 1.0
 W: generic-empty: empty-binary-package
-W: generic-empty: maintainer-not-full-name a
 W: generic-empty: no-priority-field
 W: generic-empty: no-section-field
diff --git a/testset/tags.foo++ b/testset/tags.foo++
index b4bbea5..558315d 100644
--- a/testset/tags.foo++
+++ b/testset/tags.foo++
@@ -20,7 +20,6 @@ W: foo++ source: ancient-standards-version 3.1.1 (current is 3.9.2)
 W: foo++ source: debian-watch-file-in-native-package
 W: foo++ source: debian-watch-file-unknown-version 0
 W: foo++ source: uploader-address-looks-weird Jeroen van Wolffelaar<jeroen@localhost.localdomain>
-W: foo++ source: uploader-not-full-name Frank
 W: foo++-helper: empty-binary-package
 W: foo++: latest-debian-changelog-entry-without-new-date
 W: foo++: readme-debian-contains-invalid-email-address foo@unknown

-- 
Debian package checker


Reply to: