[SCM] xbmc packaging branch, master, updated. upstream/9.11.svn25484.beta2.deb1-64-g5964ae1

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

The following commit has been merged in the master branch:
commit 5964ae1b4670870beccf5c9c7beb82450b0534b4
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Fri Dec 11 12:33:31 2009 -0500

    Add a Provides, Replaces, and Conflicts field for xbmc-bin to provide, replace, and conflict with xbmc-common.

diff --git a/debian/control b/debian/control
index e06d2e6..e62c6d1 100644
--- a/debian/control
+++ b/debian/control
@@ -151,6 +151,9 @@ Package: xbmc-bin
 Architecture: i386 amd64 powerpc ppc64 lpia
 Depends: libcurl3 (>= 7.16.2-1), ${shlibs:Depends},
          ${misc:Depends}
+Provides: xbmc-common
+Replaces: xbmc-common
+Conflicts: xbmc-common
 Description: XBMC Media Center (binary data package)
  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
diff --git a/debian/control.in b/debian/control.in
index fa74690..1a9759b 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -135,6 +135,9 @@ Package: xbmc-bin
 Architecture: i386 amd64 powerpc ppc64 lpia
 Depends: #LIBCURL_DEPENDS#, ${shlibs:Depends},
          ${misc:Depends}
+Provides: xbmc-common
+Replaces: xbmc-common
+Conflicts: xbmc-common
 Description: XBMC Media Center (binary data package)
  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

-- 
xbmc packaging