[SCM] xbmc packaging branch, master, updated. upstream/9.11.svn24588.deb1-39-gebbc753

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

The following commit has been merged in the master branch:
commit a613f5c24e550d6119673467f80d17d273ef96df
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon Nov 23 00:01:04 2009 -0500

    Fix packaging for skins. Confluence skin has been add and PM3 has been dropped.

diff --git a/debian/control b/debian/control
index 2db2a8c..a7eb2f9 100644
--- a/debian/control
+++ b/debian/control
@@ -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}
@@ -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
diff --git a/debian/xbmc-skin-confluence.install b/debian/xbmc-skin-confluence.install
new file mode 100644
index 0000000..3700d53
--- /dev/null
+++ b/debian/xbmc-skin-confluence.install
@@ -0,0 +1 @@
+usr/share/xbmc/skin/Confluence
diff --git a/debian/xbmc-skin-pm3.install b/debian/xbmc-skin-pm3.install
deleted file mode 100644
index 8284d6c..0000000
--- a/debian/xbmc-skin-pm3.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/xbmc/skin/Project*

-- 
xbmc packaging