Various improvements to the Debian packaging brought from fhs branch.

Update package to build newer snapshot of XBMC.
Update script to generate tarball with empty directories and cruft removed.
Update package to use new DESTDIR support.
Update README.* files and changelog.
Set xbmc to go to Debian main (and thus Ubuntu universe).
Default to libcurl4-openssl-dev instead of libcurl4-gnutls-dev.
Bump Standards-Version to 3.8.4.
Detect proper libcurl dependency at final stage of build.
Depend on ttf-dejavu-core for xbmc-skin-confluence and add proper symlinks to
fonts.
Set variable to detect if release builds should be made.
Update configure options used.
Support parallel builds.
Update package to install skins from new addons location.
In debian/var_info, ensure real packages are listed first, then virtual
packages, in alternative dependencies.
Minor cosmetic changes.

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

13 files changed, 95 insertions, 88 deletions

diff --git a/tools/Linux/packaging/debian/README.Debian b/tools/Linux/packaging/debian/README.Debian
index 9b390d62e7..01449e3008 100644
--- a/tools/Linux/packaging/debian/README.Debian
+++ b/tools/Linux/packaging/debian/README.Debian
@@ -6,6 +6,3 @@ build on i386, amd64, powerpc, and powerpc64 on Linux, and i386 and powerpc on
 Darwin. If you are able to build and run XBMC on other architectures and/or
 kernels, please provide patches of configure.in and any other files you may have
 modified to the Debian BTS.
-
-There is ongoing work to get XBMC to run on ARM. Please take a look at
-http://xbmc.svn.sourceforge.net/viewvc/xbmc/branches/xbmc_on_arm/.
diff --git a/tools/Linux/packaging/debian/README.source b/tools/Linux/packaging/debian/README.source
index f67c0d6d95..1405736efe 100644
--- a/tools/Linux/packaging/debian/README.source
+++ b/tools/Linux/packaging/debian/README.source
@@ -7,6 +7,4 @@ the orig tarball used in creating XBMC packages for Debian.
 
 Also, the upstream source version is appended with '~debN' where 'N' is some
 integer. This is done to mark that the XBMC source in Debian is modified from
-upstream. Note that we do not use '~dfsgN' or something similar since there
-is currently code in XBMC that does not meet the guidelines of the open source
-definition.
+upstream.
diff --git a/tools/Linux/packaging/debian/changelog b/tools/Linux/packaging/debian/changelog
index e27ddcb1ca..16744b9e93 100644
--- a/tools/Linux/packaging/debian/changelog
+++ b/tools/Linux/packaging/debian/changelog
@@ -1,8 +1,8 @@
-xbmc (1:9.11~svn25756.rc1~deb1-1) experimental; urgency=low
+xbmc (1:10.05~svn29959+fhs~deb1-1) unstable; urgency=low
 
   * Package XBMC for Debian. (Closes: #469397)
     (LP: #307162)
-  * Start using an epoch for use better package versioning.
+  * Start using an epoch for use of better package versioning.
   * Add Debian Multimedia team to Maintainers field.
   * Add Ouattara and myself to Uploaders field.
   * Add DM-Upload-Allowed: yes field.
@@ -10,7 +10,7 @@ xbmc (1:9.11~svn25756.rc1~deb1-1) experimental; urgency=low
   * Switch to quilt.
   * Remove unused patches.
   * Completely rewrite debian/rules to take advantage of debhelper 7 and quilt.
-  * Bump to Standards-Version 3.8.3.
+  * Bump to Standards-Version 3.8.4.
   * Changed Architecture field for arch-indep packages to 'all'.
   * Included powerpc and ppc64 for binary packages.
   * Use ${shlibs:Depends} for all binary packages.
@@ -32,7 +32,6 @@ xbmc (1:9.11~svn25756.rc1~deb1-1) experimental; urgency=low
   * Split xmbc-common into xbmc-bin for binary data and xbmc-data for
     arch-independent data. This is done to save space in the Debian archive.
   * Add Provides, Replaces, and Conflicts field in xbmc-data for xbmc-common.
-  * Placing packages into non-free because of various non-DFSG licensed code
   * being used in XBMC.
   * Add patch to change Provides field in init script to reflect script name
     for xbmc-live.
@@ -57,8 +56,9 @@ xbmc (1:9.11~svn25756.rc1~deb1-1) experimental; 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).
+  * Support parallel builds.
 
- -- Andres Mejia <mcitadel@gmail.com>  Tue, 15 Dec 2009 19:23:53 -0500
+ -- Andres Mejia <mcitadel@gmail.com>  Sun, 09 May 2010 16:37:52 -0400
 
 xbmc (9.04.1.0.20670-jaunty1) jaunty; urgency=low
 
diff --git a/tools/Linux/packaging/debian/control b/tools/Linux/packaging/debian/control
index 7c5c2c4d94..c28b5a32e2 100644
--- a/tools/Linux/packaging/debian/control
+++ b/tools/Linux/packaging/debian/control
@@ -1,5 +1,5 @@
 Source: xbmc
-Section: non-free/video
+Section: video
 Priority: optional
 Maintainer: Andres Mejia <mcitadel@gmail.com>
 Uploaders: Ouattara Oumar Aziz (alias wattazoum) <wattazoum@gmail.com>
@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 7.0.50), python-support, cmake,
  libmysqlclient-dev, libasound-dev, libpng12-dev | libpng-dev, libpcre3-dev,
  liblzo2-dev, libcdio-dev, libsdl-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev,
  libenca-dev, libjasper-dev, libxt-dev, libxtst-dev, libxmu-dev,
- libxinerama-dev, libcurl4-gnutls-dev | libcurl-dev, libdbus-1-dev,
+ libxinerama-dev, libcurl4-openssl-dev | libcurl-dev, libdbus-1-dev,
  libhal-storage-dev, libhal-dev, libpulse-dev, libavahi-common-dev,
  libavahi-client-dev, libxrandr-dev, libavcodec-dev, libavformat-dev,
  libavutil-dev, libpostproc-dev, libswscale-dev, liba52-dev, libdts-dev,
@@ -21,8 +21,8 @@ Build-Depends: debhelper (>= 7.0.50), python-support, cmake,
  zlib1g-dev, libmms-dev, libsmbclient-dev, libfaad-dev, libiso9660-dev,
  libssl-dev, lsb-release, libvdpau-dev | nvidia-190-libvdpau-dev |
  nvidia-185-libvdpau-dev | nvidia-180-libvdpau-dev, libmicrohttpd-dev,
- libmodplug-dev
-Standards-Version: 3.8.3
+ libmodplug-dev,
+Standards-Version: 3.8.4
 Homepage: http://xbmc.org/
 Vcs-Git: git://git.debian.org/git/collab-maint/xbmc.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/xbmc.git;a=summary
@@ -64,8 +64,8 @@ Depends: xbmc-standalone (= ${binary:Version}),
          ${python:Depends},
          python-apt,
          adduser,
-         whois,
          sudo,
+         whois,
          ${misc:Depends},
 Conflicts: kdm, gdm, xdm, wdm
 Description: XBMC Media Center (XBMC Live package)
@@ -94,10 +94,6 @@ Depends: xbmc-data (= ${binary:Version}),
          xbmc-skin-confluence (= ${binary:Version}) |
          xbmc-skin-pm3-hd (= ${binary:Version}),
          xbmc-web (= ${binary:Version}),
-         x11-common, 
-         xserver-xorg-core,
-         x11-xserver-utils,
-         xinit,
          ${misc:Depends}
 Suggests: xbmc-third-parties
 Description: XBMC Media Center (standalone program)
@@ -153,8 +149,8 @@ Description: XBMC Media Center (arch-independent data package)
  working XBMC.
 
 Package: xbmc-bin
-Architecture: i386 amd64 powerpc ppc64 
-Depends: libcurl3 (>= 7.16.2-1), ${shlibs:Depends},
+Architecture: i386 amd64 powerpc ppc64
+Depends: ${shlibs:Depends},
          ${misc:Depends}
 Provides: xbmc-common
 Replaces: xbmc-common
@@ -180,8 +176,8 @@ Description: XBMC Media Center (binary data package)
  This package contains all the binary data needed to have a working XBMC.
 
 Package: xbmc-dbg
-Architecture: i386 amd64 powerpc ppc64 
-Section: non-free/debug
+Architecture: i386 amd64 powerpc ppc64
+Section: debug
 Priority: extra
 Depends: xbmc-bin (= ${binary:Version}),
          ${misc:Depends}
