Update debian packaging for xbmc beta1.

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

11 files changed, 64 insertions, 91 deletions

diff --git a/tools/Linux/debian/changelog b/tools/Linux/debian/changelog
index 53e1089adc..4776cd9e0e 100644
--- a/tools/Linux/debian/changelog
+++ b/tools/Linux/debian/changelog
@@ -1,4 +1,4 @@
-xbmc (1:9.04.1+svn22158~deb1-1) experimental; urgency=low
+xbmc (1:9.11~svn24886~deb1-1) experimental; urgency=low
 
   * Package XBMC for Debian. (Closes: #469397)
     (LP: #307162)
@@ -8,9 +8,9 @@ xbmc (1:9.04.1+svn22158~deb1-1) experimental; urgency=low
   * Add DM-Upload-Allowed: yes field.
   * Switch to debhelper 7.
   * Switch to quilt.
-  * Remove unused patch.
+  * Remove unused patches.
   * Completely rewrite debian/rules to take advantage of debhelper 7 and quilt.
-  * Bump to Standards-Version 3.8.2.
+  * Bump to Standards-Version 3.8.3.
   * Changed Architecture field for arch-indep packages to 'all'.
   * Included powerpc and ppc64 for binary packages.
   * Use ${shlibs:Depends} for all binary packages.
@@ -19,8 +19,8 @@ xbmc (1:9.04.1+svn22158~deb1-1) experimental; urgency=low
   * Changed Priority to optional.
   * No need for debian/dirs file, so removing.
   * Rename docs to xbmc-common.docs so documentation installs to xbmc-common.
-  * Rename debug package to xbmc-dbg. Have it debugging symbols for all binary
-    packages.
+  * Rename debug package to xbmc-dbg. xbmc-dbg will have debugging symbols for
+    all binary packages.
   * Rewrite the Build-Depends field, modeling it in order from what is needed
     by configure scripts.
   * Fix --prefix option when calling make install* in debian/rules.
@@ -34,6 +34,11 @@ xbmc (1:9.04.1+svn22158~deb1-1) experimental; urgency=low
   * 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.
+  * Add patch to fix issue running distclean from a symlinked directory.
+  * Add patch to ensure Windows binaries don't get installed.
+  * Use dh_install instead of unzip to install web skin packages.
   * Various fixes for lintian warnings and errors.
     + Fix not-binnmuable-all-depends-any lintian errors.
     + Fix not-binnmuable-any-depends-all lintian errors.
@@ -50,8 +55,10 @@ xbmc (1:9.04.1+svn22158~deb1-1) experimental; urgency=low
     + Install the subdirectories of tools/EventClients/examples/ in examples for
       xbmc-eventclients-dev package.
     + 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).
 
- -- Andres Mejia <mcitadel@gmail.com>  Thu, 16 Jul 2009 22:50:52 -0400
+ -- Andres Mejia <mcitadel@gmail.com>  Sun, 22 Nov 2009 17:42:11 -0500
 
 xbmc (9.04.1.0.20670-jaunty1) jaunty; urgency=low
 
diff --git a/tools/Linux/debian/control b/tools/Linux/debian/control
index c2689e0635..a7eb2f9be8 100644
--- a/tools/Linux/debian/control
+++ b/tools/Linux/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers@lists.alio
 Uploaders: Ouattara Oumar Aziz (alias wattazoum) <wattazoum@gmail.com>,
            Andres Mejia <mcitadel@gmail.com>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50), quilt, python-support, cmake,
+Build-Depends: debhelper (>= 7.0.50), python-support, cmake,
  autotools-dev, autoconf, automake, unzip, libboost-dev,
  libgl1-mesa-dev | libgl-dev, libglu-dev, libglew-dev, libmad0-dev, libjpeg-dev,
  libsamplerate-dev, libogg-dev, libvorbis-dev, libfreetype6-dev,
