[Pkg-voip-commits] r7754 - in /opal/trunk/debian: changelog control

[dedu-guest at alioth.debian.org]

Author: dedu-guest
Date: Thu Nov  5 21:40:17 2009
New Revision: 7754

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7754
Log:
Remove some conflicts with non-official snapshot packages.

Modified:
    opal/trunk/debian/changelog
    opal/trunk/debian/control

Modified: opal/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/changelog?rev=7754&op=diff
==============================================================================
--- opal/trunk/debian/changelog (original)
+++ opal/trunk/debian/changelog Thu Nov  5 21:40:17 2009
@@ -1,6 +1,7 @@
 opal (3.6.6~dfsg-4) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * Remove some conflicts with non-official snapshot packages.
 
  -- Mark Purcell <msp at debian.org>  Mon, 12 Oct 2009 08:22:40 +1100
 

Modified: opal/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/control?rev=7754&op=diff
==============================================================================
--- opal/trunk/debian/control (original)
+++ opal/trunk/debian/control Thu Nov  5 21:40:17 2009
@@ -18,8 +18,8 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libspeex1, libspeexdsp1
-Conflicts: libopal-2.2-ptrace, libopal-2.2-develop, libopal-2.2.0, libopal-snapshot, libopal3.3-beta1
-Replaces: libopal-snapshot, libopal3.3-beta1
+Conflicts: libopal-2.2-ptrace, libopal-2.2-develop, libopal-2.2.0, libopal3.3-beta1
+Replaces: libopal3.3-beta1
 Description: Open Phone Abstraction Library - successor of OpenH323
  This package contains the shared version of the OPAL library.
  .
@@ -64,8 +64,8 @@
 Section: debug
 Priority: extra
 Depends: ${misc:Depends}, libopal3.6.6 (= ${binary:Version})
-Replaces: libopal-snapshot-dbg, libopal3.3-beta1-dbg
-Conflicts: libopal-snapshot-dbg, libopal3.3-beta1-dbg
+Replaces: libopal3.3-beta1-dbg
+Conflicts: libopal3.3-beta1-dbg
 Architecture: any
 Description: OPAL library debug symbols
  This package contains the shared and static debug symbols of the