From 8feca6409fa0521c15bbd4f0720190522d350157 Mon Sep 17 00:00:00 2001
From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Date: Thu, 23 Apr 2009 18:55:16 -0400
Subject: [PATCH] [#1220] Add Conflicts: sflphone in debian control files

---
 sflphone-client-gnome/debian/control.hardy    | 3 ++-
 sflphone-client-gnome/debian/control.intrepid | 3 ++-
 sflphone-client-gnome/debian/control.jaunty   | 3 ++-
 sflphone-common/debian/control.hardy          | 3 ++-
 sflphone-common/debian/control.intrepid       | 3 ++-
 sflphone-common/debian/control.jaunty         | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/sflphone-client-gnome/debian/control.hardy b/sflphone-client-gnome/debian/control.hardy
index ff5c7cea4a..d59fe01149 100644
--- a/sflphone-client-gnome/debian/control.hardy
+++ b/sflphone-client-gnome/debian/control.hardy
@@ -10,8 +10,9 @@ Priority: optional
 Architecture: any
 Depends: sflphone-common (>= 0.9.5), libdbus-glib-1-2 (>= 0.73), libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0), libdbus-glib-1-2, libnotify1 (>= 0.4), libsexy2 (>= 0.1), librsvg2-common (>=2.22.2)
 Replaces: sflphone
+Conflicts: sflphone
 Homepage: http://www.sflphone.org
-Description: SIP and IAX2 compatible softphone - SFLphone GNOME client
+Description: GNOME client for SFLphone
  Provide a GNOME client to SFLphone.
  SFLphone is meant to be a robust enterprise-class desktop phone.
  SFLphone is released under the GNU General Public License.
diff --git a/sflphone-client-gnome/debian/control.intrepid b/sflphone-client-gnome/debian/control.intrepid
index 1799888a8c..719599822e 100644
--- a/sflphone-client-gnome/debian/control.intrepid
+++ b/sflphone-client-gnome/debian/control.intrepid
@@ -10,8 +10,9 @@ Priority: optional
 Architecture: any
 Depends: sflphone-commmon (>=0.9.5), libdbus-glib-1-2 (>= 0.73), libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0), libdbus-glib-1-2, libnotify1 (>= 0.4), libsexy2 (>= 0.1), librsvg2-common (>= 2.22.2)
 Replaces: sflphone
+Conflicts: sflphone
 Homepage: http://www.sflphone.org
-Description: SIP and IAX2 compatible softphone - SFLphone GNOME client
+Description: GNOME client for SFLphone
  Provide a GNOME client to SFLphone.
  SFLphone is meant to be a robust enterprise-class desktop phone.
  SFLphone is released under the GNU General Public License.
diff --git a/sflphone-client-gnome/debian/control.jaunty b/sflphone-client-gnome/debian/control.jaunty
index 51459c6e50..9bb11eef47 100644
--- a/sflphone-client-gnome/debian/control.jaunty
+++ b/sflphone-client-gnome/debian/control.jaunty
@@ -10,8 +10,9 @@ Priority: optional
 Architecture: any
 Depends: sflphone-common (>=0.9.5), libdbus-glib-1-2 (>= 0.73), libgtk2.0-0 (>=2.16) , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0) ,libdbus-glib-1-2, libnotify1 (>= 0.4), librsvg2-common (>=2.22.2)
 Replaces: sflphone
+Conflicts: sflphone
 Homepage: http://www.sflphone.org
-Description: SIP and IAX2 compatible softphone - SFLphone GNOME client
+Description: GNOME client for SFLphone
  Provide a GNOME client for SFLphone.
  SFLphone is meant to be a robust enterprise-class desktop phone.
  SFLphone is released under the GNU General Public License.
diff --git a/sflphone-common/debian/control.hardy b/sflphone-common/debian/control.hardy
index 0c074faf9e..a8e2176038 100644
--- a/sflphone-common/debian/control.hardy
+++ b/sflphone-common/debian/control.hardy
@@ -10,8 +10,9 @@ Priority: optional
 Architecture: any
 Depends:  libsamplerate0 (>=0.1.2) , libdbus-glib-1-2 (>= 0.73), libexpat1, libc6 (>= 2.3.6-6) , libcommoncpp2-1.6-0 ,libgsm1 (>=1.0.10) , libspeex1 (>=1.1.12) , libdbus-1-3, libasound2 (>= 1.0), libpulse0 (>= 0.9.6), libccrtp1-1.6-0
 Replaces: sflphone
+Conflicts: sflphone
 Homepage: http://www.sflphone.org
-Description: SIP and IAX2 compatible softphone - application core
+Description: SIP and IAX2 compatible softphone - Core
  This package provides SFLphone daemon, that is the core of the application.
  SFLphone is meant to be a robust enterprise-class desktop phone.
  SFLphone is released under the GNU General Public License.
diff --git a/sflphone-common/debian/control.intrepid b/sflphone-common/debian/control.intrepid
index dc65298fd5..7376cb3ebc 100644
--- a/sflphone-common/debian/control.intrepid
+++ b/sflphone-common/debian/control.intrepid
@@ -10,8 +10,9 @@ Priority: optional
 Architecture: any
 Depends: libsamplerate0 (>=0.1.2) , libexpat1 , libc6 (>= 2.3.6-6) , libcommoncpp2-1.6-0 , libgsm1 (>=1.0.10) , libspeex1 (>=1.1.12) , libdbus-1-3, libasound2 (>= 1.0), libpulse0 (>= 0.9.6), libccrtp1-1.6-1, libspeexdsp1
 Replaces: sflphone
+Conflicts: sflphone
 Homepage: http://www.sflphone.org
-Description: SIP and IAX2 compatible softphone - application core 
+Description: SIP and IAX2 compatible softphone - Core 
  This package provides SFLphone daemon, that is the core of the application.
  SFLphone is meant to be a robust enterprise-class desktop phone.
  SFLphone is released under the GNU General Public License.
diff --git a/sflphone-common/debian/control.jaunty b/sflphone-common/debian/control.jaunty
index 063b8bfb82..67dc4c9070 100644
--- a/sflphone-common/debian/control.jaunty
+++ b/sflphone-common/debian/control.jaunty
@@ -10,8 +10,9 @@ Priority: optional
 Architecture: any
 Depends: libsamplerate0 (>=0.1.2) , libexpat1 , libc6 (>= 2.3.6-6) , libcommoncpp2-1.6-0  , libgsm1 (>=1.0.10) , libspeex1 (>=1.1.12) , libdbus-1-3, libasound2 (>= 1.0), libpulse0 (>= 0.9.6), libccrtp1-1.6-1, libspeexdsp1
 Replaces: sflphone
+Conflicts: sflphone
 Homepage: http://www.sflphone.org
-Description: SIP and IAX2 compatible softphone
+Description: SIP and IAX2 compatible softphone - Core
  SFLphone is meant to be a robust enterprise-class desktop phone.
  SFLphone is released under the GNU General Public License.
  SFLphone is being developed by the global community, and maintained by
-- 
GitLab