Merge branch 'fhs'

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@30134 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

5 files changed, 20 insertions, 36 deletions

diff --git a/tools/EventClients/Makefile b/tools/EventClients/Makefile
index ca4db7a886..38760d3970 100644
--- a/tools/EventClients/Makefile
+++ b/tools/EventClients/Makefile
@@ -20,10 +20,10 @@ install: Clients/WiiRemote/WiiRemote
 	cp -a Clients/PS3\ BD\ Remote/ps3_remote.py $(DESTDIR)$(bindir)/xbmc-ps3remote
 	#cp -a Clients/PS3\ Sixaxis\ Controller/ps3d.py $(DESTDIR)$(bindir)/xbmc-ps3d
 	cp -a Clients/XBMC\ Send/xbmc-send.py $(DESTDIR)$(bindir)/xbmc-send
-	mkdir -p $(DESTDIR)$(prefix)/lib/python2.5/site-packages/xbmc
-	echo 'ICON_PATH="$(datarootdir)/pixmaps/xbmc/"' > $(DESTDIR)$(prefix)/lib/python2.5/site-packages/xbmc/defs.py
-	cp -a lib/python/* $(DESTDIR)$(prefix)/lib/python2.5/site-packages/xbmc/
-	cp -a Clients/PS3\ BD\ Remote/ps3_remote.py $(DESTDIR)$(prefix)/lib/python2.5/site-packages/xbmc/
+	mkdir -p $(DESTDIR)$(libdir)/python2.5/site-packages/xbmc
+	echo 'ICON_PATH="$(datarootdir)/pixmaps/xbmc/"' > $(DESTDIR)$(libdir)/python2.5/site-packages/xbmc/defs.py
+	cp -a lib/python/* $(DESTDIR)$(libdir)/python2.5/site-packages/xbmc/
+	cp -a Clients/PS3\ BD\ Remote/ps3_remote.py $(DESTDIR)$(libdir)/python2.5/site-packages/xbmc/
 	mkdir -p $(DESTDIR)$(includedir)/xbmc
 	cp -a lib/c++/* $(DESTDIR)$(includedir)/xbmc/
 	mkdir -p $(DESTDIR)$(datarootdir)/pixmaps/xbmc
diff --git a/tools/Linux/packaging/debian/changelog b/tools/Linux/packaging/debian/changelog
index 28baf7655a..388947acf3 100644
--- a/tools/Linux/packaging/debian/changelog
+++ b/tools/Linux/packaging/debian/changelog
@@ -1,4 +1,4 @@
-xbmc (1:10.05~svn29978~deb1-1) unstable; urgency=low
+xbmc (1:10.05~svn29980+fhs~deb1-1) unstable; urgency=low
 
   * Package XBMC for Debian. (Closes: #469397)
     (LP: #307162)
@@ -56,6 +56,7 @@ xbmc (1:10.05~svn29978~deb1-1) unstable; urgency=low
     + Create a symlink to LiberationSans-Regular.ttf.
   * Add Suggests of mesa-utils and x11-utils for use of glxinfo and xdpyinfo.
   * Convert to source format 3.0 (quilt).
+  * Take advantage of FHS compliance support in XBMC.
   * Support parallel builds.
 
  -- Andres Mejia <mcitadel@gmail.com>  Sun, 09 May 2010 16:37:52 -0400
diff --git a/tools/Linux/packaging/debian/rules b/tools/Linux/packaging/debian/rules
index 17029df030..6b0a2cb661 100755
--- a/tools/Linux/packaging/debian/rules
+++ b/tools/Linux/packaging/debian/rules
@@ -67,6 +67,8 @@ INPUT_FILES = debian/control.in
 
 override_dh_clean:
 	dh_clean
+	find . -name config.status -o -name config.cache -o -name config.log \
+		-exec rm -f "{}" \;
 	debian/rules $(INPUT_FILES)
 
 override_dh_auto_configure: configure
@@ -78,14 +80,6 @@ override_dh_auto_install:
 	    $(CURDIR)/debian/tmp/etc/init/xbmc-live.conf
 	$(MAKE) eventclients DESTDIR=$(CURDIR)/debian/tmp \
 		WII_EXTRA_OPTS=-DCWIID_OLD
-	find "debian/tmp/usr/share/xbmc" -regextype posix-extended \
-		-type f -iregex \
-		".*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"; \
-		rm "$$FILE"; \
-		done
 
 override_dh_install:
 	dh_install --sourcedir=$(CURDIR)/debian/tmp -XLICENCE \
@@ -95,16 +89,6 @@ override_dh_install:
 	rm -rf debian/xbmc-data/usr/share/xbmc/addons/skin.*
 	rm -rf debian/xbmc-data/usr/share/xbmc/web
 
-override_dh_link:
-	dh_link
-	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
-	-[ -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
 
diff --git a/tools/Linux/packaging/debian/xbmc-get-orig-source b/tools/Linux/packaging/debian/xbmc-get-orig-source
index 8f7482e5c1..a4bf580d5c 100755
--- a/tools/Linux/packaging/debian/xbmc-get-orig-source
+++ b/tools/Linux/packaging/debian/xbmc-get-orig-source
@@ -6,9 +6,9 @@
 # Common variables used to ease maintenance of this script
 XBMC_TARBALL=""
 XBMC_TARBALL_CHECKSUM=""
-SVN_REVISION="29978"
-XBMC_VERSION="10.05~svn$SVN_REVISION~deb1"
-XBMC_SVN_URL="http://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk"
+SVN_REVISION="29980"
+XBMC_VERSION="10.05~svn$SVN_REVISION+fhs~deb1"
+XBMC_SVN_URL="http://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/fhs"
 
 USAGE="\n\
 This script is used to generate the orig tarball used in building\n\
@@ -42,9 +42,11 @@ make_current_tarball() {
     ./bootstrap
     cd ..
 
-    # Remove libdvdcss
-    echo "Removing libdvdcss"
+    # Remove non-free components
+    echo "Removing non-free components"
     rm -rf xbmc-$XBMC_VERSION/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss
+    rm -rf xbmc-$XBMC_VERSION/xbmc/xbmc/lib/UnrarXLib
+    rm -rf xbmc-$XBMC_VERSION/xbmc/xbmc/lib/libXBMS
 
     # Remove empty directories
     echo "Removing empty directories"
@@ -52,12 +54,14 @@ make_current_tarball() {
 
     # Remove temp files and other cruft from source tarball
     # The find command snippet here was taken from debhelper's dh_clean command
+    # with some modification to delete more unneeded files.
     echo "Removing temp files and other cruft from source tarball"
     find xbmc-$XBMC_VERSION \( \( -type f -a \
         \( -name '#*#' -o -name '.*~' -o -name '*~' -o -name DEADJOE \
         -o -name '*.orig' -o -name '*.rej' -o -name '*.bak' \
         -o -name '.*.orig' -o -name .*.rej -o -name '.SUMS' \
         -o -name TAGS -o \( -path '*/.deps/*' -a -name '*.P' \) \
+        -o -name config.status -o -name config.cache -o -name config.log \
         \) -exec rm -f "{}" \; \) -o \
         \( -type d -a -name autom4te.cache -prune -exec rm -rf "{}" \; \) \)
 
diff --git a/tools/Linux/xbmc.sh.in b/tools/Linux/xbmc.sh.in
index aa49bd48b0..2520ac659e 100644
--- a/tools/Linux/xbmc.sh.in
+++ b/tools/Linux/xbmc.sh.in
@@ -5,7 +5,7 @@ function single_stacktrace()
   find $1 -maxdepth $2 -name 'core*' -exec \
       echo "=====>  Core file: {}" 2> /dev/null >> $FILE \; -exec \
       echo "        ========================================= " 2> /dev/null >> $FILE \; -exec \
-      gdb @prefix@/share/xbmc/xbmc.bin --core={} --batch -ex "thread apply all bt" 2> /dev/null >> $FILE \; -exec \
+      gdb @prefix@/lib/xbmc/xbmc.bin --core={} --batch -ex "thread apply all bt" 2> /dev/null >> $FILE \; -exec \
       rm -f {} \;
 }
 
@@ -37,7 +37,7 @@ function print_crash_report()
   if [ $XBMC_HOME ]; then
     BASEDIR=$XBMC_HOME
   else
-    BASEDIR=@prefix@/share/xbmc/
+    BASEDIR=@prefix@/lib/xbmc/
   fi
   single_stacktrace $BASEDIR 5
   # find in user xbmc dir
@@ -62,11 +62,6 @@ function print_crash_report()
   echo "Crash report available at $PWD/$FILE"
 }
 
-# Set XBMC_HOME if xbmc.bin is a symlink
-if [ -L @prefix@/share/xbmc/xbmc.bin ]; then
-  export XBMC_HOME="@prefix@/share/xbmc"
-fi
-
 python @prefix@/share/xbmc/FEH.py "$@"
 if [ $? -ne 0 ]; then
   exit 0
@@ -76,7 +71,7 @@ ulimit -c unlimited
 while (( $LOOP ))
 do
   LOOP=0
-  @prefix@/share/xbmc/xbmc.bin "$@"
+  @prefix@/lib/xbmc/xbmc.bin "$@"
   RET=$?
   if (( $RET == 65 ))
   then # User requested to restart app