[Pkg-voip-commits] r2425 - ari/trunk/debian

[Chris Halls]

Author: halls
Date: 2006-09-25 08:40:20 +0000 (Mon, 25 Sep 2006)
New Revision: 2425

Modified:
   ari/trunk/debian/control
   ari/trunk/debian/rules
Log:
* Fix circular dependency in debian/rules, configure <--> configure-stamp
* Correct spelling of libapache2-mod-php4 dependency
* Correct syntax of amportal-vmail conflict


Modified: ari/trunk/debian/control
===================================================================
--- ari/trunk/debian/control	2006-09-25 05:22:12 UTC (rev 2424)
+++ ari/trunk/debian/control	2006-09-25 08:40:20 UTC (rev 2425)
@@ -8,8 +8,8 @@
 
 Package: ari
 Architecture: all
-Depends: asterisk, httpd-cgi, libapache-mod-php4|libapahce2-mod-php4|php4-cgi, php4-pear, debconf
-Conflicts: amportal-vmail < 2.0.0
+Depends: asterisk, httpd-cgi, libapache-mod-php4 | libapache2-mod-php4 | php4-cgi, php4-pear, debconf
+Conflicts: amportal-vmail (<< 2.0.0)
 Description: a web based Recording interface for the Asterisk PBX
  ARI (Asterisk Recording Inteface) is a user centric portal to the 
  Asterisk PBX Software. It provides a user friendly web interface to 

Modified: ari/trunk/debian/rules
===================================================================
--- ari/trunk/debian/rules	2006-09-25 05:22:12 UTC (rev 2424)
+++ ari/trunk/debian/rules	2006-09-25 08:40:20 UTC (rev 2425)
@@ -27,8 +27,8 @@
 	CFLAGS += -O2
 endif
 
-configure: patch configure-stamp
-configure-stamp: configure
+configure: configure-stamp
+configure-stamp: patch
 	dh_testdir
 	touch configure-stamp