@@ -233,6 +229,7 @@ Package: xbmc-skin-confluence
 Architecture: all
 Depends: xbmc-data (= ${binary:Version}),
          ttf-liberation,
+         ttf-dejavu-core,
          ${misc:Depends}
 Description: XBMC Media Center (Confluence skin)
  XBMC, recursive acronym for "XBMC Media Center", is an award winning free and
@@ -330,7 +327,7 @@ Description: XBMC Media Center (Event Client Common package)
 
 Package: xbmc-eventclients-dev
 Architecture: all
-Section: non-free/libdevel
+Section: libdevel
 Depends: xbmc-eventclients-common (= ${binary:Version}),
          ${misc:Depends}
 Description: XBMC Media Center (Event Client Dev package)
@@ -354,7 +351,7 @@ Description: XBMC Media Center (Event Client Dev package)
  This is the Development package for XBMC Event Client.
 
 Package: xbmc-eventclients-wiiremote
-Architecture: i386 amd64 powerpc ppc64 
+Architecture: i386 amd64 powerpc ppc64
 Depends: xbmc-eventclients-common (= ${source:Version}),
          ${shlibs:Depends},
          ${misc:Depends}
diff --git a/tools/Linux/packaging/debian/control.in b/tools/Linux/packaging/debian/control.in
index 287ac9d05f..6c84893746 100644
--- a/tools/Linux/packaging/debian/control.in
+++ b/tools/Linux/packaging/debian/control.in
@@ -1,11 +1,11 @@
 Source: xbmc
-Section: non-free/video
+Section: video
 Priority: optional
 Maintainer: Andres Mejia <mcitadel@gmail.com>
 Uploaders: Ouattara Oumar Aziz (alias wattazoum) <wattazoum@gmail.com>
 DM-Upload-Allowed: yes
 Build-Depends: #BUILD_DEPENDS#
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://xbmc.org/
 Vcs-Git: git://git.debian.org/git/collab-maint/xbmc.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/xbmc.git;a=summary
@@ -125,7 +125,7 @@ Description: XBMC Media Center (arch-independent data package)
 
 Package: xbmc-bin
 Architecture: i386 amd64 powerpc ppc64
-Depends: #LIBCURL_DEPENDS#, ${shlibs:Depends},
+Depends: ${shlibs:Depends},
          ${misc:Depends}
 Provides: xbmc-common
 Replaces: xbmc-common
@@ -152,7 +152,7 @@ Description: XBMC Media Center (binary data package)
 
 Package: xbmc-dbg
 Architecture: i386 amd64 powerpc ppc64
-Section: non-free/debug
+Section: debug
 Priority: extra
 Depends: xbmc-bin (= ${binary:Version}),
          ${misc:Depends}
@@ -204,6 +204,7 @@ Package: xbmc-skin-confluence
 Architecture: all
 Depends: xbmc-data (= ${binary:Version}),
          ttf-liberation,
+         ttf-dejavu-core,
          ${misc:Depends}
 Description: XBMC Media Center (Confluence skin)
  XBMC, recursive acronym for "XBMC Media Center", is an award winning free and
@@ -301,7 +302,7 @@ Description: XBMC Media Center (Event Client Common package)
 
 Package: xbmc-eventclients-dev
 Architecture: all
-Section: non-free/libdevel
+Section: libdevel
 Depends: xbmc-eventclients-common (= ${binary:Version}),
          ${misc:Depends}
 Description: XBMC Media Center (Event Client Dev package)
diff --git a/tools/Linux/packaging/debian/rules b/tools/Linux/packaging/debian/rules
index 8d3d06066c..53705de961 100755
--- a/tools/Linux/packaging/debian/rules
+++ b/tools/Linux/packaging/debian/rules
@@ -8,6 +8,10 @@ DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 # Get the SVN revision from the changelog
 SVNVERSION ?= $(shell dpkg-parsechangelog | grep '^Version:' | grep svn | sed 's/.*svn\([[:digit:]]*\).*/\1/')
 
+# Set this variable to yes for release builds to disable debugging and enable
+# optimizations.
+XBMC_RELEASE ?= no
+
 # If not set already, try to set from debian/svnrevision
 ifeq (,$(SVNVERSION))
 	SVNVERSION = $(shell cat debian/svnrevision 2>/dev/null)
