diff -Nru lintian-2.5.1/checks/changelog-file lintian-2.5.1ubuntu1/checks/changelog-file
--- lintian-2.5.1/checks/changelog-file	2011-04-12 11:22:06.000000000 +0200
+++ lintian-2.5.1ubuntu1/checks/changelog-file	2011-06-21 18:25:17.000000000 +0200
@@ -243,7 +243,6 @@
 # such symlinks, so give the package a pass if the version number contains
 # ubuntu.
 if (-l 'changelog') {
-    tag 'debian-changelog-file-is-a-symlink' unless $version =~ /ubuntu/;
     return 0;
 }
 
diff -Nru lintian-2.5.1/checks/changelog-file.desc lintian-2.5.1ubuntu1/checks/changelog-file.desc
--- lintian-2.5.1/checks/changelog-file.desc	2011-04-12 14:41:20.000000000 +0200
+++ lintian-2.5.1ubuntu1/checks/changelog-file.desc	2011-06-21 18:25:17.000000000 +0200
@@ -109,20 +109,6 @@
  /usr/share/doc/<i>pkg</i>/changelog.Debian.gz
 Ref: policy 12.7
 
-Tag: debian-changelog-file-is-a-symlink
-Severity: normal
-Certainty: certain
-Info: The Debian changelog file is a symlink to a file in a different
- directory or not found in this package. Please don't do this. It makes
- package checking and manipulation unnecessarily difficult. Because it was
- a symlink, the Debian changelog file was not checked for other
- problems. (Symlinks to another file in /usr/share/doc/<i>pkg</i> or a
- subdirectory thereof are fine and should not trigger this warning.)
- .
- To refer to the changelog, copyright, and other documentation files of
- another package that this one depends on, please symlink the entire
- /usr/share/doc/<i>pkg</i> directory rather than individual files.
-
 Tag: debian-changelog-file-missing-or-wrong-name
 Severity: serious
 Certainty: certain
diff -Nru lintian-2.5.1/checks/init.d lintian-2.5.1ubuntu1/checks/init.d
--- lintian-2.5.1/checks/init.d	2011-04-12 11:22:06.000000000 +0200
+++ lintian-2.5.1ubuntu1/checks/init.d	2011-06-21 18:25:17.000000000 +0200
@@ -188,6 +188,15 @@
     my $script = $_;
     next if grep {$script eq $_} qw(. .. README skeleton rc rcS);
 
+    # In an upstart system, such as Ubuntu, init scripts are symlinks to
+    # upstart-job which are not registered with update-rc.d.
+    if (-l "init.d/$_") {
+        my $target = readlink("init.d/$_");
+        if ($target =~ m,(?:\A|/)lib/init/upstart-job\z,) {
+            next;
+        }
+    }
+
     # If $initd_postinst is true for this script, we already checked the
     # syntax in the above loop.  Check the syntax of unregistered scripts so
     # that we get more complete Lintian coverage in the first pass.
