Permalink
Browse files

Merge pull request #2 from rafal-krypa/for-master

Two dependency fixes
  • Loading branch information...
2 parents 5bc396a + a482804 commit 03e180117832f247d26f2b462ebbde45258f9914 @sitzm sitzm committed Nov 16, 2011
Showing with 9 additions and 2 deletions.
  1. +2 −0 debian/rules
  2. +7 −2 debian/var_info
View
@@ -147,3 +147,5 @@ override_dh_gencontrol:
-i "debian/xbmc-bin/DEBIAN/control"
sed "s/^Depends:.*$$/&, $$(sh debian/var_info LIBRTMP_DEPENDS)/" \
-i "debian/xbmc-bin/DEBIAN/control"
+ sed "s/^Depends:.*$$/&, $$(sh debian/var_info LIBCEC_DEPENDS)/" \
+ -i "debian/xbmc-bin/DEBIAN/control"
View
@@ -115,7 +115,7 @@ case "$1" in
printf "$BUILD_DEPENDS"
;;
LIBCURL_DEPENDS)
- LIBCURL_DEPENDS=$(cat /var/lib/dpkg/info/libcurl3-gnutls.shlibs | \
+ LIBCURL_DEPENDS=$(cat /var/lib/dpkg/info/libcurl3-gnutls*.shlibs | \
sed 's/^[^[:space:]]\+\?[[:space:]]\+\?[^[:space:]]\+\?[[:space:]]\+\?\(.*\)$/\1/')
printf "$LIBCURL_DEPENDS"
;;
@@ -162,10 +162,15 @@ case "$1" in
printf "$LIBVDPAU_DEPENDS"
;;
LIBRTMP_DEPENDS)
- LIBRTMP_DEPENDS=$(cat /var/lib/dpkg/info/librtmp0.shlibs | \
+ LIBRTMP_DEPENDS=$(cat /var/lib/dpkg/info/librtmp0*.shlibs | \
sed 's/^[^[:space:]]\+\?[[:space:]]\+\?[^[:space:]]\+\?[[:space:]]\+\?\(.*\)$/\1/')
printf "$LIBRTMP_DEPENDS"
;;
+ LIBCEC_DEPENDS)
+ LIBCEC_DEPENDS=$(cat /var/lib/dpkg/info/libcec*.shlibs | \
+ sed 's/^[^[:space:]]\+\?[[:space:]]\+\?[^[:space:]]\+\?[[:space:]]\+\?\(.*\)$/\1/')
+ printf "$LIBCEC_DEPENDS"
+ ;;
esac
exit 0

0 comments on commit 03e1801

Please sign in to comment.