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

[kilian at alioth.debian.org]

Author: kilian
Date: Tue Dec  4 15:53:52 2007
New Revision: 5025

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5025
Log:
* New upstream release.
* Conflict with libortp5-dev to fix conflicting file
  (/usr/include/ortp/event.h). (Closes: #454281)

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=5025&op=diff
==============================================================================
--- linphone/trunk/debian/changelog (original)
+++ linphone/trunk/debian/changelog Tue Dec  4 15:53:52 2007
@@ -1,3 +1,11 @@
+linphone (2.0.1-1) UNRELEASED; urgency=low
+
+  * 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
+
 linphone (2.0.0-1) unstable; urgency=low
 
   * New upstream release, closes: #453185.

Modified: linphone/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/control?rev=5025&op=diff
==============================================================================
--- linphone/trunk/debian/control (original)
+++ linphone/trunk/debian/control Tue Dec  4 15:53:52 2007
@@ -140,7 +140,7 @@
 Section: libdevel
 Architecture: any
 Depends: libortp7 (=${binary:Version}), libglib2.0-dev
-Conflicts: libortp0-dev, libortp2-dev, libortp4-dev
+Conflicts: libortp0-dev, libortp2-dev, libortp4-dev, libortp5-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.