Skip to content

Commit

Permalink
Don't include eventclient packages in Provides/Replaces/Conflicts for…
Browse files Browse the repository at this point in the history 
… xbmc and xbmc-bin.
  • Loading branch information
Andres Mejia committed Jan 11, 2012
1 parent 5f19c6e commit 0d0b023
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 31 deletions.
25 changes: 8 additions & 17 deletions debian/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ Source: xbmc
Section: video
Priority: optional
Maintainer: Team XBMC <team-xbmc@lists.launchpad.net>
XSBC-Original-Maintainer: Team XBMC <team-xbmc@lists.launchpad.net>
Uploaders: Andres Mejia <amejia@debian.org>
DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 7.0.50~),
python-support,
cmake,
Expand Down Expand Up @@ -75,11 +73,10 @@ Build-Depends: debhelper (>= 7.0.50~),
fpc,
libomxil-bellagio-dev [armel],
python-imaging,
libva-dev,
libplist-dev,
libhal-storage-dev,
libcec-dev (>= 1.1),

This comment has been minimized.

Sign in to view

Copy link
@mkortstiege

mkortstiege Jan 13, 2012

Member

I can recall some changes to libcec that required XBMC changes. You're sure it will build and actually work like intended with libcec-dev 1.1 ?

This comment has been minimized.

Sign in to view

Copy link
@opdenkamp

opdenkamp Jan 13, 2012

Member

yes, Eden should be using >= 1.1
libudev-dev,
libcec-dev,
libafpclient-dev,
libshairport-dev,
libnfs-dev,
Expand All @@ -90,6 +87,7 @@ Build-Depends: debhelper (>= 7.0.50~),
libavutil-dev (>= 4:0.7),
libpostproc-dev (>= 4:0.7),
libswscale-dev (>= 4:0.7),
libva-dev,
Standards-Version: 3.9.2
Homepage: http://xbmc.org/
Vcs-Git: git://github.com/xbmc/xbmc-packaging.git
Expand All @@ -109,15 +107,9 @@ Depends: xbmc-bin (>= ${source:Version}),
${misc:Depends}
Suggests: xbmc-test-helper
Recommends: python-qt3
Provides: xbmc-standalone, xbmc-data, xbmc-skin-confluence,
xbmc-eventclients-common, xbmc-eventclients-dev, xbmc-eventclients-j2me,
xbmc-eventclients-ps3, xbmc-eventclients-xbmc-send
Replaces: xbmc-standalone, xbmc-data, xbmc-skin-confluence,
xbmc-eventclients-common, xbmc-eventclients-dev, xbmc-eventclients-j2me,
xbmc-eventclients-ps3, xbmc-eventclients-xbmc-send
Conflicts: xbmc-standalone, xbmc-data, xbmc-skin-confluence,
xbmc-eventclients-common, xbmc-eventclients-dev, xbmc-eventclients-j2me,
xbmc-eventclients-ps3, xbmc-eventclients-xbmc-send
Provides: xbmc-standalone, xbmc-data, xbmc-skin-confluence
Replaces: xbmc-standalone, xbmc-data, xbmc-skin-confluence
Conflicts: xbmc-standalone, xbmc-data, xbmc-skin-confluence
Description: XBMC Media Center (arch-independent 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
Expand All @@ -144,9 +136,9 @@ Architecture: i386 amd64 powerpc ppc64 armel
Depends: ${shlibs:Depends},
${misc:Depends}
Recommends: ${shlibs:Recommends}
Provides: xbmc-common, xbmc-eventclients-wiiremote
Replaces: xbmc-common, xbmc-eventclients-wiiremote
Conflicts: xbmc-common, xbmc-eventclients-wiiremote
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
Expand Down Expand Up @@ -176,7 +168,6 @@ Depends: xbmc (= ${binary:Version}),
adduser,
sudo,
whois,
uxlaunch,

This comment has been minimized.

Sign in to view

Copy link
@mkortstiege

mkortstiege Jan 13, 2012

Member

It's not needed for Live/XBMCbuntu anymore?
${misc:Depends},
${shlibs:Depends},
Conflicts: kdm, gdm, xdm, wdm
Expand Down
20 changes: 6 additions & 14 deletions debian/control.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ Source: xbmc
Section: video
Priority: optional
Maintainer: Team XBMC <team-xbmc@lists.launchpad.net>
XSBC-Original-Maintainer: Team XBMC <team-xbmc@lists.launchpad.net>
Uploaders: Andres Mejia <amejia@debian.org>
DM-Upload-Allowed: yes
Build-Depends: #BUILD_DEPENDS#
Standards-Version: 3.9.2
Homepage: http://xbmc.org/
Expand All @@ -25,15 +23,9 @@ Depends: xbmc-bin (>= ${source:Version}),
${misc:Depends}
Suggests: xbmc-test-helper
Recommends: python-qt3
Provides: xbmc-standalone, xbmc-data, xbmc-skin-confluence,
xbmc-eventclients-common, xbmc-eventclients-dev, xbmc-eventclients-j2me,
xbmc-eventclients-ps3, xbmc-eventclients-xbmc-send
Replaces: xbmc-standalone, xbmc-data, xbmc-skin-confluence,
xbmc-eventclients-common, xbmc-eventclients-dev, xbmc-eventclients-j2me,
xbmc-eventclients-ps3, xbmc-eventclients-xbmc-send
Conflicts: xbmc-standalone, xbmc-data, xbmc-skin-confluence,
xbmc-eventclients-common, xbmc-eventclients-dev, xbmc-eventclients-j2me,
xbmc-eventclients-ps3, xbmc-eventclients-xbmc-send
Provides: xbmc-standalone, xbmc-data, xbmc-skin-confluence
Replaces: xbmc-standalone, xbmc-data, xbmc-skin-confluence
Conflicts: xbmc-standalone, xbmc-data, xbmc-skin-confluence
Description: XBMC Media Center (arch-independent 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
Expand All @@ -60,9 +52,9 @@ Architecture: i386 amd64 powerpc ppc64 armel
Depends: ${shlibs:Depends},
${misc:Depends}
Recommends: ${shlibs:Recommends}
Provides: xbmc-common, xbmc-eventclients-wiiremote
Replaces: xbmc-common, xbmc-eventclients-wiiremote
Conflicts: xbmc-common, xbmc-eventclients-wiiremote
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
Expand Down

2 comments on commit 0d0b023

@theuni
Copy link

@theuni theuni commented on 0d0b023 Jan 13, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this do what we want? From the looks, existing eventclients won't be updated?

Users currently using Dharma from xbmc ppa should be able to upgrade and see existing eventclients updated, and optionally install the ones requring deps (java, bluetooth, etc)

@amejia1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If they have an eventclients package installed, those will be updated.

I have to double check upgrades from dharma to eden anyway.

Please sign in to comment.