[allegro4.4] 02/02: Remove conflict of liballegro4-dev with liballegro5-dev.

[Tobias Hansen]

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

thansen pushed a commit to branch master
in repository allegro4.4.

commit 6b744d245e998d154c993c365dabc6c2a9b4d506
Author: Tobias Hansen <thansen at debian.org>
Date:   Tue Jun 21 19:41:05 2016 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 09357d3..0034cbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ allegro4.4 (2:4.4.2-9) UNRELEASED; urgency=medium
 
   * Apply patch of Reiner Herrmann improving build reproducability.
     (Closes: #824140)
+  * Remove conflict of liballegro4-dev with liballegro5-dev.
+    (Closes: #824157)
 
  -- Tobias Hansen <thansen at debian.org>  Tue, 21 Jun 2016 19:36:19 +0100
 
diff --git a/debian/control b/debian/control
index f557573..75ddbb9 100644
--- a/debian/control
+++ b/debian/control
@@ -54,7 +54,7 @@ Depends: ${misc:Depends},
          libxxf86vm-dev,
          libxcursor-dev
 Provides: liballegro4.2-dev, liballegro-dev
-Conflicts: liballegro-dev-common, liballegro4a, liballegro-dev, liballegro4.2-dev, liballegro5-dev
+Conflicts: liballegro-dev-common, liballegro4a, liballegro-dev, liballegro4.2-dev
 Replaces: liballegro-dev-common, liballegro4a, liballegro-dev, liballegro4.2-dev
 Description: development files for the Allegro library
  This package contains the development headers for the Allegro library.

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