[SCM] Debian package checker branch, master, updated. 2.5.6-45-g3502d02

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit 3502d023bd8cb6ab66216b8c5820a495e6b32c60
Author: Niels Thykier <niels@thykier.net>
Date:   Sat Mar 17 11:07:27 2012 +0100

    Add ubuntu data file for package fields
    
    This removes the need for special handling of the Ubuntu specific
    field, "original-maintainer".
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/fields b/checks/fields
index 5a0bcbe..7b5ead5 100644
--- a/checks/fields
+++ b/checks/fields
@@ -952,8 +952,6 @@ while (my ($vcs, $regex) = each %VCS_RECOMMENDED_URIS) {
 
 for my $field (keys %{$info->field}) {
 
-    next if ($field eq 'original-maintainer') and $version =~ /ubuntu/;
-
     tag 'unknown-field-in-dsc', $field
         if ($type eq 'source' && ! $SOURCE_FIELDS->known ($field));
 
diff --git a/debian/changelog b/debian/changelog
index ab992a4..cf73f3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,8 +32,11 @@ lintian (2.5.7) UNRELEASED; urgency=low
   * checks/deb-format{,.desc}:
     + [NT] Replace old udeb compression tag with a more general
       one.  (Closes: #664600)
-  * checks/fields.desc:
+  * checks/fields{,.desc}:
     + [NT] Add devref reference.
+    + [NT] Remove special handling of the Ubuntu specific field,
+      "original-maintainer".  This field is now handled by vendor
+      specific data files.  (Closes: #649852)
   * checks/files{,.desc}:
     + [NT] Remove "manual" lazy loads of data files.
     + [NT] Remove code for the uses-FHS-doc-dir tag.
@@ -108,6 +111,11 @@ lintian (2.5.7) UNRELEASED; urgency=low
       Previously, duplicate fields were silently ignored (except
       when a separate tag would check for it).  (Closes: #664061)
 
+  * vendors/ubuntu/main/data/common/source-fields:
+    + [NT] New file.
+  * vendors/ubuntu/main/data/fields/{binary,udeb}-fields:
+    + [NT] New files.
+
  -- Niels Thykier <niels@thykier.net>  Wed, 14 Mar 2012 22:55:46 +0100
 
 lintian (2.5.6) unstable; urgency=low
diff --git a/vendors/ubuntu/main/data/common/source-fields b/vendors/ubuntu/main/data/common/source-fields
new file mode 100644
index 0000000..4761054
--- /dev/null
+++ b/vendors/ubuntu/main/data/common/source-fields
@@ -0,0 +1,9 @@
+# Vendor data file for Ubuntu
+
+# Include everything from the parent profile (at the time of
+# writing debian/main)
+@include-parent
+
+# Include Ubuntu specific fields here
+original-maintainer
+
diff --git a/vendors/ubuntu/main/data/fields/binary-fields b/vendors/ubuntu/main/data/fields/binary-fields
new file mode 100644
index 0000000..4761054
--- /dev/null
+++ b/vendors/ubuntu/main/data/fields/binary-fields
@@ -0,0 +1,9 @@
+# Vendor data file for Ubuntu
+
+# Include everything from the parent profile (at the time of
+# writing debian/main)
+@include-parent
+
+# Include Ubuntu specific fields here
+original-maintainer
+
diff --git a/vendors/ubuntu/main/data/fields/udeb-fields b/vendors/ubuntu/main/data/fields/udeb-fields
new file mode 100644
index 0000000..4761054
--- /dev/null
+++ b/vendors/ubuntu/main/data/fields/udeb-fields
@@ -0,0 +1,9 @@
+# Vendor data file for Ubuntu
+
+# Include everything from the parent profile (at the time of
+# writing debian/main)
+@include-parent
+
+# Include Ubuntu specific fields here
+original-maintainer
+

-- 
Debian package checker