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

[SCM] Debian package checker branch, master, updated. 2.5.2-80-g8d4765c

The following commit has been merged in the master branch:
commit 8d4765c012939dab5ec20a5aa189f026a0f92912
Author: Jakub Wilk <jwilk@debian.org>
Date:   Fri Sep 2 21:08:38 2011 +0200

    Replace some debmake tags with more general ones
    
    Signed-off-by: Russ Allbery <rra@debian.org>
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/changelog-file b/checks/changelog-file
index e2a4346..89ccba9 100644
--- a/checks/changelog-file
+++ b/checks/changelog-file
@@ -270,9 +270,7 @@ if (@entries) {
     my %versions;
     for my $entry (@entries) {
 	if ($entry->Maintainer) {
-	    if ($entry->Maintainer =~ /<([^>\@]+\@unknown)>/) {
-		tag 'debian-changelog-file-contains-debmake-default-email-address', $1;
-	    } elsif ($entry->Maintainer =~ /<([^>\@]+\@[^>.]*)>/) {
+	    if ($entry->Maintainer =~ /<([^>\@]+\@[^>.]*)>/) {
 		tag 'debian-changelog-file-contains-invalid-email-address', $1;
 	    }
 	}
diff --git a/checks/changelog-file.desc b/checks/changelog-file.desc
index 3507629..8b6657f 100644
--- a/checks/changelog-file.desc
+++ b/checks/changelog-file.desc
@@ -144,12 +144,6 @@ Info: The add-log-mailing-address variable is no longer honored in
  .
  (setq debian-changelog-mailing-address "userid@debian.org")
 
-Tag: debian-changelog-file-contains-debmake-default-email-address
-Severity: important
-Certainty: certain
-Info: The changelog file contains an email address (&lt;..@unknown&gt;)
- that was not updated to the maintainer's real address.
-
 Tag: debian-changelog-file-contains-invalid-email-address
 Severity: important
 Certainty: certain
diff --git a/checks/debian-readme b/checks/debian-readme
index cb07887..97b01ed 100644
--- a/checks/debian-readme
+++ b/checks/debian-readme
@@ -49,8 +49,8 @@ my @template =
 my $regex = join ('|', @template);
 if ($readme =~ m/$regex/io) {
     tag 'readme-debian-contains-debmake-template';
-} elsif ($readme =~ m/^\s*-- [^<]*<[^> ]+.\@unknown>/m) {
-    tag 'readme-debian-contains-debmake-default-email-address';
+} elsif ($readme =~ m/^\s*-- [^<]*<([^> ]+.\@[^>.]*)>/m) {
+    tag 'readme-debian-contains-invalid-email-address', $1;
 }
 
 check_spelling('spelling-error-in-readme-debian', $readme, undef, { $pkg => 1 });
diff --git a/checks/debian-readme.desc b/checks/debian-readme.desc
index 3224b48..9a46881 100644
--- a/checks/debian-readme.desc
+++ b/checks/debian-readme.desc
@@ -27,11 +27,11 @@ Info: The README.Debian file installed by this package contains one of the
  template phrases.  If there is nothing to say in the file, it is best
  removed.
 
-Tag: readme-debian-contains-debmake-default-email-address
+Tag: readme-debian-contains-invalid-email-address
 Severity: normal
 Certainty: certain
-Info: The README.Debian file contains an email address (&lt;..@unknown&gt;)
- that was not updated to the maintainer's real address.
+Info: The README.Debian file contains an invalid email address: the domain
+ needs at least one dot. This looks like a mistake.
 
 Tag: spelling-error-in-readme-debian
 Severity: minor
diff --git a/debian/changelog b/debian/changelog
index 86eb190..f032c9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,12 +15,16 @@ lintian (2.5.3) UNRELEASED; urgency=low
       - obsolete-field-in-dep5-copyright
       - out-of-date-copyright-format-uri
       - package-contains-no-arch-dependent-files
+      - readme-debian-contains-invalid-email-address
       - syntax-error-in-dep5-copyright
       - unknown-copyright-format-uri
       - unknown-paragraph-in-dep5-copyright
       - unused-license-paragraph-in-dep5-copyright
       - unversioned-copyright-format-uri
       - wiki-copyright-format-uri
+    + Removed:
+      - debian-changelog-file-contains-debmake-default-email-address
+      - readme-debian-contains-debmake-default-email-address
 
   * checks/*:
     + [NT] Dropped fields from Needs-Info, it is no longer needed.
@@ -30,6 +34,10 @@ lintian (2.5.3) UNRELEASED; urgency=low
       dctrl parsers (notably grep-dctrl).  (Closes: #639928)
     + [JW] Fix a number of broken references in the tag
       descriptions.  (Closes: #639923)
+  * checks/changelog-file{,.desc}:
+    + [JW] Remove debmake-specific tag in favour of more general
+      debian-changelog-file-contains-invalid-email-address.
+      (Closes: #639946)
   * checks/{conffile,etcfiles}{,.desc}:
     + [JW] Merged etcfiles into conffile.  (Closes: #637590)
   * checks/copyright-file{,.desc}:
@@ -40,6 +48,9 @@ lintian (2.5.3) UNRELEASED; urgency=low
       build.  This prevents false-positive "unneeded cdbs" warning.
     + [JW] Check for use of the obsolete dh_installmanpages debhelper
       program.  Thanks to Joey Hess for the report.  (Closes: #634112).
+  * checks/debian-readme{,.desc}:
+    + [JW] Replace debmake-specific tag with more general
+      readme-debian-contains-invalid-email-address.
   * checks/duplicate-files{,.desc}:
     + [NT] Replace the exception for "__init__.py" files by excluding
       all empty files from the check.  The bug (#632789) only requests
diff --git a/t/COVERAGE b/t/COVERAGE
index 7a766d9..cd021e4 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
-Last generated 2011-09-01
-Coverage: 716/934 (76.66%), w. legacy tests: 839/934 (89.83%)
+Last generated 2011-09-02
+Coverage: 716/933 (76.74%), w. legacy tests: 838/933 (89.82%)
 
 The following tags are not tested by the test suite:
 
@@ -122,7 +122,6 @@ binaries statically-linked-binary
 binaries unstripped-binary-or-object
 
 changelog-file changelog-file-missing-in-native-package
-changelog-file debian-changelog-file-contains-invalid-email-address
 changelog-file debian-changelog-file-missing-or-wrong-name
 changelog-file wrong-name-for-debian-news-file
 
@@ -365,7 +364,6 @@ maintainer-scripts
   changelog-should-mention-qa
   config-does-not-load-confmodule
   debconf-config-not-executable
-  debian-changelog-file-contains-invalid-email-address
   init.d-script-not-included-in-package
   init.d-script-not-marked-as-conffile
   maintainer-script-calls-deprecated-wm-menu-config
diff --git a/t/tests/changelog-file-general/desc b/t/tests/changelog-file-general/desc
index 7196c37..870c08f 100644
--- a/t/tests/changelog-file-general/desc
+++ b/t/tests/changelog-file-general/desc
@@ -5,7 +5,7 @@ Version: 1.0-1
 Description: General tests for changelog-file tags
 Test-For:
  changelog-not-compressed-with-max-compression
- debian-changelog-file-contains-debmake-default-email-address
+ debian-changelog-file-contains-invalid-email-address
  debian-changelog-file-contains-obsolete-user-emacs-settings
  debian-changelog-line-too-long
  improbable-bug-number-in-closes
diff --git a/t/tests/changelog-file-general/tags b/t/tests/changelog-file-general/tags
index 33c59c0..d568bd8 100644
--- a/t/tests/changelog-file-general/tags
+++ b/t/tests/changelog-file-general/tags
@@ -1,4 +1,4 @@
-E: changelog-file-general: debian-changelog-file-contains-debmake-default-email-address unknown@unknown
+E: changelog-file-general: debian-changelog-file-contains-invalid-email-address unknown@unknown
 E: changelog-file-general: possible-missing-colon-in-closes Closes #555555
 W: changelog-file-general: changelog-not-compressed-with-max-compression changelog.Debian.gz
 W: changelog-file-general: debian-changelog-file-contains-obsolete-user-emacs-settings
diff --git a/t/tests/debian-readme-general/desc b/t/tests/debian-readme-general/desc
index b381240..8e32931 100644
--- a/t/tests/debian-readme-general/desc
+++ b/t/tests/debian-readme-general/desc
@@ -3,7 +3,7 @@ Sequence: 6000
 Version: 1.0
 Description: General tests for README.Debian
 Test-For:
- readme-debian-contains-debmake-default-email-address
+ readme-debian-contains-invalid-email-address
  readme-debian-mentions-usr-doc
  spelling-error-in-readme-debian
 References: Debian Bug#556456
diff --git a/t/tests/debian-readme-general/tags b/t/tests/debian-readme-general/tags
index 69f1d95..7ee9c16 100644
--- a/t/tests/debian-readme-general/tags
+++ b/t/tests/debian-readme-general/tags
@@ -1,4 +1,4 @@
-W: debian-readme-general: readme-debian-contains-debmake-default-email-address
+W: debian-readme-general: readme-debian-contains-invalid-email-address unknown@unknown
 W: debian-readme-general: readme-debian-mentions-usr-doc line 4
 W: debian-readme-general: spelling-error-in-readme-debian CHNAGES CHANGES
 W: debian-readme-general: spelling-error-in-readme-debian accidentaly accidentally
diff --git a/testset/tags.foo++ b/testset/tags.foo++
index 6cc1ff1..a0d70b0 100644
--- a/testset/tags.foo++
+++ b/testset/tags.foo++
@@ -9,7 +9,7 @@ E: foo++ source: uploader-address-missing Josip
 E: foo++ source: uploader-name-missing Yama@gotchi
 E: foo++ source: wrong-debian-qa-address-set-as-maintainer Lintian Maintainer <debian-qa@lists.debian.org>
 E: foo++-helper: wrong-debian-qa-address-set-as-maintainer Lintian Maintainer <debian-qa@lists.debian.org>
-E: foo++: debian-changelog-file-contains-debmake-default-email-address he@unknown
+E: foo++: debian-changelog-file-contains-invalid-email-address he@unknown
 E: foo++: debian-changelog-file-uses-obsolete-national-encoding at line 11
 E: foo++: no-copyright-file
 E: foo++: wrong-debian-qa-address-set-as-maintainer Lintian Maintainer <debian-qa@lists.debian.org>
@@ -24,4 +24,4 @@ W: foo++ source: uploader-address-looks-weird Jeroen van Wolffelaar<jeroen@local
 W: foo++ source: uploader-not-full-name Frank
 W: foo++ source: uploader-not-full-name Josip
 W: foo++: latest-debian-changelog-entry-without-new-date
-W: foo++: readme-debian-contains-debmake-default-email-address
+W: foo++: readme-debian-contains-invalid-email-address foo@unknown

-- 
Debian package checker
Reply to: