[SCM] kodi/master: Fix have kodi-repository-kodi conflict against (not break) virtual kodi-repository.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d7faa86d0f82df423173f0dbee19c8bfc9a0e4f7
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Oct 5 18:41:09 2017 +0200

    Fix have kodi-repository-kodi conflict against (not break) virtual kodi-repository.

diff --git a/debian/control b/debian/control
index 2dfd359..6ef6c8a 100644
--- a/debian/control
+++ b/debian/control
@@ -365,7 +365,7 @@ Package: kodi-repository-kodi
 Architecture: all
 Provides: kodi-repository
 Replaces: kodi-repository
-Breaks: kodi-repository
+Conflicts: kodi-repository
 Enhances: kodi
 Description: Open Source Home Theatre (official addons repository feed)
  Kodi, formerly known as XBMC is an award winning free and

-- 
kodi packaging