[Pkg-voip-commits] r3046 - in freepbx/trunk/debian: . contrib/template/debian

[Diego Iastrubni]

Author: elcuco-guest
Date: 2007-01-21 18:38:17 +0100 (Sun, 21 Jan 2007)
New Revision: 3046

Modified:
   freepbx/trunk/debian/changelog
   freepbx/trunk/debian/contrib/template/debian/control
   freepbx/trunk/debian/contrib/template/debian/postinst
   freepbx/trunk/debian/freepbx-admin.postinst
Log:
lintian fixes (shouts less on etch)
work arround bug 1694 upstream



Modified: freepbx/trunk/debian/changelog
===================================================================
--- freepbx/trunk/debian/changelog	2007-01-20 23:33:34 UTC (rev 3045)
+++ freepbx/trunk/debian/changelog	2007-01-21 17:38:17 UTC (rev 3046)
@@ -2,6 +2,8 @@
 
   * New upstream release
   * Lets use the new ugly debian scheme for versions
+  * freepbx-admin: applied a patch to fix a bug in enum lookups
+  * freepbx-admin: added a workarround for upstream bug 1694 (fixed upstream already)
 
  -- Diego Iastrubni <diego.iastrubni at xorcom.com>  Wed, 10 Jan 2007 18:00:00 +0200
 

Modified: freepbx/trunk/debian/contrib/template/debian/control
===================================================================
--- freepbx/trunk/debian/contrib/template/debian/control	2007-01-20 23:33:34 UTC (rev 3045)
+++ freepbx/trunk/debian/contrib/template/debian/control	2007-01-21 17:38:17 UTC (rev 3046)
@@ -3,10 +3,10 @@
 Priority: optional
 Maintainer: Diego Iastrubni <diego.iastrubni at xorcom.com>
 Uploaders: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-Build-Depends-Indep: debhelper (>= 4.0.0)
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>= 4.0.0)
+Standards-Version: 3.7.2
 
-Package: freepbx-module@@RAWNAME@@
+Package: freepbx-module-@@RAWNAME@@
 Architecture: all
 Depends:  freepbx-admin
 Description: FreePBX module: @@NAME@@

Modified: freepbx/trunk/debian/contrib/template/debian/postinst
===================================================================
--- freepbx/trunk/debian/contrib/template/debian/postinst	2007-01-20 23:33:34 UTC (rev 3045)
+++ freepbx/trunk/debian/contrib/template/debian/postinst	2007-01-21 17:38:17 UTC (rev 3046)
@@ -19,7 +19,7 @@
 
 case "$1" in
     configure)
-	/usr/share/freepbx-common/freepbx-module-status enable @@RAWNAME@@
+	/usr/share/asterisk/bin/module_admin enable @@RAWNAME@@ || echo "Continuing anyway"
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: freepbx/trunk/debian/freepbx-admin.postinst
===================================================================
--- freepbx/trunk/debian/freepbx-admin.postinst	2007-01-20 23:33:34 UTC (rev 3045)
+++ freepbx/trunk/debian/freepbx-admin.postinst	2007-01-21 17:38:17 UTC (rev 3046)
@@ -63,8 +63,8 @@
 			
 			# do the updates needed
 			if /usr/share/freepbx-common/install_amp --no-files ; then
-			# if it works, enable the core module
-			        /usr/share/asterisk/bin/module_admin install core
+				# if it works, enable the core module
+			        /usr/share/asterisk/bin/module_admin install core || echo "Continuing anyway"
 			else
 				# this may fail for so many reasons... let the user do it itself 
 				# after the package has been installed
@@ -74,7 +74,7 @@
 	
 You may want also to enable the code module using this command 
 (this can be done from the GUI as well):
-	/usr/share/freepbx-common/freepbx-module-status enable core	
+	/usr/share/asterisk/bin/module_admin install core
 "
 			fi
 		else
@@ -89,7 +89,7 @@
 			if [ -x "$MYSQLADMIN" ]; then
 				echo "Installing FreePBX using a local MySQL server"
 				/usr/share/freepbx-common/freepbx-install-mysql.sh
-			        /usr/share/asterisk/bin/module_admin install core
+			        /usr/share/asterisk/bin/module_admin install core || echo "Continuing anyway"
 			else
 				SQLITE=`which sqlite` || true
 				if [ -x "$SQLITE" ]; then
@@ -99,7 +99,7 @@
 					echo "AMPDBENGINE=sqlite"					>> /etc/amportal.conf
 					echo "AMPDBFILE=/var/lib/asterisk/freepbx.sqlite"		>> /etc/amportal.conf
 					/usr/share/freepbx-common/freepbx-install-sqlite.sh
-	        			/usr/share/asterisk/bin/module_admin install core		    
+	        			/usr/share/asterisk/bin/module_admin install core || echo "Continuing anyway"
 				else
 					echo "No suitable SQL server found on this machine."
 					echo "Please edit manually /etc/amportal.conf"