[allegro5] 01/01: Remove conflict of liballegro5-dev with liballegro4-dev.

[Tobias Hansen]

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

thansen pushed a commit to branch master
in repository allegro5.

commit eee9ed9eb358fa5561cc2ba3603f160f06b2c946
Author: Tobias Hansen <thansen at debian.org>
Date:   Tue Jun 21 19:32:22 2016 +0100

    Remove conflict of liballegro5-dev with liballegro4-dev.
---
 debian/changelog | 7 +++++++
 debian/control   | 1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 302da0e..e01233b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+allegro5 (2:5.2.0-2) UNRELEASED; urgency=medium
+
+  * Remove conflict of liballegro5-dev with liballegro4-dev and
+    liballegro-dev. (Closes: #824158)
+
+ -- Tobias Hansen <thansen at debian.org>  Tue, 21 Jun 2016 19:30:40 +0100
+
 allegro5 (2:5.2.0-1) unstable; urgency=medium
 
   * New upstream release (Closes: #704141).
diff --git a/debian/control b/debian/control
index 832c49a..5ee9f20 100644
--- a/debian/control
+++ b/debian/control
@@ -63,7 +63,6 @@ Depends: ${misc:Depends},
          libxinerama-dev,
          libxpm-dev,
          libxrandr-dev
-Conflicts: liballegro-dev, liballegro4-dev
 Recommends: liballegro-acodec5-dev,
             liballegro-audio5-dev,
             liballegro-dialog5-dev,

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