@@ -15,18 +19,26 @@ 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-optimizations --enable-gl --enable-vdpau \
-	--disable-profiling --enable-joystick --enable-xrandr \
-	--enable-goom --disable-ccache --enable-pulse --enable-avahi \
-	--enable-debug
+  --build=$(DEB_BUILD_GNU_TYPE) \
+  --prefix=/usr --docdir=/usr/share/doc/xbmc \
+  --enable-gl --enable-vdpau --disable-vaapi --disable-vdadecoder \
+  --disable-profiling --enable-joystick --enable-xrandr --disable-ccache \
+  --enable-pulse --disable-mid --enable-avahi --disable-asap-codec \
+  --enable-webserver --disable-libdts --disable-liba52
+
+# Whether we're building for release or not
+ifeq (yes,$(XBMC_RELEASE))
+  XBMC_CONFIG_OPTIONS += --disable-debug --enable-optimizations
+else
+  XBMC_CONFIG_OPTIONS += --enable-debug --disable-optimizations
+endif
 
 # Ubuntu or Debian specific options
 ifeq (Ubuntu,$(shell lsb_release -is))
-  XBMC_CONFIG_OPTIONS += --enable-faac
+  XBMC_CONFIG_OPTIONS += --enable-faac --enable-crystalhd
 else
   XBMC_CONFIG_OPTIONS += --enable-external-libraries --disable-dvdcss \
-	--disable-non-free
+    --disable-non-free
 endif
 
 # Add the SVN revision if we could determine the svn revision
@@ -38,14 +50,15 @@ endif
 XBMC_CONFIG_OPTIONS += CFLAGS="$(DEB_CFLAGS)" CXXFLAGS="$(DEB_CXXFLAGS)"
 
 # Input files used for generating other files
-INPUT_FILES = debian/control.in \
+INPUT_FILES = debian/control.in
 
 %:
-	dh $@
+	dh $@ --parallel
 
 # Target for generating control files
 .PHONY: debian/var_info
 %.in: debian/var_info
+	@echo "Generating $$(echo $@ | sed 's/\.in$$//') from $@"
 	perl -p \
 	-e 's{#BUILD_DEPENDS#}{qx(sh debian/var_info BUILD_DEPENDS)}ge;' \
 	-e 's{#LIBCURL_DEPENDS#}{qx(sh debian/var_info LIBCURL_DEPENDS)}ge;' \
@@ -60,9 +73,11 @@ override_dh_auto_configure: configure
 	./configure $(XBMC_CONFIG_OPTIONS)
 
 override_dh_auto_install:
-	$(MAKE) install install-livedatas prefix=$(CURDIR)/debian/tmp/usr
+	$(MAKE) install install-livedatas DESTDIR=$(CURDIR)/debian/tmp
 	install -D -m 0644 $(CURDIR)/tools/XBMCLive/xbmc-live.conf \
 	    $(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" | \
@@ -71,21 +86,13 @@ override_dh_auto_install:
 		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 \
-		$(CURDIR)/debian/tmp/usr/share/pixmaps
-	cp $(CURDIR)/tools/Linux/xbmc.png \
-		$(CURDIR)/debian/tmp/usr/share/pixmaps/
-	cp $(CURDIR)/tools/Linux/xbmc.desktop \
-		$(CURDIR)/debian/tmp/usr/share/applications/
 
 override_dh_install:
 	dh_install --sourcedir=$(CURDIR)/debian/tmp -XLICENCE \
-		-XLiberationSans-Regular.ttf -XLicence.txt -XLicense.txt
-	# XBMC WEB POC
-	dh_install -pxbmc-web ../../web/poc_jsonrpc \
-		usr/share/xbmc/web
+		-XLicence.txt -XLicense.txt -XLiberationSans-Regular.ttf \
+		-XDejaVuSans.ttf -XDejaVuSans-Bold.ttf
+	# Delete skins from xbmc-data package
+	rm -rf debian/xbmc-data/usr/share/xbmc/addons/skin.*
 
 override_dh_link:
 	dh_link
@@ -105,5 +112,8 @@ override_dh_makeshlibs:
 	# postinst/postrm scripts to call ldconfig
 	dh_makeshlibs -n
 
-override_dh_installdocs:
-	dh_installdocs
+override_dh_gencontrol:
+	dh_gencontrol
+	# Need to manually add dependency for libcurl
+	sed "s/^Depends:.*$$/&, $$(sh debian/var_info LIBCURL_DEPENDS)/" \
+		-i "debian/xbmc-bin/DEBIAN/control"
diff --git a/tools/Linux/packaging/debian/var_info b/tools/Linux/packaging/debian/var_info
index e28d09b8fe..a26e1caa1e 100644
--- a/tools/Linux/packaging/debian/var_info
+++ b/tools/Linux/packaging/debian/var_info
@@ -10,7 +10,7 @@ BUILD_DEPENDS="debhelper (>= 7.0.50), python-support, cmake,
  libmysqlclient-dev, libasound-dev, libpng12-dev | libpng-dev, libpcre3-dev,
  liblzo2-dev, libcdio-dev, libsdl-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev,
  libenca-dev, libjasper-dev, libxt-dev, libxtst-dev, libxmu-dev,
- libxinerama-dev, libcurl-dev | libcurl4-gnutls-dev, libdbus-1-dev,
+ libxinerama-dev, libcurl4-openssl-dev | libcurl-dev, libdbus-1-dev,
  libhal-storage-dev, libhal-dev, libpulse-dev, libavahi-common-dev,
  libavahi-client-dev, libxrandr-dev, libavcodec-dev, libavformat-dev,
  libavutil-dev, libpostproc-dev, libswscale-dev, liba52-dev, libdts-dev,
@@ -30,13 +30,13 @@ case "$1" in
         printf "$BUILD_DEPENDS"
         ;;
     LIBCURL_DEPENDS)
