[debian-edu-commits] debian-edu/pkg-team/ 03/07: Remove unneeded conflict on ldap2dns (Closes: #698362).

[Petter Reinholdtsen]

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

pere pushed a commit to branch master
in repository ldap2zone.

commit a6ce75f945fbdec9e864e2acf9c5965740d2988b
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Wed Oct 1 07:01:38 2014 +0200

    Remove unneeded conflict on ldap2dns (Closes: #698362).
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index e6a9438..d2985b8 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ DM-Upload-Allowed: yes
 Package: ldap2zone
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, bind9
-Conflicts: ldapdns, ldap2dns
+Conflicts: ldapdns
 Description: Extract DNS zones from LDAP trees
  This is a tool that reads info for a zone from LDAP and constructs
  a standard plain ascii zone file. The LDAP information has to be

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/ldap2zone.git