[SCM] kodi/master: Split architecture-indepedent data to kodi-data

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b8800a6473ccd78e44ad46ea3afe066b03f8f79a
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Sat Sep 26 12:45:57 2015 +0200

    Split architecture-indepedent data to kodi-data
    
    Only the kodi and kodi-standalone binaries are kept in kodi package which is
    now Architecture:any since it contains the architecture-specific path to
    kodi.bin.
    
    Closes: #799979

diff --git a/debian/control b/debian/control
index c7e0371..57c4205 100644
--- a/debian/control
+++ b/debian/control
@@ -117,11 +117,37 @@ Vcs-Git: git://anonscm.debian.org/pkg-multimedia/kodi.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/kodi.git
 
 Package: kodi
-Architecture: all
-Multi-Arch: foreign
+Architecture: any
 Depends: kodi-bin (>= ${source:Version}),
          kodi-bin (<< ${source:Version}.1~),
-         mesa-utils,
+         kodi-data,
+         ${misc:Depends}
+Replaces: xbmc (<< 2:13.2+dfsg1-5~)
+Breaks: xbmc (<< 2:13.2+dfsg1-5~)
+Description: Open Source Home Theatre (executable binaries)
+ Kodi, formerly known as XBMC is an award winning free and
+ open source software media-player and entertainment hub for all your digital
+ media. Kodi is available for Linux, Mac OS X (Leopard, Tiger and Apple TV)
+ and Microsoft Windows, as well as the original Xbox game console. Created in
+ 2003 by a group of like minded programmers, Kodi is a non-profit project run
+ and developed by volunteers located around the world. More than 50 software
+ developers have contributed to Kodi, and 100-plus translators have worked to
+ expand its reach, making it available in more than 30 languages.
+ .
+ While Kodi functions very well as a standard media player application for
+ your computer, it has been designed to be the perfect companion for your
+ HTPC. Supporting an almost endless range of remote controls, and combined
+ with its beautiful interface and powerful skinning engine, Kodi feels very
+ natural to use from the couch and is the ideal solution for your home
+ theater. Once installed, your computer will become a fully functional
+ multimedia jukebox.
+ .
+ This package contains the kodi binaries.
+
+Package: kodi-data
+Architecture: all
+Multi-Arch: foreign
+Depends: mesa-utils,
          x11-utils,
          fonts-dejavu-core,
          fonts-roboto,
@@ -130,8 +156,8 @@ Depends: kodi-bin (>= ${source:Version}),
          python-imaging,
          ${python:Depends},
          ${misc:Depends}
-Replaces: xbmc (<< 2:13.2+dfsg1-5~)
-Breaks: xbmc (<< 2:13.2+dfsg1-5~)
+Replaces: xbmc (<< 2:13.2+dfsg1-5~), kodi (<< 15.2~rc1+dfsg1-2~)
+Breaks: xbmc (<< 2:13.2+dfsg1-5~), kodi (<< 15.2~rc1+dfsg1-2~)
 Description: Open Source Home Theatre (arch-independent data package)
  Kodi, formerly known as XBMC is an award winning free and
  open source software media-player and entertainment hub for all your digital
@@ -164,7 +190,7 @@ Recommends: ${shlibs:Recommends}, udisks2
 Replaces: xbmc-bin (<< 2:13.2+dfsg1-5~)
 Breaks: xbmc-bin (<< 2:13.2+dfsg1-5~)
 Conflicts: libgl1-mesa-swx11
-Description: Open Source Home Theatre (binary data package)
+Description: Open Source Home Theatre (architecture-dependent files)
  Kodi, formerly known as XBMC is an award winning free and
  open source software media-player and entertainment hub for all your digital
  media. Kodi is available for Linux, Mac OS X (Leopard, Tiger and Apple TV)
diff --git a/debian/kodi-bin.manpages b/debian/kodi-bin.manpages
new file mode 100644
index 0000000..ae989bf
--- /dev/null
+++ b/debian/kodi-bin.manpages
@@ -0,0 +1 @@
+docs/manpages/kodi.bin.1
diff --git a/debian/kodi.docs b/debian/kodi-data.docs
similarity index 100%
rename from debian/kodi.docs
rename to debian/kodi-data.docs
diff --git a/debian/kodi.install b/debian/kodi-data.install
similarity index 59%
copy from debian/kodi.install
copy to debian/kodi-data.install
index f95f24a..a2e1ab7 100644
--- a/debian/kodi.install
+++ b/debian/kodi-data.install
@@ -1,7 +1,4 @@
-usr/bin/kodi
 usr/share/kodi
 usr/share/icons
-usr/share/applications
 usr/share/kodi/addons/skin.confluence
-usr/bin/kodi-standalone
 usr/share/xsessions
diff --git a/debian/kodi.links b/debian/kodi-data.links
similarity index 100%
rename from debian/kodi.links
rename to debian/kodi-data.links
diff --git a/debian/kodi.install b/debian/kodi.install
index f95f24a..3f4dadd 100644
--- a/debian/kodi.install
+++ b/debian/kodi.install
@@ -1,7 +1,3 @@
 usr/bin/kodi
-usr/share/kodi
-usr/share/icons
-usr/share/applications
-usr/share/kodi/addons/skin.confluence
 usr/bin/kodi-standalone
-usr/share/xsessions
+usr/share/applications
diff --git a/debian/kodi.manpages b/debian/kodi.manpages
index a6f9b73..f201e5e 100644
--- a/debian/kodi.manpages
+++ b/debian/kodi.manpages
@@ -1,3 +1,2 @@
-docs/manpages/kodi.bin.1
 docs/manpages/kodi.1
 docs/manpages/kodi-standalone.1

-- 
kodi packaging