[Pkg-voip-commits] r6827 - in /linphone/trunk/debian: changelog control

[msp at alioth.debian.org]

Author: msp
Date: Thu Feb 26 20:46:12 2009
New Revision: 6827

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6827
Log:
Confilicts:/ Provides:/ Replaces:
libortp7-dev, liblinphone2-dev, libmediastreamer0-dev

Modified:
    linphone/trunk/debian/changelog
    linphone/trunk/debian/control

Modified: linphone/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/changelog?rev=6827&op=diff
==============================================================================
--- linphone/trunk/debian/changelog (original)
+++ linphone/trunk/debian/changelog Thu Feb 26 20:46:12 2009
@@ -10,7 +10,8 @@
   * Switch to cdbs
   * NEW packages libortp8, liblinphone3 - soname bump
   * NEW packages libortp-dev, liblinphone-dev, libmediastreamer-dev
-  * Provides/ Replaces: libortp7-dev, liblinphone2-dev, libmediastreamer0-dev
+  * Confilicts:/ Provides:/ Replaces:
+        libortp7-dev, liblinphone2-dev, libmediastreamer0-dev
   * Standards-Version: 3.8.0  - fixed by above
 
   * TODO: Awaiting ack from debian-release due to soname tranistion

Modified: linphone/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/control?rev=6827&op=diff
==============================================================================
--- linphone/trunk/debian/control (original)
+++ linphone/trunk/debian/control Thu Feb 26 20:46:12 2009
@@ -83,6 +83,7 @@
 Provides: liblinphone2-dev
 Replaces: liblinphone2-dev
 Depends: ${misc:Depends}, liblinphone3 (=${binary:Version}), libmediastreamer-dev, libortp-dev, libosip2-dev (>= 2.2.0), libjack0.100.0-dev, libspeex-dev, libsamplerate0-dev, libasound2-dev
+Conflicts: liblinphone2-dev
 Description: linphone web phone's library (supporting the SIP protocol)
  Linphone is a web phone: it lets you phone to your friends anywhere in the
  whole world, freely, simply by using the internet. It is compatible with the
@@ -119,6 +120,7 @@
 Provides: libmediastreamer0-dev
 Replaces: libmediastreamer0-dev
 Depends: ${misc:Depends}, libmediastreamer0 (=${binary:Version}), libartsc0-dev, libasound2-dev, libortp-dev, libspeex-dev
+Conflicts: libmediastreamer0-dev
 Description: linphone web phone's media library
  Linphone is a web phone: it lets you phone to your friends anywhere in the
  whole world, freely, simply by using the internet. It is compatible with the
@@ -153,7 +155,7 @@
 Provides: libortp7-dev
 Replaces: libortp7-dev
 Depends: ${misc:Depends}, libortp8 (=${binary:Version}), libglib2.0-dev
-Conflicts: libortp0-dev, libortp2-dev, libortp4-dev, libortp5-dev
+Conflicts: libortp7-dev
 Description: Real-time Transport Protocol stack
  This library implements the RFC1889 (RTP) with a easy to use API with high
  and low level access.