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

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

The following commit has been merged in the master branch:
commit cb9aae54129aaf0023a9b675b5e0d2bf57c0b873
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun Dec 6 16:51:39 2009 -0500

    Various fixes for debian/rules from upstream.
    Fix configure options between Ubuntu and Debian.
    Install python24.zip in xbmc-bin package.
    Test for existence of debian/xbmc-data/usr/share/xbmc when doing binary only
    builds.

diff --git a/debian/rules b/debian/rules
index 82cdb77..8d7dd20 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,14 +16,17 @@ endif
 # List of options to pass to configure. Can be overridden.
 XBMC_CONFIG_OPTIONS ?= --host=$(DEB_HOST_GNU_TYPE) \
 	--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
-	--enable-debug --enable-optimizations --enable-gl --enable-vdpau \
-	--disable-profiling --enable-joystick --enable-xrandr --enable-goom \
-	--disable-ccache --enable-pulse --disable-dvdcss --enable-avahi \
-	--disable-non-free --enable-external-libraries
+	--enable-optimizations --enable-gl --enable-vdpau \
+	--disable-profiling --enable-joystick --enable-xrandr \
+	--enable-goom --disable-ccache --enable-pulse --enable-avahi \
+	--enable-debug
 
 # Ubuntu or Debian specific options
 ifeq (Ubuntu,$(shell lsb_release -is))
   XBMC_CONFIG_OPTIONS += --enable-faac
+else
+  XBMC_CONFIG_OPTIONS += --enable-external-libraries --disable-dvdcss \
+	--disable-non-free
 endif
 
 # Add the SVN revision if we could determine the svn revision
@@ -60,7 +63,7 @@ override_dh_auto_install:
 	    $(CURDIR)/debian/tmp/etc/init/xbmc-live.conf
 	find "debian/tmp/usr/share/xbmc" -regextype posix-extended \
 		-type f -iregex \
-		".*\.so|.*\.vis|.*\.xbs|.*xbmc\.bin|.*xbmc-xrandr" | \
+		".*python24\.zip|.*\.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"; \
@@ -96,7 +99,7 @@ override_dh_link:
 		LINK_DESTINATION="$$(echo "$$FILE" | sed -e 's|debian/xbmc-bin/usr/lib|usr/share|')"; \
 		dh_link -pxbmc-bin "$$LINK_TARGET" "$$LINK_DESTINATION"; \
 		done
-	find debian/xbmc-data/usr/share/xbmc -type d -empty -delete
+	-[ -d debian/xbmc-data/usr/share/xbmc ] && find debian/xbmc-data/usr/share/xbmc/ -type d -empty -delete
 
 override_dh_strip:
 	dh_strip --dbg-package=xbmc-dbg

-- 
xbmc packaging