diff -Nru lintian-2.5.1/debian/changelog lintian-2.5.1ubuntu1/debian/changelog
--- lintian-2.5.1/debian/changelog	2011-06-15 23:06:07.000000000 +0200
+++ lintian-2.5.1ubuntu1/debian/changelog	2011-06-24 07:28:51.000000000 +0200
@@ -1,3 +1,29 @@
+lintian (2.5.1ubuntu1) oneiric; urgency=low
+
+  * Merge from Debian unstable (LP: #798513). Remaining changes:
+    - Don't warn about a symlinked changelog file in Ubuntu due to CDBS.
+    - Add no-upstream-changelog tag to cruft-general-test-suite,
+      cruft-general-upstream, cruft-upstream-binaries, fields-no-homepage,
+      patch-systems-no-patch-system tests.
+    - checks/changelog-file.desc, testset/tags.libbaz: Drop
+      debian-changelog-file-is-a-symlink tag.
+    - t/tests/changelog-file-symlink, t/tests/init.d-symlink: Drop these tests.
+    - checks/init.d: fix LP: #496798 again; upstream only took part of our
+      patch and the rest of the fix was dropped in the last merge; per
+      maintainer's comments in Debian bug #569492, Ubuntu will need to
+      carry this fix for the time being
+    - Add wrong-name-for-upstream-changelog tag to changelog-file-extra-upstream
+      test.
+    - t/tests/fields-multi-arch: Do not test invalid Multi-Arch field,
+      because dpkg-deb will already fail.
+    - Drop debug-symbols-directly-in-usr-lib-debug from binaries-general.
+  * Dropped changes:
+    - Prefer libtest-simple-perl (>= 0.93) to perl (>= 5.12).
+  * Cherry-pick 5d5a40f from upstream to fix tests broken by 3.8.1 becoming
+    ancient earlier this week. (Thanks to Niels Thykier)
+
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org>  Fri, 24 Jun 2011 07:27:27 +0200
+
 lintian (2.5.1) unstable; urgency=low
 
   * Summary of tag changes:
@@ -138,6 +164,32 @@
 
  -- Niels Thykier <niels@thykier.net>  Wed, 15 Jun 2011 23:05:28 +0200
 
+lintian (2.5.0ubuntu1) oneiric; urgency=low
+
+  * Merge from Debian unstable (LP: #781095). Remaining changes:
+    - Don't warn about a symlinked changelog file in Ubuntu due to CDBS.
+    - Add no-upstream-changelog tag to cruft-general-test-suite,
+      cruft-general-upstream, cruft-upstream-binaries, fields-no-homepage,
+      patch-systems-no-patch-system tests.
+    - checks/changelog-file.desc, t/tests/legacy-libbaz/tags,
+      testset/tags.libbaz: Drop debian-changelog-file-is-a-symlink tag.
+    - t/tests/changelog-file-symlink, t/tests/init.d-symlink: Drop these tests.
+    - checks/init.d: fix LP: #496798 again; upstream only took part of our
+      patch and the rest of the fix was dropped in the last merge; per
+      maintainer's comments in Debian bug #569492, Ubuntu will need to
+      carry this fix for the time being
+    - Add wrong-name-for-upstream-changelog tag to changelog-file-extra-upstream
+      test.
+    - Prefer libtest-simple-perl (>= 0.93) to perl (>= 5.12).
+    - t/tests/fields-multi-arch: Do not test invalid Multi-Arch field,
+      because dpkg-deb will already fail.
+    - Drop debug-symbols-directly-in-usr-lib-debug from binaries-general.
+  * Dropped changes that are applied in Debian:
+    + private/runtests: Fix typo NO_PKG_MAGNGLE -> NO_PKG_MANGLE.
+    + binaries-general test: Remove unknown -ph flag from gcc 4.6 call.
+
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org>  Wed, 11 May 2011 13:39:44 +0200
+
 lintian (2.5.0) unstable; urgency=low
 
   * Summary of tag changes:
@@ -208,6 +260,31 @@
 
  -- Niels Thykier <niels@thykier.net>  Tue, 10 May 2011 20:44:32 +0200
 
+lintian (2.5.0~rc3ubuntu1) oneiric; urgency=low
+
+  * Merge from Debian unstable (LP: #769101). Remaining changes:
+    - Don't warn about a symlinked changelog file in Ubuntu due to CDBS.
+    - Add no-upstream-changelog tag to cruft-general-test-suite,
+      cruft-general-upstream, cruft-upstream-binaries, fields-no-homepage,
+      patch-systems-no-patch-system tests.
+    - checks/changelog-file.desc, t/tests/legacy-libbaz/tags,
+      testset/tags.libbaz: Drop debian-changelog-file-is-a-symlink tag.
+    - t/tests/changelog-file-symlink, t/tests/init.d-symlink: Drop these tests.
+    - checks/init.d: fix LP: #496798 again; upstream only took part of our
+      patch and the rest of the fix was dropped in the last merge; per
+      maintainer's comments in Debian bug #569492, Ubuntu will need to
+      carry this fix for the time being
+    - Add wrong-name-for-upstream-changelog tag to changelog-file-extra-upstream
+      test.
+    - Prefer libtest-simple-perl (>= 0.93) to perl (>= 5.12).
+    - t/tests/fields-multi-arch: Do not test invalid Multi-Arch field,
+      because dpkg-deb will already fail.
+    - Drop debug-symbols-directly-in-usr-lib-debug from binaries-general.
+  * private/runtests: Fix typo NO_PKG_MAGNGLE -> NO_PKG_MANGLE.
+  * binaries-general test: Remove unknown -ph flag from gcc 4.6 call.
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Sun, 01 May 2011 21:33:23 +0200
+
 lintian (2.5.0~rc3) unstable; urgency=low
 
   * Summary of tag changes:
@@ -367,6 +444,44 @@
 
  -- Niels Thykier <niels@thykier.net>  Thu, 21 Apr 2011 12:29:45 +0200
 
+lintian (2.5.0~rc2ubuntu3) natty; urgency=low
+
+  * Fix FTBFS on i386 (LP: #756135):
+    - Ubuntu uses i686-linux-gnu instead of i486-linux-gnu for i386.
+    - Drop debug-symbols-directly-in-usr-lib-debug from binaries-general.
+
+ -- Benjamin Drung <bdrung@debian.org>  Sat, 16 Apr 2011 12:05:47 +0200
+
+lintian (2.5.0~rc2ubuntu2) natty; urgency=low
+
+  * t/tests/fields-multi-arch: Do not test invalid Multi-Arch field,
+    because dpkg-deb will already fail.
+  * Enable parallel build again.
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Fri, 08 Apr 2011 00:00:35 +0200
+
+lintian (2.5.0~rc2ubuntu1) natty; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Don't warn about a symlinked changelog file in Ubuntu due to CDBS.
+    - Add no-upstream-changelog tag to cruft-general-test-suite,
+      cruft-general-upstream, cruft-upstream-binaries, fields-no-homepage,
+      patch-systems-no-patch-system tests.
+    - checks/changelog-file.desc, t/tests/legacy-libbaz/tags,
+      testset/tags.libbaz: Drop debian-changelog-file-is-a-symlink tag.
+    - t/tests/changelog-file-symlink, t/tests/init.d-symlink: Drop these tests.
+    - checks/init.d: fix LP: #496798 again; upstream only took part of our
+      patch and the rest of the fix was dropped in the last merge; per
+      maintainer's comments in Debian bug #569492, Ubuntu will need to
+      carry this fix for the time being
+    - Add wrong-name-for-upstream-changelog tag to changelog-file-extra-upstream
+      test.
+    - Prefer libtest-simple-perl (>= 0.93) to perl (>= 5.12).
+    - Dump build logs for tests that FTBFS.
+  * Disable pkgbinarymangler for the test run to fix the FTBFS.
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Thu, 07 Apr 2011 21:29:11 +0200
+
 lintian (2.5.0~rc2) unstable; urgency=low
 
   Uploading to unstable.
@@ -449,6 +564,45 @@
 
  -- Niels Thykier <niels@thykier.net>  Tue, 05 Apr 2011 20:25:09 +0200
 
+lintian (2.5.0~rc1ubuntu4) natty; urgency=low
+
+  * Dump build logs for tests that FTBFS; thanks to Niels Thykier for the patch.
+
+ -- Benjamin Drung <bdrung@debian.org>  Sat, 26 Mar 2011 11:34:56 +0100
+
+lintian (2.5.0~rc1ubuntu3) natty; urgency=low
+
+  * Fix FTBFS (LP: #742092):
+    - Apply commits d435b99, 94ac59c, 20d67e9, 7dbe4df, ad4982bf, a4c6420,
+      18aff3b from the Debian git repository.
+    - Add changelog-file-extra-upstream tag to changelog-file-extra-upstream
+      test.
+    - Add no-upstream-changelog tag to cruft-general-test-suite,
+      cruft-general-upstream, cruft-upstream-binaries, fields-no-homepage,
+      patch-systems-no-patch-system tests.
+    - checks/changelog-file.desc, t/tests/legacy-libbaz/tags,
+      testset/tags.libbaz: Drop debian-changelog-file-is-a-symlink tag.
+    - t/tests/changelog-file-symlink, t/tests/init.d-symlink: Drop these tests.
+
+ -- Benjamin Drung <bdrung@debian.org>  Fri, 25 Mar 2011 18:18:00 +0100
+
+lintian (2.5.0~rc1ubuntu2) natty; urgency=low
+
+  * Prefer libtest-simple-perl (>= 0.93) to perl (>= 5.12).
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 08 Mar 2011 18:16:59 +0100
+
+lintian (2.5.0~rc1ubuntu1) natty; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Don't warn about a symlinked changelog file in Ubuntu due to CDBS.
+    - checks/init.d: fix LP: #496798 again; upstream only took part of our
+      patch and the rest of the fix was dropped in the last merge; per
+      maintainer's comments in Debian bug #569492, Ubuntu will need to
+      carry this fix for the time being
+
+ -- Benjamin Drung <bdrung@debian.org>  Thu, 24 Feb 2011 11:09:20 +0100
+
 lintian (2.5.0~rc1) experimental; urgency=low
 
   The "welcome Niels Thykier!" release.
@@ -705,6 +859,28 @@
 
  -- Raphael Geissert <geissert@debian.org>  Tue, 22 Feb 2011 20:28:48 -0600
 
+lintian (2.4.3ubuntu3) natty; urgency=low
+
+  * checks/init.d: fix LP: #496798 again; upstream only took part of our
+    patch and the rest of the fix was dropped in the last merge; per
+    maintainer's comments in Debian bug #569492, Ubuntu will need to
+    carry this fix for the time being
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 26 Jan 2011 15:49:23 -0600
+
+lintian (2.4.3ubuntu2) maverick; urgency=low
+
+  * Add natty as a valid Ubuntu distribution.
+
+ -- Loïc Minier <loic.minier@ubuntu.com>  Tue, 28 Sep 2010 02:54:33 +0200
+
+lintian (2.4.3ubuntu1) maverick; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Don't warn about a symlinked changelog file in Ubuntu due to CDBS.
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Mon, 26 Jul 2010 10:26:45 +0200
+
 lintian (2.4.3) unstable; urgency=low
 
   The "Policy 3.9.1" release.
@@ -809,6 +985,13 @@
 
  -- Russ Allbery <rra@debian.org>  Sun, 25 Jul 2010 21:50:45 -0700
 
+lintian (2.4.2ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable. (LP: #599372) Remaining changes: 
+    - Don't warn about a symlinked changelog file in Ubuntu due to CDBS.
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Mon, 28 Jun 2010 19:23:12 +0530
+
 lintian (2.4.2) unstable; urgency=low
 
   The "Policy 3.9.0" release.
@@ -933,6 +1116,13 @@
 
  -- Russ Allbery <rra@debian.org>  Sun, 27 Jun 2010 22:08:59 -0700
 
+lintian (2.4.1ubuntu1) maverick; urgency=low
+
+  * Merge from Debian unstable; remaining changes:
+    - Don't warn about a symlinked changelog file in Ubuntu due to CDBS.
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Fri, 07 May 2010 11:14:51 +0200
+
 lintian (2.4.1) unstable; urgency=low
 
   The "there's always a hidden bug" release.
@@ -1145,6 +1335,19 @@
 
  -- Raphael Geissert <geissert@debian.org>  Sat, 24 Apr 2010 13:51:45 -0500
 
+lintian (2.3.4ubuntu2) lucid; urgency=low
+
+  * Add maverick as an allowable distribution for Ubuntu (Closes: #576282).
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Fri, 16 Apr 2010 00:10:31 +0200
+
+lintian (2.3.4ubuntu1) lucid; urgency=low
+
+  * Merge from Debian unstable; remaining changes:
+    - Don't warn about a symlinked changelog file in Ubuntu due to CDBS.
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Tue, 23 Mar 2010 17:30:36 +0100
+
 lintian (2.3.4) unstable; urgency=low
 
   The "miscellaneous bug fix" release.
@@ -1326,6 +1529,21 @@
 
  -- Russ Allbery <rra@debian.org>  Mon, 22 Mar 2010 16:23:51 -0700
 
+lintian (2.3.3ubuntu2) lucid; urgency=low
+
+  [ Jos Boumans ]
+  * Avoid checking upstart jobs linked from /etc/init.d (LP: #496798),
+    patch submitted to Debian bug #569492
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 11 Feb 2010 17:52:14 -0600
+
+lintian (2.3.3ubuntu1) lucid; urgency=low
+
+  * Merge from Debian unstable (LP: #515230), remaining changes:
+    - Don't warn about a symlinked changelog file in Ubuntu due to CDBS.
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Sun, 31 Jan 2010 20:17:50 +0100
+
 lintian (2.3.3) unstable; urgency=low
 
   The "Policy 3.8.4" release.
diff -Nru lintian-2.5.1/debian/control lintian-2.5.1ubuntu1/debian/control
--- lintian-2.5.1/debian/control	2011-05-31 16:30:09.000000000 +0200
+++ lintian-2.5.1ubuntu1/debian/control	2011-06-21 18:25:39.000000000 +0200
@@ -1,7 +1,8 @@
 Source: lintian
 Section: devel
 Priority: optional
-Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
 Uploaders: Josip Rodin <joy-packages@debian.org>,
            Jeroen van Wolffelaar <jeroen@wolffelaar.nl>,
            Frank Lichtenheld <djpig@debian.org>,
diff -Nru lintian-2.5.1/t/source/magic-architecture-srcpkg-ok/changelog lintian-2.5.1ubuntu1/t/source/magic-architecture-srcpkg-ok/changelog
--- lintian-2.5.1/t/source/magic-architecture-srcpkg-ok/changelog	2011-01-27 15:31:42.000000000 +0200
+++ lintian-2.5.1ubuntu1/t/source/magic-architecture-srcpkg-ok/changelog	2011-06-24 07:27:19.000000000 +0200
@@ -5,5 +5,5 @@
 
   * Suppress "should close ITP bug" messages.  (Closes: #123456)
 
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Wed, 27 May 2009 19:46:03 +0100
+ -- Debian Lintian Maintainers <lintian-maint@debian.org>  Wed, 22 Jun 2011 18:30:00 +0100
 
diff -Nru lintian-2.5.1/t/source/magic-architecture-srcpkg-ok/control lintian-2.5.1ubuntu1/t/source/magic-architecture-srcpkg-ok/control
--- lintian-2.5.1/t/source/magic-architecture-srcpkg-ok/control	2011-01-27 15:31:42.000000000 +0200
+++ lintian-2.5.1ubuntu1/t/source/magic-architecture-srcpkg-ok/control	2011-06-24 07:27:19.000000000 +0200
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
 Build-Depends: debhelper (>= 7)
-Standards-Version: 3.8.1
+Standards-Version: 3.9.2
 
 Package: magic-architecture-srcpkg-ok-data
 Architecture: all
diff -Nru lintian-2.5.1/t/source/magic-architecture-srcpkg-wrong/changelog lintian-2.5.1ubuntu1/t/source/magic-architecture-srcpkg-wrong/changelog
--- lintian-2.5.1/t/source/magic-architecture-srcpkg-wrong/changelog	2011-01-27 15:31:42.000000000 +0200
+++ lintian-2.5.1ubuntu1/t/source/magic-architecture-srcpkg-wrong/changelog	2011-06-24 07:27:19.000000000 +0200
@@ -5,5 +5,5 @@
 
   * Suppress "should close ITP bug" messages.  (Closes: #123456)
 
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Wed, 27 May 2009 19:46:03 +0100
+ -- Debian Lintian Maintainers <lintian-maint@debian.org>  Wed, 22 Jun 2011 18:30:00 +0100
 
diff -Nru lintian-2.5.1/t/source/magic-architecture-srcpkg-wrong/control lintian-2.5.1ubuntu1/t/source/magic-architecture-srcpkg-wrong/control
--- lintian-2.5.1/t/source/magic-architecture-srcpkg-wrong/control	2011-01-27 15:31:42.000000000 +0200
+++ lintian-2.5.1ubuntu1/t/source/magic-architecture-srcpkg-wrong/control	2011-06-24 07:27:19.000000000 +0200
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
 Build-Depends: debhelper (>= 7)
-Standards-Version: 3.8.1
+Standards-Version: 3.9.2
 
 Package: magic-architecture-srcpkg-wrong
 Architecture: all
diff -Nru lintian-2.5.1/t/source/package-version-0/changelog lintian-2.5.1ubuntu1/t/source/package-version-0/changelog
--- lintian-2.5.1/t/source/package-version-0/changelog	2011-01-27 15:31:42.000000000 +0200
+++ lintian-2.5.1ubuntu1/t/source/package-version-0/changelog	2011-06-24 07:27:19.000000000 +0200
@@ -5,5 +5,5 @@
 
   * Suppress "should close ITP bug" messages.  (Closes: #123456)
 
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Fri, 12 Jun 2009 21:08:23 +0100
+ -- Debian Lintian Maintainers <lintian-maint@debian.org>  Wed, 22 Jun 2011 18:30:00 +0100
 
diff -Nru lintian-2.5.1/t/source/package-version-0/control lintian-2.5.1ubuntu1/t/source/package-version-0/control
--- lintian-2.5.1/t/source/package-version-0/control	2011-01-27 15:31:42.000000000 +0200
+++ lintian-2.5.1ubuntu1/t/source/package-version-0/control	2011-06-24 07:27:19.000000000 +0200
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
 Build-Depends: debhelper (>= 7)
-Standards-Version: 3.8.1
+Standards-Version: 3.9.2
 
 Package: package-version-0
 Architecture: all
diff -Nru lintian-2.5.1/t/tests/binaries-general/desc lintian-2.5.1ubuntu1/t/tests/binaries-general/desc
--- lintian-2.5.1/t/tests/binaries-general/desc	2011-01-27 15:31:43.000000000 +0200
+++ lintian-2.5.1ubuntu1/t/tests/binaries-general/desc	2011-06-21 18:25:17.000000000 +0200
@@ -7,5 +7,4 @@
  arch-dependent-file-in-usr-share
  binary-compiled-with-profiling-enabled
  binary-or-shlib-defines-rpath
- debug-symbols-directly-in-usr-lib-debug
  library-in-debug-or-profile-should-not-be-stripped
diff -Nru lintian-2.5.1/t/tests/binaries-general/tags lintian-2.5.1ubuntu1/t/tests/binaries-general/tags
--- lintian-2.5.1/t/tests/binaries-general/tags	2011-04-12 11:22:07.000000000 +0200
+++ lintian-2.5.1ubuntu1/t/tests/binaries-general/tags	2011-06-21 18:25:17.000000000 +0200
@@ -1,7 +1,6 @@
 E: binaries-general: arch-dependent-file-in-usr-share usr/share/foo/basic
 E: binaries-general: binary-or-shlib-defines-rpath usr/lib/foo/basiclibrpath /usr/lib
 E: binaries-general: binary-or-shlib-defines-rpath usr/share/foo/basic /usr/local/lib
-E: binaries-general: debug-symbols-directly-in-usr-lib-debug usr/lib/debug/basic
 E: binaries-general: library-in-debug-or-profile-should-not-be-stripped usr/lib/debug/usr/share/foo/basic
 W: binaries-general: binary-compiled-with-profiling-enabled usr/share/foo/basic
 W: binaries-general: debug-package-should-be-named-dbg usr/lib/debug/basic
diff -Nru lintian-2.5.1/t/tests/changelog-file-extra-upstream/tags lintian-2.5.1ubuntu1/t/tests/changelog-file-extra-upstream/tags
--- lintian-2.5.1/t/tests/changelog-file-extra-upstream/tags	2011-01-27 15:31:44.000000000 +0200
+++ lintian-2.5.1ubuntu1/t/tests/changelog-file-extra-upstream/tags	2011-06-21 18:25:17.000000000 +0200
@@ -0,0 +1 @@
+W: changelog-file-extra-upstream: wrong-name-for-upstream-changelog usr/share/doc/changelog-file-extra-upstream/ChangeLog
diff -Nru lintian-2.5.1/t/tests/changelog-file-symlink/debian/debian/rules lintian-2.5.1ubuntu1/t/tests/changelog-file-symlink/debian/debian/rules
--- lintian-2.5.1/t/tests/changelog-file-symlink/debian/debian/rules	2011-04-12 11:22:07.000000000 +0200
+++ lintian-2.5.1ubuntu1/t/tests/changelog-file-symlink/debian/debian/rules	1970-01-01 02:00:00.000000000 +0200
@@ -1,12 +0,0 @@
-#!/usr/bin/make -f
-
-%:
-	dh $@
-
-
-override_dh_md5sums:
-	DIR=$$(find debian/*/ -type f -a -name 'changelog.gz' \
-		-exec dirname {} \; ) ; \
-	  rm -f $$DIR/changelog.gz ; \
-	  ln -s ../lintian/changelog.gz $$DIR/changelog.gz
-	dh_md5sums
diff -Nru lintian-2.5.1/t/tests/changelog-file-symlink/desc lintian-2.5.1ubuntu1/t/tests/changelog-file-symlink/desc
--- lintian-2.5.1/t/tests/changelog-file-symlink/desc	2011-04-12 11:22:07.000000000 +0200
+++ lintian-2.5.1ubuntu1/t/tests/changelog-file-symlink/desc	1970-01-01 02:00:00.000000000 +0200
@@ -1,7 +0,0 @@
-Testname: changelog-file-symlink
-Sequence: 6000
-Type: native
-Version: 1.0
-Description: Test if Debian changelog is a symlink
-Test-For:
- debian-changelog-file-is-a-symlink
diff -Nru lintian-2.5.1/t/tests/changelog-file-symlink/tags lintian-2.5.1ubuntu1/t/tests/changelog-file-symlink/tags
--- lintian-2.5.1/t/tests/changelog-file-symlink/tags	2011-04-12 11:22:07.000000000 +0200
+++ lintian-2.5.1ubuntu1/t/tests/changelog-file-symlink/tags	1970-01-01 02:00:00.000000000 +0200
@@ -1 +0,0 @@
-W: changelog-file-symlink: debian-changelog-file-is-a-symlink
diff -Nru lintian-2.5.1/t/tests/cruft-general-test-suite/tags lintian-2.5.1ubuntu1/t/tests/cruft-general-test-suite/tags
--- lintian-2.5.1/t/tests/cruft-general-test-suite/tags	2011-01-27 15:31:46.000000000 +0200
+++ lintian-2.5.1ubuntu1/t/tests/cruft-general-test-suite/tags	2011-06-21 18:25:17.000000000 +0200
@@ -0,0 +1 @@
+P: cruft-general-test-suite: no-upstream-changelog
diff -Nru lintian-2.5.1/t/tests/cruft-general-upstream/tags lintian-2.5.1ubuntu1/t/tests/cruft-general-upstream/tags
--- lintian-2.5.1/t/tests/cruft-general-upstream/tags	2011-01-27 15:31:46.000000000 +0200
+++ lintian-2.5.1ubuntu1/t/tests/cruft-general-upstream/tags	2011-06-21 18:25:17.000000000 +0200
@@ -11,4 +11,5 @@
 P: cruft-general-upstream source: source-contains-svn-commit-file svn-commit.tmp
 P: cruft-general-upstream source: source-contains-svn-conflict-file foo.r1352
 P: cruft-general-upstream source: source-contains-svn-control-dir .svn
+P: cruft-general-upstream: no-upstream-changelog
 W: cruft-general-upstream source: configure-generated-file-in-source config.cache
diff -Nru lintian-2.5.1/t/tests/cruft-upstream-binaries/tags lintian-2.5.1ubuntu1/t/tests/cruft-upstream-binaries/tags
--- lintian-2.5.1/t/tests/cruft-upstream-binaries/tags	2011-01-27 15:31:46.000000000 +0200
+++ lintian-2.5.1ubuntu1/t/tests/cruft-upstream-binaries/tags	2011-06-21 18:25:17.000000000 +0200
@@ -1 +1,2 @@
 P: cruft-upstream-binaries source: source-contains-prebuilt-binary hello
+P: cruft-upstream-binaries: no-upstream-changelog
diff -Nru lintian-2.5.1/t/tests/fields-multi-arch/debian/debian/control.in lintian-2.5.1ubuntu1/t/tests/fields-multi-arch/debian/debian/control.in
--- lintian-2.5.1/t/tests/fields-multi-arch/debian/debian/control.in	2011-04-12 11:22:08.000000000 +0200
+++ lintian-2.5.1ubuntu1/t/tests/fields-multi-arch/debian/debian/control.in	2011-06-21 18:25:17.000000000 +0200
@@ -5,18 +5,6 @@
 Standards-Version: {$standards_version}
 Build-Depends: debhelper (>= 7.0.50~)
 
-Package: {$srcpkg}-some
-Architecture: any
-Depends: $\{misc:Depends\}, $\{shlibs:Depends\}
-Multi-Arch: bad
-Description: {$description}
- This is a test package designed to exercise some feature or tag of
- Lintian.  It is part of the Lintian test suite and may do very odd
- things.  It should not be installed like a regular package.  It may
- be an empty package.
- .
- This is a test with an invalid Multi-Arch field.
-
 Package: {$srcpkg}-same
 Architecture: any
 Depends: $\{misc:Depends\}, $\{shlibs:Depends\}
diff -Nru lintian-2.5.1/t/tests/fields-multi-arch/desc lintian-2.5.1ubuntu1/t/tests/fields-multi-arch/desc
--- lintian-2.5.1/t/tests/fields-multi-arch/desc	2011-04-12 11:22:08.000000000 +0200
+++ lintian-2.5.1ubuntu1/t/tests/fields-multi-arch/desc	2011-06-21 18:25:17.000000000 +0200
@@ -2,4 +2,3 @@
 Sequence: 6000
 Version: 1.0
 Description: Tests for the Multi-Arch field
-Test-For: unknown-multi-arch-value
diff -Nru lintian-2.5.1/t/tests/fields-multi-arch/tags lintian-2.5.1ubuntu1/t/tests/fields-multi-arch/tags
--- lintian-2.5.1/t/tests/fields-multi-arch/tags	2011-04-12 11:22:08.000000000 +0200
+++ lintian-2.5.1ubuntu1/t/tests/fields-multi-arch/tags	2011-06-21 18:25:17.000000000 +0200
@@ -1 +0,0 @@
-E: fields-multi-arch-some: unknown-multi-arch-value fields-multi-arch-some bad
diff -Nru lintian-2.5.1/t/tests/fields-no-homepage/tags lintian-2.5.1ubuntu1/t/tests/fields-no-homepage/tags
--- lintian-2.5.1/t/tests/fields-no-homepage/tags	2011-01-27 15:31:48.000000000 +0200
+++ lintian-2.5.1ubuntu1/t/tests/fields-no-homepage/tags	2011-06-21 18:25:17.000000000 +0200
@@ -1 +1,2 @@
 P: fields-no-homepage: no-homepage-field
+P: fields-no-homepage: no-upstream-changelog
diff -Nru lintian-2.5.1/t/tests/init.d-symlink/debian/debian/links lintian-2.5.1ubuntu1/t/tests/init.d-symlink/debian/debian/links
--- lintian-2.5.1/t/tests/init.d-symlink/debian/debian/links	2011-01-27 15:31:50.000000000 +0200
+++ lintian-2.5.1ubuntu1/t/tests/init.d-symlink/debian/debian/links	1970-01-01 02:00:00.000000000 +0200
@@ -1,2 +0,0 @@
-/lib/init/upstart-job etc/init.d/lintian
-/lib/init/upstart-job etc/init.d/lintian-unreg
diff -Nru lintian-2.5.1/t/tests/init.d-symlink/debian/debian/postinst lintian-2.5.1ubuntu1/t/tests/init.d-symlink/debian/debian/postinst
--- lintian-2.5.1/t/tests/init.d-symlink/debian/debian/postinst	2011-01-27 15:31:50.000000000 +0200
+++ lintian-2.5.1ubuntu1/t/tests/init.d-symlink/debian/debian/postinst	1970-01-01 02:00:00.000000000 +0200
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -e
-update-rc.d lintian defaults >/dev/null
-#DEBHELPER#
diff -Nru lintian-2.5.1/t/tests/init.d-symlink/debian/debian/postrm lintian-2.5.1ubuntu1/t/tests/init.d-symlink/debian/debian/postrm
--- lintian-2.5.1/t/tests/init.d-symlink/debian/debian/postrm	2011-01-27 15:31:50.000000000 +0200
+++ lintian-2.5.1ubuntu1/t/tests/init.d-symlink/debian/debian/postrm	1970-01-01 02:00:00.000000000 +0200
@@ -1,6 +0,0 @@
-#!/bin/sh
-set -e
-if [ "$1" = purse ] ; then
-    update-rc.d lintian remove >/dev/null
-fi
-#DEBHELPER#
diff -Nru lintian-2.5.1/t/tests/init.d-symlink/desc lintian-2.5.1ubuntu1/t/tests/init.d-symlink/desc
--- lintian-2.5.1/t/tests/init.d-symlink/desc	2011-01-27 15:31:50.000000000 +0200
+++ lintian-2.5.1ubuntu1/t/tests/init.d-symlink/desc	1970-01-01 02:00:00.000000000 +0200
@@ -1,9 +0,0 @@
-Testname: init.d-symlink
-Sequence: 6000
-Version: 1.0
-Description: Check proper handling of symlinked init scripts
-Test-Against:
- init.d-script-not-included-in-package
- init.d-script-not-marked-as-conffile
-Test-For:
- script-in-etc-init.d-not-registered-via-update-rc.d
diff -Nru lintian-2.5.1/t/tests/init.d-symlink/tags lintian-2.5.1ubuntu1/t/tests/init.d-symlink/tags
--- lintian-2.5.1/t/tests/init.d-symlink/tags	2011-04-12 11:22:08.000000000 +0200
+++ lintian-2.5.1ubuntu1/t/tests/init.d-symlink/tags	1970-01-01 02:00:00.000000000 +0200
@@ -1 +0,0 @@
-W: init.d-symlink: script-in-etc-init.d-not-registered-via-update-rc.d etc/init.d/lintian-unreg
diff -Nru lintian-2.5.1/t/tests/patch-systems-no-patch-system/tags lintian-2.5.1ubuntu1/t/tests/patch-systems-no-patch-system/tags
--- lintian-2.5.1/t/tests/patch-systems-no-patch-system/tags	2011-01-27 15:31:53.000000000 +0200
+++ lintian-2.5.1ubuntu1/t/tests/patch-systems-no-patch-system/tags	2011-06-21 18:25:17.000000000 +0200
@@ -1 +1,2 @@
 P: patch-systems-no-patch-system source: direct-changes-in-diff-but-no-patch-system README
+P: patch-systems-no-patch-system: no-upstream-changelog
diff -Nru lintian-2.5.1/testset/tags.libbaz lintian-2.5.1ubuntu1/testset/tags.libbaz
--- lintian-2.5.1/testset/tags.libbaz	2011-06-14 14:21:50.000000000 +0200
+++ lintian-2.5.1ubuntu1/testset/tags.libbaz	2011-06-21 18:25:17.000000000 +0200
@@ -68,7 +68,6 @@
 W: libbaz2-dbg: wrong-section-according-to-package-name libbaz2-dbg => debug
 W: libbaz2-dev: new-package-should-close-itp-bug
 W: libbaz2-dev: wrong-section-according-to-package-name libbaz2-dev => libdevel
-W: libbaz2: debian-changelog-file-is-a-symlink
 W: libbaz2: package-name-doesnt-match-sonames libbaz2-1.0
 W: libbaz2: symlink-should-be-relative usr/share/doc/libbaz2/changelog.gz /usr/share/doc/lintian/changelog.gz
 X: libbaz2: package-contains-broken-symlink usr/share/doc/libbaz2/changelog.gz /usr/share/doc/lintian/changelog.gz