[SCM] xbmc packaging branch, master, updated. upstream/9.04.1+svn22158.deb1-2-g47e1408

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 47e14081143e7a8fe3f68c206947e82142c96cb1
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun Aug 30 16:35:40 2009 -0400

    Fix failure when doing binary-arch only builds.

diff --git a/debian/rules b/debian/rules
index 49b00d2..1679464 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,6 +47,11 @@ override_dh_auto_install:
 override_dh_install:
 	dh_install --sourcedir=$(CURDIR)/debian/tmp -XLICENCE \
 		-XLiberationSans-Regular.ttf -XLicence.txt -XLicense.txt
+	find "debian/tmp/usr/share/xbmc" -regextype posix-extended \
+		-type f -iregex ".*\.so|.*\.vis|.*\.xbs" | while read FILE; do \
+		NEW_LOCATION="$$(echo $$FILE | sed -e 's|/tmp/usr/share|/xbmc-bin/usr/lib|')"; \
+		install -D "$$FILE" "$$NEW_LOCATION"; \
+		done
 	# XBMC WEB EFLEXWEB
 	mkdir -p $(CURDIR)/debian/xbmc-web-eflexweb/usr/share/xbmc/web
 	unzip -oq $(CURDIR)/web/WebInterfaceXBMC-0.17.zip \
@@ -66,20 +71,11 @@ override_dh_install:
 
 override_dh_link:
 	dh_link
-	install -D "debian/xbmc-data/usr/share/xbmc/xbmc.bin" \
-		"debian/xbmc-bin/usr/lib/xbmc/xbmc.bin"
-	dh_link -pxbmc-data "usr/lib/xbmc/xbmc.bin" \
-		"usr/share/xbmc/xbmc.bin"
-	install -D "debian/xbmc-data/usr/share/xbmc/xbmc-xrandr" \
-		"debian/xbmc-bin/usr/lib/xbmc/xbmc-xrandr"
-	dh_link -pxbmc-data "usr/lib/xbmc/xbmc-xrandr" \
-		"usr/share/xbmc/xbmc-xrandr"
-	find "debian/xbmc-data/usr/share/xbmc" -regextype posix-extended \
+	find "debian/tmp/usr/share/xbmc" -regextype posix-extended \
 		-type f -iregex ".*\.so|.*\.vis|.*\.xbs" | while read FILE; do \
-		NEW_LOCATION="$$(echo $$FILE | sed -e 's|/xbmc-data/usr/share|/xbmc-bin/usr/lib|')"; \
+		NEW_LOCATION="$$(echo $$FILE | sed -e 's|/tmp/usr/share|/xbmc-bin/usr/lib|')"; \
 		LINK_TARGET="$$(echo "$$NEW_LOCATION" | sed -e 's|debian/xbmc-bin/||')"; \
-		LINK_DESTINATION="$$(echo "$$FILE" | sed -e 's|debian/xbmc-data/||')"; \
-		install -D "$$FILE" "$$NEW_LOCATION"; \
+		LINK_DESTINATION="$$(echo "$$FILE" | sed -e 's|debian/tmp/||')"; \
 		dh_link -pxbmc-data "$$LINK_TARGET" "$$LINK_DESTINATION"; \
 		done
 
diff --git a/debian/xbmc-bin.install b/debian/xbmc-bin.install
new file mode 100644
index 0000000..bf4fb68
--- /dev/null
+++ b/debian/xbmc-bin.install
@@ -0,0 +1,2 @@
+usr/share/xbmc/xbmc.bin usr/lib/xbmc/
+usr/share/xbmc/xbmc-xrandr usr/lib/xbmc/
diff --git a/debian/xbmc-data.links b/debian/xbmc-data.links
new file mode 100644
index 0000000..7679397
--- /dev/null
+++ b/debian/xbmc-data.links
@@ -0,0 +1,2 @@
+usr/lib/xbmc/xbmc.bin        usr/share/xbmc/xbmc.bin
+usr/lib/xbmc/xbmc-xrandr     usr/share/xbmc/xbmc-xrandr

-- 
xbmc packaging