[SCM] xbmc packaging branch, master, updated. upstream/9.11.svn24886.deb1-57-gfa2cf59

ceros-guest at users.alioth.debian.org ceros-guest at users.alioth.debian.org
Wed Dec 9 18:36:36 UTC 2009


The following commit has been merged in the master branch:
commit e15970221b4b9675e5a0e66acdb31147aaef1278
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon Dec 7 09:18:23 2009 -0500

    Use libcurl3.shlibs files to generate dependency on libcurl3.

diff --git a/debian/control b/debian/control
index 3f64ef9..a281f69 100644
--- a/debian/control
+++ b/debian/control
@@ -149,7 +149,7 @@ Description: XBMC Media Center (arch-independent data package)
 
 Package: xbmc-bin
 Architecture: i386 amd64 powerpc ppc64
-Depends: libcurl3, ${shlibs:Depends},
+Depends: libcurl3 (>= 7.16.2-1), ${shlibs:Depends},
          ${misc:Depends}
 Description: XBMC Media Center (binary data package)
  XBMC, recursive acronym for "XBMC Media Center", is an award winning free and
diff --git a/debian/control.in b/debian/control.in
index 4068a75..bea8da8 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -133,7 +133,7 @@ Description: XBMC Media Center (arch-independent data package)
 
 Package: xbmc-bin
 Architecture: i386 amd64 powerpc ppc64
-Depends: libcurl3, ${shlibs:Depends},
+Depends: #LIBCURL_DEPENDS#, ${shlibs:Depends},
          ${misc:Depends}
 Description: XBMC Media Center (binary data package)
  XBMC, recursive acronym for "XBMC Media Center", is an award winning free and
diff --git a/debian/rules b/debian/rules
index 8d7dd20..8619bb4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,6 +48,7 @@ INPUT_FILES = debian/control.in \
 %.in: debian/var_info
 	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;' \
 	< $@ > $$(echo $@ | sed 's/\.in$$//')
 
 override_dh_clean:
diff --git a/debian/var_info b/debian/var_info
index 15dc59c..b66adee 100644
--- a/debian/var_info
+++ b/debian/var_info
@@ -28,6 +28,11 @@ case "$1" in
     BUILD_DEPENDS)
         printf "$BUILD_DEPENDS"
         ;;
+    LIBCURL_DEPENDS)
+	LIBCURL_DEPENDS=$(cat /var/lib/dpkg/info/libcurl3.shlibs | \
+	    sed 's/^[^[:space:]]\+\?[[:space:]]\+\?[^[:space:]]\+\?[[:space:]]\+\?\(.*\)$/\1/')
+	printf "$LIBCURL_DEPENDS"
+	;;
 esac
 
 exit 0

-- 
xbmc packaging



More information about the pkg-multimedia-commits mailing list