diff -Nru /tmp/ZyRmi5Mlbg/lintian-1.23.14ubuntu1/checks/common_data.pm /tmp/heNB2bGUfS/lintian-1.23.14ubuntu2/checks/common_data.pm
--- /tmp/ZyRmi5Mlbg/lintian-1.23.14ubuntu1/checks/common_data.pm	2005-12-19 13:49:11.000000000 +0100
+++ /tmp/heNB2bGUfS/lintian-1.23.14ubuntu2/checks/common_data.pm	2006-04-05 13:45:32.000000000 +0200
@@ -10,8 +10,12 @@
 	   %known_libpngs %non_standard_archs
           );
 
+my $debian_behaviour = $::debian_behaviour;
+
 # simple defines for commonly needed data
 
+if($debian_behaviour) {
+
 %known_archs = map { $_ => 1 }
     ('alpha', 'arm', 'hppa', 'hurd-i386', 'i386', 'ia64', 'mips', 'mipsel',
      'm68k', 'powerpc', 's390', 'sparc', 'any', 'all');
@@ -19,6 +23,17 @@
 %non_standard_archs = map { $_ => 1 }
     ('amd64', 'ppc64', 'sh', 'kfreebsd-i386', 'knetbsd-i386');
 
+}
+else {
+
+%known_archs = map { $_ => 1 }
+    ('i386', 'amd64', 'powerpc', 'any', 'all');
+
+%non_standard_archs = map { $_ => 1 }
+    ('sparc', 'hppa', 'ia64');
+
+}
+
 
 %known_sections = map { $_ => 1 }
     ('admin', 'base', 'comm', 'devel', 'doc', 'editors', 'electronics',
diff -Nru /tmp/ZyRmi5Mlbg/lintian-1.23.14ubuntu1/checks/nmu /tmp/heNB2bGUfS/lintian-1.23.14ubuntu2/checks/nmu
--- /tmp/ZyRmi5Mlbg/lintian-1.23.14ubuntu1/checks/nmu	2005-08-12 21:49:07.000000000 +0200
+++ /tmp/heNB2bGUfS/lintian-1.23.14ubuntu2/checks/nmu	2006-04-05 13:02:01.000000000 +0200
@@ -30,6 +30,9 @@
 my $changelog_mentions_nmu = 0;
 my $changelog_mentions_qa = 0;
 my $uploader = undef;
+my $debian_behaviour = $::debian_behaviour;
+
+return if(!$debian_behaviour);
 
 open CHANGELOG, "debfiles/changelog" or fail("Failed opening changelog");
 <CHANGELOG>;
diff -Nru /tmp/ZyRmi5Mlbg/lintian-1.23.14ubuntu1/debian/changelog /tmp/heNB2bGUfS/lintian-1.23.14ubuntu2/debian/changelog
--- /tmp/ZyRmi5Mlbg/lintian-1.23.14ubuntu1/debian/changelog	2005-12-28 11:51:36.000000000 +0100
+++ /tmp/heNB2bGUfS/lintian-1.23.14ubuntu2/debian/changelog	2006-04-05 13:53:48.000000000 +0200
@@ -1,3 +1,13 @@
+lintian (1.23.14ubuntu2) dapper; urgency=low
+
+  * Implement Ubuntu specificities:
+    + Disable nmu checks (Closes: Malone #36505).
+    + Update the list of valid architectures.
+    + Separate Debian and Ubuntu distro name check.
+  * Debian behaviour can be restored using -D/--debian option.
+
+ -- Jeremie Corbier <jeremie.corbier@resel.enst-bretagne.fr>  Wed,  5 Apr 2006 13:47:55 +0200
+
 lintian (1.23.14ubuntu1) dapper; urgency=low
 
   * Resynchronise with Debian.
diff -Nru /tmp/ZyRmi5Mlbg/lintian-1.23.14ubuntu1/frontend/lintian /tmp/heNB2bGUfS/lintian-1.23.14ubuntu2/frontend/lintian
--- /tmp/ZyRmi5Mlbg/lintian-1.23.14ubuntu1/frontend/lintian	2005-12-19 13:49:12.000000000 +0100
+++ /tmp/heNB2bGUfS/lintian-1.23.14ubuntu2/frontend/lintian	2006-04-05 13:55:39.000000000 +0200
@@ -47,6 +47,7 @@
 our $debug = 0;    	     	#flag for -d|--debug switch
 my @debug;
 my $check_everything = 0;	#flag for -a|--all switch
+our $debian_behaviour = 0;	#flag for -D|--debian switch
 my $lintian_info = 0;		#flag for -i|--info switch
 our $display_infotags = 0;	#flag for -I|--display-info switch
 my $unpack_level = undef;	#flag for -l|--unpack-level switch
@@ -137,6 +138,7 @@
     -d, --debug               turn Lintian\'s debug messages ON
     --print-version           print unadorned version number and exit
 Behaviour options:
+    -D, --debian              turn Lintian\'s Debian specific checks on
     -i, --info                give detailed info about tags
     -I, --display-info        display "I:" tags (normally suppressed)
     -l X, --unpack-level X    set default unpack level to X
@@ -252,6 +254,7 @@
 	       "debug|d" => \@debug, # Count the -d flags
 
 	       # ------------------ behaviour options
+	       "debian|D" => \$debian_behaviour,
 	       "info|i" => \$lintian_info,
 	       "display-info|I" => \$display_infotags,
 	       "unpack-level|l=i" => \$unpack_level,
@@ -621,19 +624,30 @@
 
 	    Tags::set_pkg( $arg, $arg_name, "", "", 'binary' );
 	    # check distribution field
-	    if (! (($data->{'distribution'} eq 'stable')
-		  or ($data->{'distribution'} eq 'testing')
-		  or ($data->{'distribution'} eq 'unstable')
-		  or ($data->{'distribution'} eq 'experimental')
-	          or ($data->{'distribution'} eq 'dapper')
-		  or ($data->{'distribution'} eq 'breezy')
-		  or ($data->{'distribution'} eq 'hoary')
-		  or ($data->{'distribution'} eq 'warty')
-		  or ($data->{'distribution'} =~ /\w+-proposed-updates/)
-		  or ($data->{'distribution'} =~ /\w+-updates/)
-                  or ($data->{'distribution'} =~ /\w+-backports/)
-		  or ($data->{'distribution'} =~ /\w+-security/))
-               ) {
+	    my $bad_distrib_entry = 0;
+	    if($debian_behaviour) {
+	        if (! (($data->{'distribution'} eq 'stable')
+		    or ($data->{'distribution'} eq 'testing')
+		    or ($data->{'distribution'} eq 'unstable')
+		    or ($data->{'distribution'} eq 'experimental'))
+		) {
+		    $bad_distrib_entry = 1;
+		}
+	    }
+	    else {
+		if (! (($data->{'distribution'} eq 'dapper')
+		    or ($data->{'distribution'} eq 'breezy')
+		    or ($data->{'distribution'} eq 'hoary')
+		    or ($data->{'distribution'} eq 'warty')
+		    or ($data->{'distribution'} =~ /\w+-proposed-updates/)
+		    or ($data->{'distribution'} =~ /\w+-updates/)
+                    or ($data->{'distribution'} =~ /\w+-backports/)
+		    or ($data->{'distribution'} =~ /\w+-security/))
+                ) {
+		    $bad_distrib_entry = 1;
+		}
+	    }
+	    if($bad_distrib_entry) {
 		# bad distribution entry
 		tag("bad-distribution-in-changes-file",
 		    $data->{'distribution'});