-	LIBCURL_DEPENDS=$(cat /var/lib/dpkg/info/libcurl3.shlibs | \
-	    sed 's/^[^[:space:]]\+\?[[:space:]]\+\?[^[:space:]]\+\?[[:space:]]\+\?\(.*\)$/\1/')
-	if [ $(lsb_release -cs) = "hardy" ]; then
-	    LIBCURL_DEPENDS="libcurl3"
-	fi
-	printf "$LIBCURL_DEPENDS"
-	;;
+        LIBCURL_DEPENDS=$(cat /var/lib/dpkg/info/libcurl3.shlibs | \
+          sed 's/^[^[:space:]]\+\?[[:space:]]\+\?[^[:space:]]\+\?[[:space:]]\+\?\(.*\)$/\1/')
+        if [ $(lsb_release -cs) = "hardy" ]; then
+          LIBCURL_DEPENDS="libcurl3"
+        fi
+        printf "$LIBCURL_DEPENDS"
+        ;;
     XBMC_LIVE_DEPENDS)
         XBMC_LIVE_DEPENDS="xbmc-standalone (= \${binary:Version}),
          policykit,
@@ -54,7 +54,7 @@ case "$1" in
         fi
         if [ $(lsb_release -cs) = "lucid" ]; then
             XBMC_LIVE_DEPENDS="$XBMC_LIVE_DEPENDS
-          mkpasswd,"
+         mkpasswd,"
         fi
         printf "$XBMC_LIVE_DEPENDS"
 esac
diff --git a/tools/Linux/packaging/debian/xbmc-data.install b/tools/Linux/packaging/debian/xbmc-data.install
index 5d28b05a2b..b9d9559ec8 100644
--- a/tools/Linux/packaging/debian/xbmc-data.install
+++ b/tools/Linux/packaging/debian/xbmc-data.install
@@ -1,10 +1,4 @@
 usr/bin/xbmc
-usr/share/xbmc/media
-usr/share/xbmc/sounds
-usr/share/xbmc/language
-usr/share/xbmc/userdata
-usr/share/xbmc/visualisations
-usr/share/xbmc/system
+usr/share/xbmc
 usr/share/pixmaps/xbmc.png
 usr/share/applications
-usr/share/xbmc/FEH.py
diff --git a/tools/Linux/packaging/debian/xbmc-get-orig-source b/tools/Linux/packaging/debian/xbmc-get-orig-source
index 81f4a5cfcf..d6023bbfde 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="25756"
-XBMC_VERSION="9.11~svn$SVN_REVISION.rc1~deb1"
-XBMC_SVN_URL="http://xbmc.svn.sourceforge.net/svnroot/xbmc/tags/Camelot_rc1"
+SVN_REVISION="29959"
+XBMC_VERSION="10.05~svn$SVN_REVISION~deb1"
+XBMC_SVN_URL="http://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk"
 
 USAGE="\n\
 This script is used to generate the orig tarball used in building\n\
@@ -37,21 +37,29 @@ make_current_tarball() {
     # We do an export from svn trunk
     svn export -r$SVN_REVISION $XBMC_SVN_URL xbmc-$XBMC_VERSION
 