@@ -19,8 +19,8 @@ Build-Depends: debhelper (>= 7.0.50), quilt, python-support, cmake,
  libswscale-dev, liba52-dev, libdts-dev, libmpeg2-4-dev, libass-dev,
  libmpcdec-dev, libflac-dev, libwavpack-dev, python-dev, gawk, gperf,
  nasm [!amd64], libcwiid1-dev, libbluetooth-dev, zlib1g-dev, libmms-dev,
- libsmbclient-dev, libfaad-dev,
-Standards-Version: 3.8.2
+ libsmbclient-dev, libfaad-dev, libiso9660-dev, libssl-dev,
+Standards-Version: 3.8.3
 Homepage: http://xbmc.org/
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/xbmc.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/xbmc.git;a=summary
@@ -28,6 +28,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/xbmc.git;a=summary
 Package: xbmc
 Architecture: all
 Depends: xbmc-data (= ${binary:Version}),
+         xbmc-skin-confluence (= ${binary:Version}) |
          xbmc-skin-pm3-hd (= ${binary:Version}),
          xbmc-web-pm3 (= ${binary:Version}),
          ${misc:Depends}
@@ -86,6 +87,7 @@ Description: XBMC Media Center (XBMC Live package)
 Package: xbmc-standalone
 Architecture: all
 Depends: xbmc-data (= ${binary:Version}),
+         xbmc-skin-confluence (= ${binary:Version}) |
          xbmc-skin-pm3-hd (= ${binary:Version}),
          xbmc-web-pm3 (= ${binary:Version}),
          ${misc:Depends}
@@ -120,7 +122,7 @@ Depends: xbmc-bin (>= ${source:Version}),
 Provides: xbmc-common
 Replaces: xbmc-common
 Conflicts: xbmc-common
-Suggests: xbmc-test-helper
+Suggests: mesa-utils, x11-utils, xbmc-test-helper
 Recommends: python-qt3
 Description: XBMC Media Center (arch-independent data package)
  XBMC, recursive acronym for "XBMC Media Center", is an award winning free and
@@ -217,13 +219,12 @@ Description: XBMC Media Center (example scripts)
  .
  This package contains scripts shipped with XBMC for user conveniance.
 
-Package: xbmc-skin-pm3
+Package: xbmc-skin-confluence
 Architecture: all
 Depends: xbmc-data (= ${binary:Version}),
+         ttf-liberation,
          ${misc:Depends}
-Replaces: xbmc-skin-default
-Conflicts: xbmc-skin-default
-Description: XBMC Media Center (Project Mahem III skin)
+Description: XBMC Media Center (Confluence skin)
  XBMC, recursive acronym for "XBMC Media Center", is an award winning free and
  open source software media-player and entertainment hub for all your digital
  media. XBMC is available for Linux, Mac OS X (Leopard, Tiger and Apple TV)
@@ -241,7 +242,7 @@ Description: XBMC Media Center (Project Mahem III skin)
  theater. Once installed, your computer will become a fully functional
  multimedia jukebox.
  .
- This package contains the XBMC PM3 Skin package (aka Project Mahem III).
+ This package contains the XBMC Confluence Skin package.
 
 Package: xbmc-skin-pm3-hd
 Architecture: all
@@ -320,32 +321,6 @@ Description: XBMC Media Center (Project Mahem web skin)
  This package contains the PM (aka Project Mahem) Skin for the XBMC web
  server.
 
