[Pkg-voip-commits] r4152 - asterisk1.2/trunk/debian

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: 2007-08-19 20:59:36 +0000 (Sun, 19 Aug 2007)
New Revision: 4152

Modified:
   asterisk1.2/trunk/debian/changelog
   asterisk1.2/trunk/debian/control
Log:
Allow some extra conflicts to allow upgrading from old asterisk 1.2 packages.


Modified: asterisk1.2/trunk/debian/changelog
===================================================================
--- asterisk1.2/trunk/debian/changelog	2007-08-19 19:45:12 UTC (rev 4151)
+++ asterisk1.2/trunk/debian/changelog	2007-08-19 20:59:36 UTC (rev 4152)
@@ -19,8 +19,10 @@
   * Add a -dbg package.
   * Set compat to 5 for this to work.
   * stereorize.1: fix typos.
+  * Allow some extra conflicts to allow upgrading from old asterisk 1.2
+    packages.
 
- -- Kilian Krause <kilian at debian.org>  Sat, 18 Aug 2007 21:53:25 +0200
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sun, 19 Aug 2007 23:57:51 +0300
 
 asterisk (1:1.2.16~dfsg-1) unstable; urgency=high
 

Modified: asterisk1.2/trunk/debian/control
===================================================================
--- asterisk1.2/trunk/debian/control	2007-08-19 19:45:12 UTC (rev 4151)
+++ asterisk1.2/trunk/debian/control	2007-08-19 20:59:36 UTC (rev 4152)
@@ -13,7 +13,7 @@
 Section: comm
 Depends: asterisk1.2-classic (>= ${source:Version}) | asterisk1.2-bristuff (>= ${source:Version}), adduser (>= 3.63)
 Conflicts: asterisk-oh323 (<= 0.6.6pre3-3), asterisk, asterisk-classic, asterisk-bristuff
-Replaces: asterisk
+Replaces: asterisk, asterisk-classic, asterisk-bristuff
 Provides: asterisk
 Suggests: ekiga, ohphone, kphone, asterisk1.2-doc, asterisk1.2-dev, asterisk-rate-engine
 Description: Open Source Private Branch Exchange (PBX)
@@ -43,7 +43,7 @@
 Architecture: any
 Section: comm
 Depends: ${shlibs:Depends}, asterisk1.2 (= ${source:Version}), asterisk1.2-config (= ${source:Version}) | asterisk-config-custom, adduser (>= 3.63), asterisk1.2-sounds-main (>= 1:1.0.2)
-Conflicts: asterisk1.2-bristuff, asterisk-classic
+Conflicts: asterisk1.2-bristuff, asterisk-bristuff, asterisk-classic
 Replaces: asterisk-classic
 Description: Open Source Private Branch Exchange (PBX) - original Digium version
  Asterisk is an Open Source PBX and telephony toolkit.  It is, in a
@@ -72,7 +72,7 @@
 Architecture: any
 Section: comm
 Depends: ${shlibs:Depends}, asterisk1.2 (= ${source:Version}), asterisk1.2-config (= ${source:Version}) | asterisk-config-custom, adduser (>= 3.63), asterisk1.2-sounds-main (>= 1:1.0.2)
-Conflicts: asterisk1.2-classic, asterisk-bristuff
+Conflicts: asterisk1.2-classic, asterisk-bristuff, asterisk-classic
 Replaces: asterisk-bristuff
 Description: Open Source Private Branch Exchange (PBX) - BRIstuff-enabled version
  Asterisk is an Open Source PBX and telephony toolkit.  It is, in a