* add libcurl3 explicitely for hardy

* add whois and mkpasswd on xbmc-live dependencies (Ticket #8691) .


git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@28022 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

3 files changed, 15 insertions, 7 deletions

diff --git a/tools/Linux/packaging/debian/control b/tools/Linux/packaging/debian/control
index d0c8fd9046..7c5c2c4d94 100644
--- a/tools/Linux/packaging/debian/control
+++ b/tools/Linux/packaging/debian/control
@@ -153,7 +153,7 @@ Description: XBMC Media Center (arch-independent data package)
  working XBMC.
 
 Package: xbmc-bin
-Architecture: i386 amd64 powerpc ppc64 lpia
+Architecture: i386 amd64 powerpc ppc64 
 Depends: libcurl3 (>= 7.16.2-1), ${shlibs:Depends},
          ${misc:Depends}
 Provides: xbmc-common
@@ -180,7 +180,7 @@ Description: XBMC Media Center (binary data package)
  This package contains all the binary data needed to have a working XBMC.
 
 Package: xbmc-dbg
-Architecture: i386 amd64 powerpc ppc64 lpia
+Architecture: i386 amd64 powerpc ppc64 
 Section: non-free/debug
 Priority: extra
 Depends: xbmc-bin (= ${binary:Version}),
@@ -354,7 +354,7 @@ Description: XBMC Media Center (Event Client Dev package)
  This is the Development package for XBMC Event Client.
 
 Package: xbmc-eventclients-wiiremote
-Architecture: i386 amd64 powerpc ppc64 lpia
+Architecture: i386 amd64 powerpc ppc64 
 Depends: xbmc-eventclients-common (= ${source:Version}),
          ${shlibs:Depends},
          ${misc:Depends}
diff --git a/tools/Linux/packaging/debian/control.in b/tools/Linux/packaging/debian/control.in
index 2c27510c9c..287ac9d05f 100644
--- a/tools/Linux/packaging/debian/control.in
+++ b/tools/Linux/packaging/debian/control.in
@@ -124,7 +124,7 @@ Description: XBMC Media Center (arch-independent data package)
  working XBMC.
 
 Package: xbmc-bin
-Architecture: i386 amd64 powerpc ppc64 lpia
+Architecture: i386 amd64 powerpc ppc64
 Depends: #LIBCURL_DEPENDS#, ${shlibs:Depends},
          ${misc:Depends}
 Provides: xbmc-common
@@ -151,7 +151,7 @@ Description: XBMC Media Center (binary data package)
  This package contains all the binary data needed to have a working XBMC.
 
 Package: xbmc-dbg
-Architecture: i386 amd64 powerpc ppc64 lpia
+Architecture: i386 amd64 powerpc ppc64
 Section: non-free/debug
 Priority: extra
 Depends: xbmc-bin (= ${binary:Version}),
@@ -325,7 +325,7 @@ Description: XBMC Media Center (Event Client Dev package)
  This is the Development package for XBMC Event Client.
 
 Package: xbmc-eventclients-wiiremote
-Architecture: i386 amd64 powerpc ppc64 lpia
+Architecture: i386 amd64 powerpc ppc64
 Depends: xbmc-eventclients-common (= ${source:Version}),
          ${shlibs:Depends},
          ${misc:Depends}
diff --git a/tools/Linux/packaging/debian/var_info b/tools/Linux/packaging/debian/var_info
index 20081685fd..e28d09b8fe 100644
--- a/tools/Linux/packaging/debian/var_info
+++ b/tools/Linux/packaging/debian/var_info
@@ -10,7 +10,7 @@ BUILD_DEPENDS="debhelper (>= 7.0.50), python-support, cmake,
  libmysqlclient-dev, libasound-dev, libpng12-dev | libpng-dev, libpcre3-dev,
  liblzo2-dev, libcdio-dev, libsdl-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev,
  libenca-dev, libjasper-dev, libxt-dev, libxtst-dev, libxmu-dev,
- libxinerama-dev, libcurl4-gnutls-dev | libcurl-dev, libdbus-1-dev,
+ libxinerama-dev, libcurl-dev | libcurl4-gnutls-dev, libdbus-1-dev,
  libhal-storage-dev, libhal-dev, libpulse-dev, libavahi-common-dev,
  libavahi-client-dev, libxrandr-dev, libavcodec-dev, libavformat-dev,
  libavutil-dev, libpostproc-dev, libswscale-dev, liba52-dev, libdts-dev,
@@ -32,6 +32,9 @@ case "$1" in
     LIBCURL_DEPENDS)
 	LIBCURL_DEPENDS=$(cat /var/lib/dpkg/info/libcurl3.shlibs | \
 	    sed 's/^[^[:space:]]\+\?[[:space:]]\+\?[^[:space:]]\+\?[[:space:]]\+\?\(.*\)$/\1/')
+	if [ $(lsb_release -cs) = "hardy" ]; then
+	    LIBCURL_DEPENDS="libcurl3"
+	fi
 	printf "$LIBCURL_DEPENDS"
 	;;
     XBMC_LIVE_DEPENDS)
@@ -42,12 +45,17 @@ case "$1" in
          python-apt,
          adduser,
          sudo,
+         whois,
          \${misc:Depends},"
         if [ $(lsb_release -cs) = "karmic" ]; then
             XBMC_LIVE_DEPENDS="$XBMC_LIVE_DEPENDS
          devicekit-disks,
          devicekit-power,"
         fi
+        if [ $(lsb_release -cs) = "lucid" ]; then
+            XBMC_LIVE_DEPENDS="$XBMC_LIVE_DEPENDS
+          mkpasswd,"
+        fi
         printf "$XBMC_LIVE_DEPENDS"
 esac