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

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

The following commit has been merged in the master branch:
commit 6db38041811241a0df89b280c6683c5d269a0734
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon Oct 12 01:45:34 2009 -0400

    Fix installation of web skins. Also fix symlinks for xbmc-data package.

diff --git a/debian/rules b/debian/rules
index 9401355..f8da56e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,22 +55,15 @@ override_dh_auto_install:
 override_dh_install:
 	dh_install --sourcedir=$(CURDIR)/debian/tmp -XLICENCE \
 		-XLiberationSans-Regular.ttf -XLicence.txt -XLicense.txt
-	# XBMC WEB EFLEXWEB
-	mkdir -p $(CURDIR)/debian/xbmc-web-eflexweb/usr/share/xbmc/web
-	unzip -oq $(CURDIR)/web/WebInterfaceXBMC-0.17.zip \
-		-d $(CURDIR)/debian/xbmc-web-eflexweb/usr/share/xbmc/web
 	# XBMC WEB PM
-	mkdir -p $(CURDIR)/debian/xbmc-web-pm/usr/share/xbmc/web
-	unzip -oq $(CURDIR)/web/Project_Mayhem_webserver_V1.1.2.zip \
-		-d $(CURDIR)/debian/xbmc-web-pm/usr/share/xbmc/web \
-		-x "*/Thumbs.db"
+	dh_install -pxbmc-web-pm ../../web/Project_Mayhem \
+		usr/share/xbmc/web
+	# XBMC WEB PM3
+	dh_install -pxbmc-web-pm3 ../../web/Project_Mayhem_III \
+		usr/share/xbmc/web
 	# XBMC WEB Iphone
-	mkdir -p $(CURDIR)/debian/xbmc-web-iphone-tlrobinson/usr/share/xbmc/web/iphone
-	unzip -oq $(CURDIR)/web/xbmciphone-0.1.zip \
-		-d $(CURDIR)/debian/xbmc-web-iphone-tlrobinson/usr/share/xbmc/web
-	mkdir -p $(CURDIR)/debian/xbmc-web-iphone-tlrobinson/usr/share/doc/xbmc-web-iphone-tlrobinson/ 
-	mv $(CURDIR)/debian/xbmc-web-iphone-tlrobinson/usr/share/xbmc/web/README \
-	    $(CURDIR)/debian/xbmc-web-iphone-tlrobinson/usr/share/doc/xbmc-web-iphone-tlrobinson/
+	dh_install -pxbmc-web-iphone-tlrobinson ../../web/xbmciphone/iphone \
+		usr/share/xbmc/web
 
 override_dh_link:
 	dh_link
@@ -78,7 +71,7 @@ override_dh_link:
 		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"; \
+		dh_link -pxbmc-data "$$LINK_TARGET" "$$LINK_DESTINATION"; \
 		done
 
 override_dh_strip:
@@ -88,3 +81,8 @@ override_dh_makeshlibs:
 	# We don't install shared libraries in standard locations so don't edit
 	# postinst/postrm scripts to call ldconfig
 	dh_makeshlibs -n
+
+override_dh_installdocs:
+	dh_installdocs
+	dh_installdocs -pxbmc-web-iphone-tlrobinson \
+		$(CURDIR)/web/xbmciphone/README

-- 
xbmc packaging