[cmake] fixes cpack dependency list generation

16 files changed, 54 insertions, 54 deletions

diff --git a/cmake/cpack/CPackConfigDEB.cmake b/cmake/cpack/CPackConfigDEB.cmake
index b7b4d8c048..084d83afe4 100644
--- a/cmake/cpack/CPackConfigDEB.cmake
+++ b/cmake/cpack/CPackConfigDEB.cmake
@@ -266,10 +266,10 @@ foreach(file ${DEBIAN_PACKAGES})
 
   if(DEB_PACKAGE_SHLIBDEPS)
     set(CPACK_DEBIAN_${COMPONENT}_PACKAGE_SHLIBDEPS ON)
-  else()
-    if(DEB_PACKAGE_DEPENDS)
-      set(CPACK_DEBIAN_${COMPONENT}_PACKAGE_DEPENDS "${DEB_PACKAGE_DEPENDS}")
-    endif()
+  endif()
+
+  if(DEB_PACKAGE_DEPENDS)
+    set(CPACK_DEBIAN_${COMPONENT}_PACKAGE_DEPENDS "${DEB_PACKAGE_DEPENDS}")
   endif()
 
   if(DEB_PACKAGE_RECOMMENDS)
diff --git a/cmake/cpack/deb/packages/kodi-addon-dev.txt.in b/cmake/cpack/deb/packages/kodi-addon-dev.txt.in
index aebae7e2e0..020815ca4a 100644
--- a/cmake/cpack/deb/packages/kodi-addon-dev.txt.in
+++ b/cmake/cpack/deb/packages/kodi-addon-dev.txt.in
@@ -1,8 +1,8 @@
 # kodi-addon-dev debian package metadata
 #
-# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to ignore PACKAGE_DEPENDS
-# content and use dpkg-shlibdeps to automatically generate the package dependency
-# list. Only useful for packages that contain binaries.
+# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to use dpkg-shlibdeps to
+# automatically generate the package dependency list and append its output to
+# PACKAGE_DEPENDS list. Only useful for packages that contain binaries.
 #
 # PACKAGE_ARCHITECTURE should be set to 'all' only if package contains
 # architecture agnostic data. CPack will set proper architecture (amd64/i386/etc)
diff --git a/cmake/cpack/deb/packages/kodi-audio-dev.txt.in b/cmake/cpack/deb/packages/kodi-audio-dev.txt.in
index f03a64d92d..b9d6ca3fc7 100644
--- a/cmake/cpack/deb/packages/kodi-audio-dev.txt.in
+++ b/cmake/cpack/deb/packages/kodi-audio-dev.txt.in
@@ -1,8 +1,8 @@
 # kodi-audio-dev debian package metadata
 #
-# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to ignore PACKAGE_DEPENDS
-# content and use dpkg-shlibdeps to automatically generate the package dependency
-# list. Only useful for packages that contain binaries.
+# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to use dpkg-shlibdeps to
+# automatically generate the package dependency list and append its output to
+# PACKAGE_DEPENDS list. Only useful for packages that contain binaries.
 #
 # PACKAGE_ARCHITECTURE should be set to 'all' only if package contains
 # architecture agnostic data. CPack will set proper architecture (amd64/i386/etc)
diff --git a/cmake/cpack/deb/packages/kodi-bin.txt.in b/cmake/cpack/deb/packages/kodi-bin.txt.in
index 8ee33d3b9a..2ece66fad1 100644
--- a/cmake/cpack/deb/packages/kodi-bin.txt.in
+++ b/cmake/cpack/deb/packages/kodi-bin.txt.in
@@ -1,8 +1,8 @@
 # kodi-bin debian package metadata
 #
-# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to ignore PACKAGE_DEPENDS
-# content and use dpkg-shlibdeps to automatically generate the package dependency
-# list. Only useful for packages that contain binaries.
+# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to use dpkg-shlibdeps to
+# automatically generate the package dependency list and append its output to
+# PACKAGE_DEPENDS list. Only useful for packages that contain binaries.
 #
 # PACKAGE_ARCHITECTURE should be set to 'all' only if package contains
 # architecture agnostic data. CPack will set proper architecture (amd64/i386/etc)
