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

[kilian at alioth.debian.org]

Author: kilian
Date: Sun May 10 21:27:21 2009
New Revision: 7198

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7198
Log:
linphone: Fix file conflict with linphone-common (<= 3.1.1)

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=7198&op=diff
==============================================================================
--- linphone/trunk/debian/changelog (original)
+++ linphone/trunk/debian/changelog Sun May 10 21:27:21 2009
@@ -1,11 +1,10 @@
 linphone (3.1.2-2) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
 
   * Remove -N from wget args in get-orig-source target as -O is already
     used.
-
- -- Kilian Krause <kilian at debian.org>  Sat, 09 May 2009 23:36:38 +0200
+  * linphone: Fix file conflict with linphone-common (<= 3.1.1)
+
+ -- Kilian Krause <kilian at debian.org>  Sun, 10 May 2009 23:26:38 +0200
 
 linphone (3.1.2-1) unstable; urgency=low
 

Modified: linphone/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/control?rev=7198&op=diff
==============================================================================
--- linphone/trunk/debian/control (original)
+++ linphone/trunk/debian/control Sun May 10 21:27:21 2009
@@ -18,6 +18,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, linphone-nox (=${binary:Version})
 Suggests: yelp
+Conflicts: linphone-common (<= 3.1.1)
 Description: SIP softphone - graphical client
  Linphone is a is an audio and video internet phone using the SIP protocol. It 
  has a GTK+ and console interface, includes a large variety of audio and video