[debhelper-devel] [debhelper] 04/05: d/control: Remove obsolete versioned conflicts

[Niels Thykier]

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

nthykier pushed a commit to branch master
in repository debhelper.

commit c8567ca3c13bad1e6ba880e83c62e05712305e3d
Author: Niels Thykier <niels at thykier.net>
Date:   Fri May 1 07:37:48 2015 +0200

    d/control: Remove obsolete versioned conflicts
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 1 +
 debian/control   | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b03390a..67f4111 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -89,6 +89,7 @@ debhelper (9.20150101.1) UNRELEASED; urgency=medium
     we do not need it any longer.  (Closes: #783898)
   * dh_gencontrol: Insert an empty misc:Pre-Depends to avoid warnings
     in packages for using a (now often) non-existing substvars.
+  * d/control: Remove versioned conflicts that are no longer relevant.
 
   [ Bernhard R. Link ]
   * Dh_lib: apply patch from Guillem Jover to support case-insensitive
diff --git a/debian/control b/debian/control
index 69831f4..7a5679b 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Package: debhelper
 Architecture: all
 Depends: ${perl:Depends}, ${misc:Depends}, file (>= 3.23), dpkg (>= 1.16.2), dpkg-dev (>= 1.17.0), binutils, po-debconf, man-db (>= 2.5.1-1), libdpkg-perl (>= 1.17.14)
 Suggests: dh-make
-Conflicts: dpkg-cross (<< 1.18), python-support (<< 0.5.3), python-central (<< 0.5.6), automake (<< 1.11.2)
 Multi-Arch: foreign
 Description: helper programs for debian/rules
  A collection of programs that can be used in a debian/rules file to

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