-Package: xbmc-web-eflexweb
-Architecture: all
-Depends: xbmc-data (= ${binary:Version}),
-         ${misc:Depends}
-Conflicts: xbmc-web-pm3, xbmc-web-pm, xbmc-web-iphone-tlrobinson
-Description: XBMC Media Center (Eflex web skin)
- XBMC, recursive acronym for "XBMC Media Center", is an award winning free and
- open source software media-player and entertainment hub for all your digital
- media. XBMC is available for Linux, Mac OS X (Leopard, Tiger and Apple TV)
- and Microsoft Windows, as well as the original Xbox game console. Created in
- 2003 by a group of like minded programmers, XBMC is a non-profit project run
- and developed by volunteers located around the world. More than 50 software
- developers have contributed to XBMC, and 100-plus translators have worked to
- expand its reach, making it available in more than 30 languages.
- .
- While XBMC functions very well as a standard media player application for
- your computer, it has been designed to be the perfect companion for your
- HTPC. Supporting an almost endless range of remote controls, and combined
- with its beautiful interface and powerful skinning engine, XBMC feels very
- natural to use from the couch and is the ideal solution for your home
- theater. Once installed, your computer will become a fully functional
- multimedia jukebox.
- .
- This package contains the XBMC Webserver Eflex web Skin for the XBMC web
- server.
-
 Package: xbmc-web-iphone-tlrobinson
 Architecture: all
 Depends: xbmc-data (= ${binary:Version}),
