[lintian] 02/04: t/…/rules-including-deprecated-makefiles/desc += "Test-Conflict: dh-buildinfo"

[Axel Beckert <abe@deuxchevaux.org>]

This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch master
in repository lintian.

commit 1b1ac331e05c858c032d4db75d78af0ae20e5b99
Author: Axel Beckert <abe@deuxchevaux.org>
Date:   Tue Nov 14 04:36:45 2017 +0100

    t/…/rules-including-deprecated-makefiles/desc += "Test-Conflict: dh-buildinfo"
    
    Having dh-buildinfo installed causes that test to fail.
---
 debian/changelog                                  | 4 ++++
 t/tests/rules-including-deprecated-makefiles/desc | 1 +
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8f5e9e7..a9c38f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,10 @@ lintian (2.5.60) UNRELEASED; urgency=medium
   * lib/Test/Lintian/Harness.pm, t/runtests, t/tests/README:
     + [AB] Add support for a "Test-Conflicts" field.
 
+  * t/tests/rules-including-deprecated-makefiles/desc:
+    + [AB] Add "Test-Conflict: dh-buildinfo". Having dh-buildinfo
+      installed causes that test to fail.
+
  -- Chris Lamb <lamby@debian.org>  Thu, 09 Nov 2017 09:09:49 +0000
 
 lintian (2.5.59) unstable; urgency=medium
diff --git a/t/tests/rules-including-deprecated-makefiles/desc b/t/tests/rules-including-deprecated-makefiles/desc
index 1a11d7c..1395b30 100644
--- a/t/tests/rules-including-deprecated-makefiles/desc
+++ b/t/tests/rules-including-deprecated-makefiles/desc
@@ -2,5 +2,6 @@ Testname: rules-including-deprecated-makefiles
 Version: 1.0
 Description: Test for debian/rules with deprecated included file
 Extra-Build-Depends: cdbs
+Test-Conflicts: dh-buildinfo
 Test-For:
  debian-rules-uses-deprecated-makefile

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git