@@ -14,8 +14,8 @@ PACKAGE_NAME @APP_NAME_LC@-bin
 PACKAGE_ARCHITECTURE
 PACKAGE_SECTION video
 PACKAGE_PRIORITY optional
-PACKAGE_SHLIBDEPS
-PACKAGE_DEPENDS libasound2 (>= 1.0.27), libavahi-client3 (>= 0.6.16), libavahi-common3 (>= 0.6.16), libbluetooth3 (>= 4.91), libbz2-1.0, libc6 (>= 2.15), libcdio13 (>= 0.83), libcrossguid1, libdbus-1-3 (>= 1.9.14), libdrm2 (>= 2.4.16), libegl1-mesa (>= 7.8.1) | libegl1-x11, libexpat1 (>= 2.0.1), libfreetype6 (>= 2.2.1), libfribidi0 (>= 0.19.2), libgcc1 (>= 1:3.0), libgl1-mesa-glx | libgl1, libgnutls30 (>= 3.4.2), liblzma5 (>= 5.1.1alpha+20120614), liblzo2-2, libmicrohttpd10 (>= 0.9.20), libmysqlclient20 (>= 5.7.11), libpcre3, libpcrecpp0v5 (>= 7.7), libpulse0 (>= 0.99.4), libpython2.7 (>= 2.7), libsmbclient (>= 2:4.0.3+dfsg1), libsqlite3-0 (>= 3.6.11), libssh-4 (>= 0.6.1), libstdc++6 (>= 5.2), libtag1v5 (>= 1.9.1-2.4ubuntu1), libtinyxml2.6.2v5, libudev1 (>= 183), libva-x11-1 (>= 1.0.3), libva1 (>= 1.4.0), libx11-6, libxext6, libxml2 (>= 2.7.4), libxrandr2 (>= 2:1.2.99.3), libxslt1.1 (>= 1.1.25), libyajl2 (>= 2.0.4), zlib1g (>= 1:1.2.0.2)
+PACKAGE_SHLIBDEPS ON
+PACKAGE_DEPENDS 
 PACKAGE_RECOMMENDS
 PACKAGE_SUGGESTS
 PACKAGE_BREAKS xbmc-bin (<< 2:14.0~git20141019), xbmc-common
diff --git a/cmake/cpack/deb/packages/kodi-eventclients-common.txt.in b/cmake/cpack/deb/packages/kodi-eventclients-common.txt.in
index 6559842970..7e61d8c131 100644
--- a/cmake/cpack/deb/packages/kodi-eventclients-common.txt.in
+++ b/cmake/cpack/deb/packages/kodi-eventclients-common.txt.in
@@ -1,8 +1,8 @@
 # kodi-eventclients-common debian package metadata
 #
-# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to ignore PACKAGE_DEPENDS
-# content and use dpkg-shlibdeps to automatically generate the package dependency
-# list. Only useful for packages that contain binaries.
+# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to use dpkg-shlibdeps to
+# automatically generate the package dependency list and append its output to
+# PACKAGE_DEPENDS list. Only useful for packages that contain binaries.
 #
 # PACKAGE_ARCHITECTURE should be set to 'all' only if package contains
 # architecture agnostic data. CPack will set proper architecture (amd64/i386/etc)
diff --git a/cmake/cpack/deb/packages/kodi-eventclients-dev.txt.in b/cmake/cpack/deb/packages/kodi-eventclients-dev.txt.in
index 4b166b5d1a..1a6990404a 100644
--- a/cmake/cpack/deb/packages/kodi-eventclients-dev.txt.in
+++ b/cmake/cpack/deb/packages/kodi-eventclients-dev.txt.in
@@ -1,8 +1,8 @@
 # kodi-eventclients-dev debian package metadata
 #
-# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to ignore PACKAGE_DEPENDS
-# content and use dpkg-shlibdeps to automatically generate the package dependency
-# list. Only useful for packages that contain binaries.
+# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to use dpkg-shlibdeps to
+# automatically generate the package dependency list and append its output to
+# PACKAGE_DEPENDS list. Only useful for packages that contain binaries.
 #
 # PACKAGE_ARCHITECTURE should be set to 'all' only if package contains
 # architecture agnostic data. CPack will set proper architecture (amd64/i386/etc)
diff --git a/cmake/cpack/deb/packages/kodi-eventclients-ps3.txt.in b/cmake/cpack/deb/packages/kodi-eventclients-ps3.txt.in
index bd432a29ba..4456e0eb59 100644
--- a/cmake/cpack/deb/packages/kodi-eventclients-ps3.txt.in
+++ b/cmake/cpack/deb/packages/kodi-eventclients-ps3.txt.in
@@ -1,8 +1,8 @@
 # kodi-eventclients-ps3 debian package metadata
 #
-# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to ignore PACKAGE_DEPENDS
-# content and use dpkg-shlibdeps to automatically generate the package dependency
-# list. Only useful for packages that contain binaries.
+# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to use dpkg-shlibdeps to
+# automatically generate the package dependency list and append its output to
+# PACKAGE_DEPENDS list. Only useful for packages that contain binaries.
 #
 # PACKAGE_ARCHITECTURE should be set to 'all' only if package contains
 # architecture agnostic data. CPack will set proper architecture (amd64/i386/etc)
diff --git a/cmake/cpack/deb/packages/kodi-eventclients-wiiremote.txt.in b/cmake/cpack/deb/packages/kodi-eventclients-wiiremote.txt.in
index 5973784ac1..3dbfadfa07 100644
--- a/cmake/cpack/deb/packages/kodi-eventclients-wiiremote.txt.in
+++ b/cmake/cpack/deb/packages/kodi-eventclients-wiiremote.txt.in
@@ -1,8 +1,8 @@
 # kodi-eventclients-wiiremote debian package metadata
 #
-# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to ignore PACKAGE_DEPENDS
-# content and use dpkg-shlibdeps to automatically generate the package dependency
-# list. Only useful for packages that contain binaries.
+# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to use dpkg-shlibdeps to
+# automatically generate the package dependency list and append its output to
+# PACKAGE_DEPENDS list. Only useful for packages that contain binaries.
 #
 # PACKAGE_ARCHITECTURE should be set to 'all' only if package contains
 # architecture agnostic data. CPack will set proper architecture (amd64/i386/etc)
@@ -14,8 +14,8 @@ PACKAGE_NAME @APP_NAME_LC@-eventclients-wiiremote
 PACKAGE_ARCHITECTURE
 PACKAGE_SECTION video
 PACKAGE_PRIORITY optional
-PACKAGE_SHLIBDEPS
-PACKAGE_DEPENDS @APP_NAME_LC@-eventclients-common (= @CPACK_DEBIAN_PACKAGE_VERSION@), libbluetooth3 (>= 4.91), libc6 (>= 2.14), libcwiid1 (>= 0.6.00+svn184), libgcc1 (>= 1:3.0), libstdc++6 (>= 5.2)
+PACKAGE_SHLIBDEPS ON
+PACKAGE_DEPENDS @APP_NAME_LC@-eventclients-common (= @CPACK_DEBIAN_PACKAGE_VERSION@)
 PACKAGE_RECOMMENDS
 PACKAGE_SUGGESTS
 PACKAGE_BREAKS
diff --git a/cmake/cpack/deb/packages/kodi-eventclients-xbmc-send.txt.in b/cmake/cpack/deb/packages/kodi-eventclients-xbmc-send.txt.in
index 0062479dd4..36a54a2275 100644
--- a/cmake/cpack/deb/packages/kodi-eventclients-xbmc-send.txt.in
+++ b/cmake/cpack/deb/packages/kodi-eventclients-xbmc-send.txt.in
@@ -1,8 +1,8 @@
 # kodi-eventclients-xbmc-send debian package metadata
 #
-# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to ignore PACKAGE_DEPENDS
-# content and use dpkg-shlibdeps to automatically generate the package dependency
-# list. Only useful for packages that contain binaries.
+# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to use dpkg-shlibdeps to
+# automatically generate the package dependency list and append its output to
+# PACKAGE_DEPENDS list. Only useful for packages that contain binaries.
 #
 # PACKAGE_ARCHITECTURE should be set to 'all' only if package contains
 # architecture agnostic data. CPack will set proper architecture (amd64/i386/etc)
diff --git a/cmake/cpack/deb/packages/kodi-inputstream-dev.txt.in b/cmake/cpack/deb/packages/kodi-inputstream-dev.txt.in
index 3b4c381ab7..830a449337 100644
--- a/cmake/cpack/deb/packages/kodi-inputstream-dev.txt.in
+++ b/cmake/cpack/deb/packages/kodi-inputstream-dev.txt.in
@@ -1,8 +1,8 @@
 # kodi-inputstream-dev debian package metadata
 #
-# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to ignore PACKAGE_DEPENDS
-# content and use dpkg-shlibdeps to automatically generate the package dependency
-# list. Only useful for packages that contain binaries.
+# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to use dpkg-shlibdeps to
+# automatically generate the package dependency list and append its output to
+# PACKAGE_DEPENDS list. Only useful for packages that contain binaries.
 #
 # PACKAGE_ARCHITECTURE should be set to 'all' only if package contains
 # architecture agnostic data. CPack will set proper architecture (amd64/i386/etc)
diff --git a/cmake/cpack/deb/packages/kodi-peripheral-dev.txt.in b/cmake/cpack/deb/packages/kodi-peripheral-dev.txt.in
index 1c41c5f5d2..0c8c0c0943 100644
--- a/cmake/cpack/deb/packages/kodi-peripheral-dev.txt.in
+++ b/cmake/cpack/deb/packages/kodi-peripheral-dev.txt.in
@@ -1,8 +1,8 @@
 # kodi-peripheral-dev debian package metadata
 #
-# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to ignore PACKAGE_DEPENDS
-# content and use dpkg-shlibdeps to automatically generate the package dependency
-# list. Only useful for packages that contain binaries.
+# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to use dpkg-shlibdeps to
+# automatically generate the package dependency list and append its output to
+# PACKAGE_DEPENDS list. Only useful for packages that contain binaries.
 #
 # PACKAGE_ARCHITECTURE should be set to 'all' only if package contains
 # architecture agnostic data. CPack will set proper architecture (amd64/i386/etc)
diff --git a/cmake/cpack/deb/packages/kodi-pvr-dev.txt.in b/cmake/cpack/deb/packages/kodi-pvr-dev.txt.in
index 90e4a1400a..7c8045c2d0 100644
--- a/cmake/cpack/deb/packages/kodi-pvr-dev.txt.in
+++ b/cmake/cpack/deb/packages/kodi-pvr-dev.txt.in
@@ -1,8 +1,8 @@
 # kodi-pvr-dev debian package metadata
 #
-# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to ignore PACKAGE_DEPENDS
-# content and use dpkg-shlibdeps to automatically generate the package dependency
-# list. Only useful for packages that contain binaries.
+# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to use dpkg-shlibdeps to
+# automatically generate the package dependency list and append its output to
+# PACKAGE_DEPENDS list. Only useful for packages that contain binaries.
 #
 # PACKAGE_ARCHITECTURE should be set to 'all' only if package contains
 # architecture agnostic data. CPack will set proper architecture (amd64/i386/etc)
diff --git a/cmake/cpack/deb/packages/kodi-screensaver-dev.txt.in b/cmake/cpack/deb/packages/kodi-screensaver-dev.txt.in
index 877c3ab290..2f26e0ab69 100644
--- a/cmake/cpack/deb/packages/kodi-screensaver-dev.txt.in
+++ b/cmake/cpack/deb/packages/kodi-screensaver-dev.txt.in
@@ -1,8 +1,8 @@
 # kodi-screensaver-dev debian package metadata
 #
-# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to ignore PACKAGE_DEPENDS
-# content and use dpkg-shlibdeps to automatically generate the package dependency
-# list. Only useful for packages that contain binaries.
+# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to use dpkg-shlibdeps to
+# automatically generate the package dependency list and append its output to
+# PACKAGE_DEPENDS list. Only useful for packages that contain binaries.
 #
 # PACKAGE_ARCHITECTURE should be set to 'all' only if package contains
 # architecture agnostic data. CPack will set proper architecture (amd64/i386/etc)
diff --git a/cmake/cpack/deb/packages/kodi-tools-texturepacker.txt.in b/cmake/cpack/deb/packages/kodi-tools-texturepacker.txt.in
index c5c5f8d296..36e8297121 100644
--- a/cmake/cpack/deb/packages/kodi-tools-texturepacker.txt.in
+++ b/cmake/cpack/deb/packages/kodi-tools-texturepacker.txt.in
@@ -1,8 +1,8 @@
 # kodi-tools-texturepacker debian package metadata
 #
-# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to ignore PACKAGE_DEPENDS
-# content and use dpkg-shlibdeps to automatically generate the package dependency
-# list. Only useful for packages that contain binaries.
+# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to use dpkg-shlibdeps to
+# automatically generate the package dependency list and append its output to
+# PACKAGE_DEPENDS list. Only useful for packages that contain binaries.
 #
 # PACKAGE_ARCHITECTURE should be set to 'all' only if package contains
 # architecture agnostic data. CPack will set proper architecture (amd64/i386/etc)
@@ -14,7 +14,7 @@ PACKAGE_NAME @APP_NAME_LC@-tools-texturepacker
 PACKAGE_ARCHITECTURE
 PACKAGE_SECTION video
 PACKAGE_PRIORITY optional
-PACKAGE_SHLIBDEPS
+PACKAGE_SHLIBDEPS ON
 PACKAGE_DEPENDS 
 PACKAGE_RECOMMENDS
 PACKAGE_SUGGESTS
diff --git a/cmake/cpack/deb/packages/kodi-visualization-dev.txt.in b/cmake/cpack/deb/packages/kodi-visualization-dev.txt.in
index ecc543613f..3d46f5896d 100644
--- a/cmake/cpack/deb/packages/kodi-visualization-dev.txt.in
+++ b/cmake/cpack/deb/packages/kodi-visualization-dev.txt.in
@@ -1,8 +1,8 @@
 # kodi-visualization-dev debian package metadata
 #
-# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to ignore PACKAGE_DEPENDS
-# content and use dpkg-shlibdeps to automatically generate the package dependency
-# list. Only useful for packages that contain binaries.
+# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to use dpkg-shlibdeps to
+# automatically generate the package dependency list and append its output to
+# PACKAGE_DEPENDS list. Only useful for packages that contain binaries.
 #
 # PACKAGE_ARCHITECTURE should be set to 'all' only if package contains
 # architecture agnostic data. CPack will set proper architecture (amd64/i386/etc)
diff --git a/cmake/cpack/deb/packages/kodi.txt.in b/cmake/cpack/deb/packages/kodi.txt.in
index 4ca417b700..6f9fd01f79 100644
--- a/cmake/cpack/deb/packages/kodi.txt.in
+++ b/cmake/cpack/deb/packages/kodi.txt.in
@@ -1,8 +1,8 @@
 # kodi debian package metadata
 #
-# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to ignore PACKAGE_DEPENDS
-# content and use dpkg-shlibdeps to automatically generate the package dependency
-# list. Only useful for packages that contain binaries.
+# Setting PACKAGE_SHLIBDEPS to 'ON' will cause CPack to use dpkg-shlibdeps to
+# automatically generate the package dependency list and append its output to
+# PACKAGE_DEPENDS list. Only useful for packages that contain binaries.
 #
 # PACKAGE_ARCHITECTURE should be set to 'all' only if package contains
 # architecture agnostic data. CPack will set proper architecture (amd64/i386/etc)