[Pkg-voip-commits] r1958 - destar/trunk/debian

[Alejandro Rios P.]

Author: alerios-guest
Date: 2006-06-27 04:25:36 +0000 (Tue, 27 Jun 2006)
New Revision: 1958

Modified:
   destar/trunk/debian/changelog
   destar/trunk/debian/control
Log:
* Added "Conflicts: freepbx" on control file


Modified: destar/trunk/debian/changelog
===================================================================
--- destar/trunk/debian/changelog	2006-06-26 20:30:29 UTC (rev 1957)
+++ destar/trunk/debian/changelog	2006-06-27 04:25:36 UTC (rev 1958)
@@ -2,6 +2,7 @@
 
   * NOT RELEASED YET
   * New upstream release. (Closes: #374718)
+  * Added "Conflicts: freepbx" on control file
 
  -- Alejandro Rios P. <alejandro.rios at avatar.com.co>  Sun, 18 Jun 2006 11:36:48 -0500
 

Modified: destar/trunk/debian/control
===================================================================
--- destar/trunk/debian/control	2006-06-26 20:30:29 UTC (rev 1957)
+++ destar/trunk/debian/control	2006-06-27 04:25:36 UTC (rev 1958)
@@ -11,6 +11,7 @@
 Architecture: all
 Depends: ${python:Depends}, quixote1 (>= 1.2-1),  python-medusa, asterisk  
 Recommends: python-pysqlite2 | python-sqlite, sqlite, python-pychart
+Conflicts: freepbx
 Description: management interface for the Asterisk PBX
  A web-based interface to manage the Asterisk BPX. It provides high-level 
  abstraction of the Asterisk configuration.