+    # Run bootstrap
+    cd xbmc-$XBMC_VERSION
+    ./bootstrap
+    cd ..
+
     # Remove libdvdcss
-    echo "Remove libdvdcss"
+    echo "Removing libdvdcss"
     rm -rf xbmc-$XBMC_VERSION/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss
 
-    # Remove some empty directories and its empty subdirectories
-    echo "Remove empty directories and its empty subdirectories"
-    rm -rf xbmc-$XBMC_VERSION/xbmc/cores/dvdplayer/Codecs/libDVDCSS
-    rm -rf xbmc-$XBMC_VERSION/xbmc/cores/dvdplayer/Codecs/libdvdnav
+    # Remove empty directories
+    echo "Removing empty directories"
+    find xbmc-$XBMC_VERSION -type d -empty -delete
 
-    # Run bootstrap and remove cache directories
-    cd xbmc-$XBMC_VERSION
-    ./bootstrap
-    rm -rf autom4te.cache
-    rm -rf xbmc/lib/libass/autom4te.cache
-    cd ..
+    # Remove temp files and other cruft from source tarball
+    # The find command snippet here was taken from debhelper's dh_clean command
+    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' \) \
+        \) -exec rm -f "{}" \; \) -o \
+        \( -type d -a -name autom4te.cache -prune -exec rm -rf "{}" \; \) \)
 
     # Create the tarball
     echo "Create orig tarball"
diff --git a/tools/Linux/packaging/debian/xbmc-skin-confluence.install b/tools/Linux/packaging/debian/xbmc-skin-confluence.install
index 3700d539a1..bac36c1650 100644
--- a/tools/Linux/packaging/debian/xbmc-skin-confluence.install
+++ b/tools/Linux/packaging/debian/xbmc-skin-confluence.install
@@ -1 +1 @@
-usr/share/xbmc/skin/Confluence
+usr/share/xbmc/addons/skin.confluence
diff --git a/tools/Linux/packaging/debian/xbmc-skin-confluence.links b/tools/Linux/packaging/debian/xbmc-skin-confluence.links
new file mode 100644
index 0000000000..46d649930a
--- /dev/null
+++ b/tools/Linux/packaging/debian/xbmc-skin-confluence.links
@@ -0,0 +1,2 @@
+/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf usr/share/xbmc/addons/skin.confluence/fonts/DejaVuSans-Bold.ttf
+/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf usr/share/xbmc/addons/skin.confluence/fonts/DejaVuSans.ttf
diff --git a/tools/Linux/packaging/debian/xbmc-skin-pm3-hd.install b/tools/Linux/packaging/debian/xbmc-skin-pm3-hd.install
index 5b8c81ed6c..3551331ead 100644
--- a/tools/Linux/packaging/debian/xbmc-skin-pm3-hd.install
+++ b/tools/Linux/packaging/debian/xbmc-skin-pm3-hd.install
@@ -1 +1 @@
-usr/share/xbmc/skin/PM3.HD
+usr/share/xbmc/addons/skin.pm3-hd
diff --git a/tools/Linux/packaging/debian/xbmc-skin-pm3-hd.links b/tools/Linux/packaging/debian/xbmc-skin-pm3-hd.links
index c3b7e2cd06..0ac8961d93 100644
--- a/tools/Linux/packaging/debian/xbmc-skin-pm3-hd.links
+++ b/tools/Linux/packaging/debian/xbmc-skin-pm3-hd.links
@@ -1 +1 @@
-/usr/share/fonts/truetype/ttf-liberation/LiberationSans-Regular.ttf usr/share/xbmc/skin/PM3.HD/fonts/LiberationSans-Regular.ttf
+/usr/share/fonts/truetype/ttf-liberation/LiberationSans-Regular.ttf usr/share/xbmc/addons/skin.pm3-hd/fonts/LiberationSans-Regular.ttf