diff --git a/tools/Linux/debian/patches/series b/tools/Linux/debian/patches/series
deleted file mode 100644
index cafd20572b..0000000000
--- a/tools/Linux/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-# Nothing to patch
diff --git a/tools/Linux/debian/rules b/tools/Linux/debian/rules
index 49b00d2c80..6366eb64de 100755
--- a/tools/Linux/debian/rules
+++ b/tools/Linux/debian/rules
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -14,7 +12,7 @@ SVNVERSION ?= $(shell dpkg-parsechangelog | grep '^Version:' | sed 's/.*svn\([[:
 XBMC_CONFIG_OPTIONS ?= --host=$(DEB_HOST_GNU_TYPE) \
 	--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --disable-ccache \
 	--disable-dvdcss --enable-external-libraries --enable-avahi \
-	CFLAGS="$(DEB_CFLAGS)" CXXFLAGS="$(DEB_CXXFLAGS)"
+	--enable-goom CFLAGS="$(DEB_CFLAGS)" CXXFLAGS="$(DEB_CXXFLAGS)"
 
 # Add the SVN revision if it exists in the changelog
 ifeq (,$(findstring Version,$(SVNVERSION)))
@@ -27,14 +25,21 @@ endif
 override_dh_clean:
 	dh_clean
 	rm -f debian/xbmc-live.init
-	debian/rules unpatch
 
-override_dh_auto_configure: patch
-	cp -f tools/XBMCLive/xbmc debian/xbmc-live.init
+override_dh_auto_configure:
+	cp -f tools/XBMCLive/xbmc-live debian/xbmc-live.init
 	./configure $(XBMC_CONFIG_OPTIONS)
 
 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,39 +52,22 @@ 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
-	install -D "debian/xbmc-data/usr/share/xbmc/xbmc.bin" \
-		"debian/xbmc-bin/usr/lib/xbmc/xbmc.bin"
-	dh_link -pxbmc-data "usr/lib/xbmc/xbmc.bin" \
-		"usr/share/xbmc/xbmc.bin"
-	install -D "debian/xbmc-data/usr/share/xbmc/xbmc-xrandr" \
-		"debian/xbmc-bin/usr/lib/xbmc/xbmc-xrandr"
-	dh_link -pxbmc-data "usr/lib/xbmc/xbmc-xrandr" \
-		"usr/share/xbmc/xbmc-xrandr"
-	find "debian/xbmc-data/usr/share/xbmc" -regextype posix-extended \
-		-type f -iregex ".*\.so|.*\.vis|.*\.xbs" | while read FILE; do \
-		NEW_LOCATION="$$(echo $$FILE | sed -e 's|/xbmc-data/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/xbmc-data/||')"; \
-		install -D "$$FILE" "$$NEW_LOCATION"; \
+	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-data "$$LINK_TARGET" "$$LINK_DESTINATION"; \
 		done
 
@@ -90,3 +78,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
diff --git a/tools/Linux/debian/source/format b/tools/Linux/debian/source/format
new file mode 100644
index 0000000000..163aaf8d82
--- /dev/null
+++ b/tools/Linux/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/tools/Linux/debian/xbmc-bin.install b/tools/Linux/debian/xbmc-bin.install
new file mode 100644
index 0000000000..cddb90a986
--- /dev/null
+++ b/tools/Linux/debian/xbmc-bin.install
@@ -0,0 +1 @@
+usr/lib/xbmc
diff --git a/tools/Linux/debian/xbmc-data.docs b/tools/Linux/debian/xbmc-data.docs
index 8aea543a3e..30a66981fe 100644
--- a/tools/Linux/debian/xbmc-data.docs
+++ b/tools/Linux/debian/xbmc-data.docs
@@ -1,3 +1,2 @@
 keymapping.txt
 README.linux
-keymapping-schematic.pdf
diff --git a/tools/Linux/debian/xbmc-data.install b/tools/Linux/debian/xbmc-data.install
index 7265523f26..5638aba061 100644
--- a/tools/Linux/debian/xbmc-data.install
+++ b/tools/Linux/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/tools/Linux/debian/xbmc-get-orig-source b/tools/Linux/debian/xbmc-get-orig-source
index 51c21139cf..b14295b724 100755
--- a/tools/Linux/debian/xbmc-get-orig-source
+++ b/tools/Linux/debian/xbmc-get-orig-source
@@ -6,8 +6,8 @@
 # Common variables used to ease maintenance of this script
 XBMC_TARBALL=""
 XBMC_TARBALL_CHECKSUM=""
-SVN_REVISION="22158"
-XBMC_VERSION="9.04.1+svn$SVN_REVISION~deb1"
+SVN_REVISION="24886"
+XBMC_VERSION="9.11~svn$SVN_REVISION~deb1"
 
 USAGE="\n\
 This script is used to generate the orig tarball used in building\n\
@@ -33,15 +33,8 @@ done
 
 # This will generate the orig.tar.gz
 make_current_tarball() {
-    # We do a checkout of the external-libraries-support branch at a specified
-    # revision
-    svn co -r$SVN_REVISION http://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/linuxport/XBMC xbmc-$XBMC_VERSION
-
-    # Take out the .svn directories
-    echo "Removing .svn directories"
-    find xbmc-$XBMC_VERSION -type d -name .svn | while read TMP; do
-        rm -rf "$TMP"
-    done
+    # We do an export from svn trunk
+    svn export -r$SVN_REVISION https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk xbmc-$XBMC_VERSION
 
     # Remove libdvdcss
     echo "Remove libdvdcss"
@@ -52,6 +45,13 @@ make_current_tarball() {
     rm -rf xbmc-$XBMC_VERSION/xbmc/cores/dvdplayer/Codecs/libDVDCSS
     rm -rf xbmc-$XBMC_VERSION/xbmc/cores/dvdplayer/Codecs/libdvdnav
 
+    # Run bootstrap and remove cache directories
+    cd xbmc-$XBMC_VERSION
+    ./bootstrap
+    rm -rf autom4te.cache
+    rm -rf xbmc/lib/libass/autom4te.cache
+    cd ..
+
     # Create the tarball
     echo "Create orig tarball"
     tar -czf xbmc_$XBMC_VERSION.orig.tar.gz \
diff --git a/tools/Linux/debian/xbmc-skin-confluence.install b/tools/Linux/debian/xbmc-skin-confluence.install
new file mode 100644
index 0000000000..3700d539a1
--- /dev/null
+++ b/tools/Linux/debian/xbmc-skin-confluence.install
@@ -0,0 +1 @@
+usr/share/xbmc/skin/Confluence
diff --git a/tools/Linux/debian/xbmc-skin-pm3.install b/tools/Linux/debian/xbmc-skin-pm3.install
deleted file mode 100644
index 8284d6cc24..0000000000
--- a/tools/Linux/debian/xbmc-skin-pm3.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/xbmc/skin/Project*