From fcb9f3921419240384e5f77693d80dc83697f76b Mon Sep 17 00:00:00 2001
From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Date: Tue, 8 Jan 2013 16:18:29 -0500
Subject: [PATCH] [#18629] Add runtime libavcodec dependency for H264 video
codec
---
.../launchpad/sflphone-client-gnome-video/debian/control | 2 +-
.../launchpad/sflphone-client-gnome/debian/control | 2 +-
.../launchpad/sflphone-common-video/debian/control | 4 ++--
tools/build-system/launchpad/sflphone-common/debian/control | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tools/build-system/launchpad/sflphone-client-gnome-video/debian/control b/tools/build-system/launchpad/sflphone-client-gnome-video/debian/control
index 7435d2c5f8..2889e0515d 100644
--- a/tools/build-system/launchpad/sflphone-client-gnome-video/debian/control
+++ b/tools/build-system/launchpad/sflphone-client-gnome-video/debian/control
@@ -9,7 +9,7 @@ Package: sflphone-client-gnome-video
Priority: optional
Architecture: any
Depends: sflphone-common-video (=${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Replaces: sflphone-client-gnome
+Replaces: sflphone
Conflicts: sflphone-client-gnome
Homepage: http://www.sflphone.org
Description: GNOME client for SFLphone, with video support
diff --git a/tools/build-system/launchpad/sflphone-client-gnome/debian/control b/tools/build-system/launchpad/sflphone-client-gnome/debian/control
index bb813d887d..9bbaf252e0 100644
--- a/tools/build-system/launchpad/sflphone-client-gnome/debian/control
+++ b/tools/build-system/launchpad/sflphone-client-gnome/debian/control
@@ -10,7 +10,7 @@ Priority: optional
Architecture: any
Depends: sflphone-common (=${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Replaces: sflphone
-Conflicts: sflphone
+Conflicts: sflphone-client-gnome-video
Homepage: http://www.sflphone.org
Description: GNOME client for SFLphone
Provide a GNOME client for SFLphone.
diff --git a/tools/build-system/launchpad/sflphone-common-video/debian/control b/tools/build-system/launchpad/sflphone-common-video/debian/control
index b4136245f9..f8638f67a7 100644
--- a/tools/build-system/launchpad/sflphone-common-video/debian/control
+++ b/tools/build-system/launchpad/sflphone-common-video/debian/control
@@ -8,8 +8,8 @@ Standards-Version: 3.7.3
Package: sflphone-common-video
Priority: optional
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: sflphone-common
+Depends: ${shlibs:Depends}, ${misc:Depends}, libavcodec53 | libavcodec-extra-53, libdevice53 | libavdevice-extra-53, libavfilter2 | libavfilter-extra-2, libavformat53 | libavformat-extra-53, libswscale2 | libswscale-extra-2, libavutil51 | libavutil-extra-51
+Replaces: sflphone
Conflicts: sflphone-common
Homepage: http://www.sflphone.org
Description: SIP and IAX2 compatible softphone - Core with video support
diff --git a/tools/build-system/launchpad/sflphone-common/debian/control b/tools/build-system/launchpad/sflphone-common/debian/control
index c8d24e6c33..48ee949611 100644
--- a/tools/build-system/launchpad/sflphone-common/debian/control
+++ b/tools/build-system/launchpad/sflphone-common/debian/control
@@ -10,7 +10,7 @@ Priority: optional
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: sflphone
-Conflicts: sflphone
+Conflicts: sflphone-common-video
Homepage: http://www.sflphone.org
Description: SIP and IAX2 compatible softphone - Core
SFLphone is meant to be a robust enterprise-class desktop phone.
--
GitLab