[SCM] libdvbpsi/master: Remove obsolete Conflicts

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1d89b394757f18e12cc45cfda096e499db89c61e
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Jun 8 18:19:32 2015 +0200

    Remove obsolete Conflicts

diff --git a/debian/control b/debian/control
index ccba3ba..42f7fd4 100644
--- a/debian/control
+++ b/debian/control
@@ -48,13 +48,6 @@ Multi-Arch: same
 Depends:
  libdvbpsi10 (= ${binary:Version}),
  ${misc:Depends}
-Conflicts:
- libdvbpsi0-dev,
- libdvbpsi1-dev,
- libdvbpsi2-dev,
- libdvbpsi3-dev,
- libdvbpsi4-dev,
- libdvbpsi5-dev
 Description: development files for libdvbpsi
  libdvbpsi is a simple library designed for MPEG TS and DVB PSI tables
  decoding and generating.

-- 
libdvbpsi packaging