From 1bc8190554bd4493ede6cb2d563eaa09d3f15f06 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Tue, 22 Jul 2014 12:55:08 -0400
Subject: [PATCH] launchpad: daemon should also conflict with sflphone-data
sflphone-data contains ringtones
Refs #51822
Change-Id: Icf1d851a82f14ee2f04f307f9120a95fcc6d6780
---
.../build-system/launchpad/sflphone-daemon-video/debian/control | 2 +-
tools/build-system/launchpad/sflphone-daemon/debian/control | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/build-system/launchpad/sflphone-daemon-video/debian/control b/tools/build-system/launchpad/sflphone-daemon-video/debian/control
index 40c98c829b..34933e29c8 100644
--- a/tools/build-system/launchpad/sflphone-daemon-video/debian/control
+++ b/tools/build-system/launchpad/sflphone-daemon-video/debian/control
@@ -10,7 +10,7 @@ Priority: optional
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libavcodec54 | libavcodec-extra-54 | libavcodec53 | libavcodec-extra-53, libavdevice53 | libavdevice-extra-53, libavformat54 | libavformat-extra-54 | libavformat53 | libavformat-extra-53, libswscale2 | libswscale-extra-2, libavutil52 | libavutil-extra-52 | libavutil51 | libavutil-extra-51
Replaces: sflphone, sflphone-common-video
-Conflicts: sflphone-common, sflphone-daemon
+Conflicts: sflphone-common, sflphone-daemon, sflphone-data
Provides: sflphone-common-video
Homepage: http://www.sflphone.org
Description: SIP and IAX2 compatible softphone - Core with video support
diff --git a/tools/build-system/launchpad/sflphone-daemon/debian/control b/tools/build-system/launchpad/sflphone-daemon/debian/control
index 8fce19700d..27d6f4f9fe 100644
--- a/tools/build-system/launchpad/sflphone-daemon/debian/control
+++ b/tools/build-system/launchpad/sflphone-daemon/debian/control
@@ -11,7 +11,7 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: sflphone, sflphone-common
Provides: sflphone-common
-Conflicts: sflphone-common-video, sflphone-daemon-video
+Conflicts: sflphone-common-video, sflphone-daemon-video, sflphone-data
Homepage: http://www.sflphone.org
Description: SIP and IAX2 compatible softphone - Core
SFLphone is meant to be a robust enterprise-class desktop phone.
--
GitLab