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

[smimram at alioth.debian.org]

Author: smimram
Date: Wed Dec  5 11:25:43 2007
New Revision: 5042

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5042
Log:
Uploading.

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=5042&op=diff
==============================================================================
--- linphone/trunk/debian/changelog (original)
+++ linphone/trunk/debian/changelog Wed Dec  5 11:25:43 2007
@@ -1,10 +1,14 @@
-linphone (2.0.1-1) UNRELEASED; urgency=low
-
+linphone (2.0.1-1) unstable; urgency=low
+
+  [ Kilian Krause ]
   * New upstream release.
   * Conflict with libortp5-dev to fix conflicting file
     (/usr/include/ortp/event.h). (Closes: #454281)
 
- -- Kilian Krause <kilian at debian.org>  Tue,  4 Dec 2007 16:52:34 +0100
+  [ Samuel Mimram ]
+  * liblinphone2-dev conflicts with liblinphone1-dev.
+
+ -- Samuel Mimram <smimram at debian.org>  Wed, 05 Dec 2007 11:24:25 +0000
 
 linphone (2.0.0-1) unstable; urgency=low
 

Modified: linphone/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/control?rev=5042&op=diff
==============================================================================
--- linphone/trunk/debian/control (original)
+++ linphone/trunk/debian/control Wed Dec  5 11:25:43 2007
@@ -73,7 +73,7 @@
 Section: libdevel
 Architecture: any
 Depends: liblinphone2 (=${binary:Version}), libmediastreamer0-dev, libortp7-dev, libosip2-dev (>= 2.2.0), libjack0.100.0-dev, libspeex-dev, libsamplerate0-dev, libasound2-dev
-Conflicts: liblinphone0-dev
+Conflicts: liblinphone0-dev, liblinphone1-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