[SCM] kodi/master: Fix have kodi-repository-kodi conflict against and replace older kodi/kodi-data/xbmc.

js at users.alioth.debian.org js at users.alioth.debian.org
Tue Oct 10 21:19:31 UTC 2017


The following commit has been merged in the master branch:
commit 14b6fb61a633ce3b39c85cbbcdc2d75e86933029
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Oct 5 22:55:03 2017 +0200

    Fix have kodi-repository-kodi conflict against and replace older kodi/kodi-data/xbmc.

diff --git a/debian/control b/debian/control
index 6ef6c8a..c9ccdf5 100644
--- a/debian/control
+++ b/debian/control
@@ -364,8 +364,14 @@ Description: Open Source Home Theatre (Addons Dev package)
 Package: kodi-repository-kodi
 Architecture: all
 Provides: kodi-repository
-Replaces: kodi-repository
+Replaces: kodi-repository,
+ kodi-data (<< 2:17.3+dfsg1-3~),
+ kodi (<< 15.2~rc1+dfsg1-2~),
+ xbmc (<< 2:13.2+dfsg1-5~),
 Conflicts: kodi-repository
+Breaks: kodi-data (<< 2:17.3+dfsg1-3~),
+ kodi (<< 15.2~rc1+dfsg1-2~),
+ xbmc (<< 2:13.2+dfsg1-5~),
 Enhances: kodi
 Description: Open Source Home Theatre (official addons repository feed)
  Kodi, formerly known as XBMC is an award winning free and

-- 
kodi packaging



More information about the pkg-multimedia-commits mailing list