diff options
| author | ceros7 <ceros7@svn> | 2009-12-22 06:27:44 +0000 |
|---|---|---|
| committer | ceros7 <ceros7@svn> | 2009-12-22 06:27:44 +0000 |
| commit | 4bc2ba666239cb83f4563d70a077de493c91e0b4 (patch) | |
| tree | db1cc18cdb1dfb22f0ee74111cee2aabc1e4b717 /tools/Linux | |
| parent | ddd1eb1a5d3306784d4ab07504f5aa8eb3aae6fb (diff) | |
Have karmic xbmc-live packages also depend on devkit-disks and devkit-power.
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@25961 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'tools/Linux')
| -rw-r--r-- | tools/Linux/packaging/debian/control | 2 | ||||
| -rw-r--r-- | tools/Linux/packaging/debian/control.in | 9 | ||||
| -rwxr-xr-x | tools/Linux/packaging/debian/rules | 1 | ||||
| -rw-r--r-- | tools/Linux/packaging/debian/var_info | 15 |
4 files changed, 18 insertions, 9 deletions
diff --git a/tools/Linux/packaging/debian/control b/tools/Linux/packaging/debian/control index 077a61760f..6b0d4de9a2 100644 --- a/tools/Linux/packaging/debian/control +++ b/tools/Linux/packaging/debian/control @@ -64,7 +64,7 @@ Depends: xbmc-standalone (= ${binary:Version}), python-apt, adduser, sudo, - ${misc:Depends} + ${misc:Depends}, Conflicts: kdm, gdm, xdm, wdm Description: XBMC Media Center (XBMC Live package) XBMC, recursive acronym for "XBMC Media Center", is an award winning free and diff --git a/tools/Linux/packaging/debian/control.in b/tools/Linux/packaging/debian/control.in index f67d054ec5..76ffd1d8fd 100644 --- a/tools/Linux/packaging/debian/control.in +++ b/tools/Linux/packaging/debian/control.in @@ -41,14 +41,7 @@ Description: XBMC Media Center (full metapackage) Package: xbmc-live Architecture: all -Depends: xbmc-standalone (= ${binary:Version}), - policykit, - openssh-server, - ${python:Depends}, - python-apt, - adduser, - sudo, - ${misc:Depends} +Depends: #XBMC_LIVE_DEPENDS# Conflicts: kdm, gdm, xdm, wdm Description: XBMC Media Center (XBMC Live package) XBMC, recursive acronym for "XBMC Media Center", is an award winning free and diff --git a/tools/Linux/packaging/debian/rules b/tools/Linux/packaging/debian/rules index 8619bb4681..ded402e363 100755 --- a/tools/Linux/packaging/debian/rules +++ b/tools/Linux/packaging/debian/rules @@ -49,6 +49,7 @@ INPUT_FILES = debian/control.in \ perl -p \ -e 's{#BUILD_DEPENDS#}{qx(sh debian/var_info BUILD_DEPENDS)}ge;' \ -e 's{#LIBCURL_DEPENDS#}{qx(sh debian/var_info LIBCURL_DEPENDS)}ge;' \ + -e 's{#XBMC_LIVE_DEPENDS#}{qx(sh debian/var_info XBMC_LIVE_DEPENDS)}ge;' \ < $@ > $$(echo $@ | sed 's/\.in$$//') override_dh_clean: diff --git a/tools/Linux/packaging/debian/var_info b/tools/Linux/packaging/debian/var_info index b66adee12b..af385b3897 100644 --- a/tools/Linux/packaging/debian/var_info +++ b/tools/Linux/packaging/debian/var_info @@ -33,6 +33,21 @@ case "$1" in sed 's/^[^[:space:]]\+\?[[:space:]]\+\?[^[:space:]]\+\?[[:space:]]\+\?\(.*\)$/\1/') printf "$LIBCURL_DEPENDS" ;; + XBMC_LIVE_DEPENDS) + XBMC_LIVE_DEPENDS="xbmc-standalone (= \${binary:Version}), + policykit, + openssh-server, + \${python:Depends}, + python-apt, + adduser, + sudo, + \${misc:Depends}," + if [ $(lsb_release -cs) = "karmic" ]; then + XBMC_LIVE_DEPENDS="$XBMC_LIVE_DEPENDS + devkit-disks, + devkit-power," + fi + printf "$XBMC_LIVE_DEPENDS" esac exit 0 |