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

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

The following commit has been merged in the master branch:
commit 377b963340a6ddd05055b3778e72d4f42fb0f62c
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon Sep 7 11:49:31 2009 -0400

    Reimplement the way the binary data is placed in packages. Also place symlinks
    in the xbmc-bin package instead of xbmc-data package.

diff --git a/debian/rules b/debian/rules
index 1679464..9401355 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,6 +35,14 @@ override_dh_auto_configure: patch
 
 override_dh_auto_install:
 	$(MAKE) install install-livedatas prefix=$(CURDIR)/debian/tmp/usr
+	find "debian/tmp/usr/share/xbmc" -regextype posix-extended \
+		-type f -iregex \
+		".*\.so|.*\.vis|.*\.xbs|.*xbmc\.bin|.*xbmc-xrandr" | \
+		while read FILE; do \
+		NEW_LOCATION="$$(echo $$FILE | sed -e 's|usr/share|usr/lib|')"; \
+		install -D "$$FILE" "$$NEW_LOCATION"; \
+		rm "$$FILE"; \
+		done
 	$(MAKE) eventclients prefix=$(CURDIR)/debian/tmp/usr \
 		installdir=/usr WII_EXTRA_OPTS=-DCWIID_OLD
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/applications \
@@ -47,11 +55,6 @@ 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 \
@@ -71,12 +74,11 @@ override_dh_install:
 
 override_dh_link:
 	dh_link
-	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|')"; \
-		LINK_TARGET="$$(echo "$$NEW_LOCATION" | sed -e 's|debian/xbmc-bin/||')"; \
-		LINK_DESTINATION="$$(echo "$$FILE" | sed -e 's|debian/tmp/||')"; \
-		dh_link -pxbmc-data "$$LINK_TARGET" "$$LINK_DESTINATION"; \
+	find "debian/xbmc-bin/usr/lib" -regextype posix-extended -type f | \
+		while read FILE; do \
+		LINK_TARGET="$$(echo "$$FILE" | sed -e 's|debian/xbmc-bin/||')"; \
+		LINK_DESTINATION="$$(echo "$$FILE" | sed -e 's|debian/xbmc-bin/usr/lib|usr/share|')"; \
+		dh_link -pxbmc-bin "$$LINK_TARGET" "$$LINK_DESTINATION"; \
 		done
 
 override_dh_strip:
diff --git a/debian/xbmc-bin.install b/debian/xbmc-bin.install
index bf4fb68..cddb90a 100644
--- a/debian/xbmc-bin.install
+++ b/debian/xbmc-bin.install
@@ -1,2 +1 @@
-usr/share/xbmc/xbmc.bin usr/lib/xbmc/
-usr/share/xbmc/xbmc-xrandr usr/lib/xbmc/
+usr/lib/xbmc
diff --git a/debian/xbmc-data.install b/debian/xbmc-data.install
index 7265523..5638aba 100644
--- a/debian/xbmc-data.install
+++ b/debian/xbmc-data.install
@@ -9,5 +9,3 @@ usr/share/xbmc/system
 usr/share/pixmaps/xbmc.png
 usr/share/applications
 usr/share/xbmc/FEH.py
-usr/share/xbmc/xbmc.bin
-usr/share/xbmc/xbmc-xrandr
diff --git a/debian/xbmc-data.links b/debian/xbmc-data.links
deleted file mode 100644
index 7679397..0000000
--- a/debian/xbmc-data.links
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/xbmc/xbmc.bin        usr/share/xbmc/xbmc.bin
-usr/lib/xbmc/xbmc-xrandr     usr/share/xbmc/xbmc-xrandr

-- 
xbmc packaging