[SCM] kodi/master: Fix remove repository feed from kodi-data. Tighten kodi-repository-kodi breaks+replaces on kodi-data.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7af150ee4b697060e6fb662f4e26b971130d64c0
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Oct 11 02:36:48 2017 +0200

    Fix remove repository feed from kodi-data. Tighten kodi-repository-kodi breaks+replaces on kodi-data.

diff --git a/debian/control b/debian/control
index 602b541..02143ae 100644
--- a/debian/control
+++ b/debian/control
@@ -364,11 +364,11 @@ Architecture: all
 Depends: ${misc:Depends}
 Provides: kodi-repository
 Replaces: kodi-repository,
- kodi-data (<< 2:17.3+dfsg1-3~),
+ kodi-data (<< 2:17.3+dfsg1-5~),
  kodi (<< 15.2~rc1+dfsg1-2~),
  xbmc (<< 2:13.2+dfsg1-5~),
 Conflicts: kodi-repository
-Breaks: kodi-data (<< 2:17.3+dfsg1-3~),
+Breaks: kodi-data (<< 2:17.3+dfsg1-5~),
  kodi (<< 15.2~rc1+dfsg1-2~),
  xbmc (<< 2:13.2+dfsg1-5~),
 Enhances: kodi
diff --git a/debian/rules b/debian/rules
index 2a5f234..14ddf57 100755
--- a/debian/rules
+++ b/debian/rules
@@ -160,8 +160,8 @@ override_dh_install-indep:
 	dh_install -i -XLICENCE -XLICENSE \
 		-XLicence.txt -XLicense.txt -XLICENSE.txt \
 		-XNOTICE.txt \
-		-Xjquery-1.8.2.min.js -Xiscroll-min.js \
-		-Nkodi-repository-kodi -Xusr/share/kodi/addons/repository.xbmc.org
+		-Xjquery-1.8.2.min.js -Xiscroll-min.js
+	rm -rf debian/kodi-data/usr/share/kodi/addons/repository.xbmc.org
 	dh_install -pkodi-repository-kodi \
 		addons/repository.xbmc.org/* usr/share/kodi/addons/repository.xbmc.org
 

-- 
kodi packaging