[Pkg-voip-commits] r7752 - in /ptlib/trunk/debian: changelog control

[dedu-guest at alioth.debian.org]

Author: dedu-guest
Date: Thu Nov  5 21:36:43 2009
New Revision: 7752

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

Modified:
    ptlib/trunk/debian/changelog
    ptlib/trunk/debian/control

Modified: ptlib/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/trunk/debian/changelog?rev=7752&op=diff
==============================================================================
--- ptlib/trunk/debian/changelog (original)
+++ ptlib/trunk/debian/changelog Thu Nov  5 21:36:43 2009
@@ -1,3 +1,9 @@
+ptlib (2.6.5-2) unstable; urgency=low
+
+  * Remove some conflicts with non-official snapshot packages.
+
+ -- Mark Purcell <msp at debian.org>  Sat, 03 Oct 2009 17:11:51 +1000
+
 ptlib (2.6.5-1) unstable; urgency=low
 
   * New upstream release

Modified: ptlib/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/trunk/debian/control?rev=7752&op=diff
==============================================================================
--- ptlib/trunk/debian/control (original)
+++ ptlib/trunk/debian/control Thu Nov  5 21:36:43 2009
@@ -26,7 +26,7 @@
 Depends: ${shlibs:Depends}
 Suggests: libpt2.6.5-plugins
 Replaces: libpt-snapshot, libpt2.3-beta1
-Conflicts: libpt-snapshot, libpt2.3-beta1
+Conflicts: libpt2.3-beta1
 Description: Portable Tools Library
  This package contains the shared version of the library PTLib, which is
  a moderately large class library that has its genesis many years ago as
@@ -50,7 +50,7 @@
 Architecture: any
 Depends: libpt2.6.5 (= ${binary:Version})
 Replaces: libpt-snapshot-dbg, libpt2.3-beta1-dbg
-Conflicts: libpt-snapshot-dbg, libpt2.3-beta1-dbg
+Conflicts: libpt2.3-beta1-dbg
 Description: Portable Tools Library development debug files
  This package contains the shared and static debug symbols of the library
  PTLib, which is a moderately large class library that has its genesis