[Pkg-voip-commits] r5952 - in /asterisk/trunk/debian: changelog control

[msp at alioth.debian.org]

Author: msp
Date: Wed Jul 16 09:24:58 2008
New Revision: 5952

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5952
Log:
Conflicts:/ Replaces: asterisk (<< 1:1.4.21.1~dfsg-1)

Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/control

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=5952&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Wed Jul 16 09:24:58 2008
@@ -1,9 +1,13 @@
 asterisk (1:1.4.21.1~dfsg-1) UNRELEASED; urgency=low
 
+  [ Tzafrir Cohen ]
   * New upstream bugfix release.
   * Fix get-orig-source target to remove temporary files left in that tarball.
   * The asterisk.h symlink moved to asterisk-dev where it should be.
   * Hence asterisk-dev now conflicts with older asterisk.
+
+  [ Mark Purcell ]
+  * Conflicts:/ Replaces: asterisk (<< 1:1.4.21.1~dfsg-1)
 
  -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Mon, 30 Jun 2008 20:46:07 +0300
 

Modified: asterisk/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/control?rev=5952&op=diff
==============================================================================
--- asterisk/trunk/debian/control (original)
+++ asterisk/trunk/debian/control Wed Jul 16 09:24:58 2008
@@ -76,7 +76,8 @@
 Recommends: asterisk
 Section: devel
 Priority: extra
-Conflicts: asterisk (<= 1:1.4.21.1~dfsg-1)
+Conflicts: asterisk (<< 1:1.4.21.1~dfsg-1)
+Replaces: asterisk (<< 1:1.4.21.1~dfsg-1)
 Description: Development files for Asterisk
  Asterisk is an Open Source PBX and telephony toolkit.
  .