[SCM] gpac/master: Make libgpac4 conflict with libgpac3 (>= 0.5.2)

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0006b1572011e3b03a94da454a5010039f2d0733
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Wed Jul 8 10:27:26 2015 +0200

    Make libgpac4 conflict with libgpac3 (>= 0.5.2)
    
    which ships the same library while at a non-multiarch location.

diff --git a/debian/control b/debian/control
index 3c8b8ad..ae170d6 100644
--- a/debian/control
+++ b/debian/control
@@ -100,6 +100,7 @@ Multi-Arch: same
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
+Conflicts: libgpac3 (>= 0.5.2)
 Description: GPAC Project on Advanced Content - shared libraries
  GPAC stands for GPAC Project on Advanced Content (a recursive acronym). It is
  an Open Source multimedia framework for research and academic purposes. The

-- 
gpac packaging