[SCM] xbmc-pvr-addons/master: Fix versioned xbmc dependency generation

rbalint at users.alioth.debian.org rbalint at users.alioth.debian.org
Fri May 23 19:13:27 UTC 2014


The following commit has been merged in the master branch:
commit 3607920e5ea6b02ce6baca0aada29c34be630a02
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Thu May 8 12:56:17 2014 +0200

    Fix versioned xbmc dependency generation

diff --git a/debian/rules b/debian/rules
index 081e8a5..d9fd304 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ export DH_OPTIONS
 
 CFLAGS +=-I/usr/include/libavcodec -I/usr/include/xbmc
 CPPFLAGS +=-I/usr/include/libavcodec -I/usr/include/xbmc
-XBMC_VERSION= $(shell dpkg-query -W -f='${Version}\n' xbmc-addons-dev)
+XBMC_VERSION = $(shell dpkg-query -W -f='$${Version}' xbmc-addons-dev)
 
 %:
 	dh $@ --parallel
@@ -35,12 +35,12 @@ override_dh_clean:
 override_dh_auto_configure:
 	rm lib/tinyxml/tiny*
 	rm -rf xbmc
-	echo "xbmc-addons-abi:Depends=xbmc (>= $(XBMC_VERSION))" > debian/substvars
 	./bootstrap
 	./configure --prefix=/usr --enable-addons-with-dependencies --enable-release
 
 override_dh_gencontrol:
 	sh /usr/share/vdr-dev/dependencies.sh
+	for i in $(CURDIR)/debian/*substvars ; do echo "xbmc-addons-abi:Depends=xbmc (>= $(XBMC_VERSION))" >> $$i; done
 	dh_gencontrol
 
 override_dh_shlibdeps:

-- 
xbmc-pvr-addons packaging



More information about the pkg-multimedia-commits mailing list