[Pkg-voip-commits] r6388 - in /freepbx/branches/dbconfig-common/debian: control freepbx-common.postinst freepbx-mysql.dirs freepbx-mysql.install rules

[odd_bloke-guest at alioth.debian.org]

Author: odd_bloke-guest
Date: Wed Nov  5 15:54:29 2008
New Revision: 6388

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6388
Log:
Removed freepbx-mysql package.

Removed:
    freepbx/branches/dbconfig-common/debian/freepbx-mysql.dirs
    freepbx/branches/dbconfig-common/debian/freepbx-mysql.install
Modified:
    freepbx/branches/dbconfig-common/debian/control
    freepbx/branches/dbconfig-common/debian/freepbx-common.postinst
    freepbx/branches/dbconfig-common/debian/rules

Modified: freepbx/branches/dbconfig-common/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/branches/dbconfig-common/debian/control?rev=6388&op=diff
==============================================================================
--- freepbx/branches/dbconfig-common/debian/control (original)
+++ freepbx/branches/dbconfig-common/debian/control Wed Nov  5 15:54:29 2008
@@ -65,21 +65,13 @@
 Architecture: all
 Replaces: amportal-common, freepbx-modules
 Conflicts: amportal-common, freepbx-agi
-Depends: adduser, asterisk-config-freepbx, freepbx-database|freepbx-mysql, asterisk(>= 1.2) | asterisk1.2, httpd-cgi, libapache2-mod-php5|php5-cgi, php-db, php5-cli, php5-pear|php-pear, php-curl|php5-curl, libdbi-perl
+Depends: adduser, asterisk-config-freepbx, dbconfig-common, asterisk(>= 1.2) | asterisk1.2, httpd-cgi, libapache2-mod-php5|php5-cgi, php-db, php5-cli, php5-pear|php-pear, php-curl|php5-curl, libdbi-perl
 Description: FreePBX administration panel
  FreePBX (formally AMP) is a web-based GUI for Asterisk.
  This package contains the common files needed for freepbx, as well as the
  administration parts for Asterisk.
  By default the panel you get is pretty empty. You probably want to install
  some freepbx-modules or only the modules you want.
-
-Package: freepbx-mysql
-Architecture: all
-Depends: mysql5-server-5.0|mysql5-server-4.1|virtual-mysql-server, php5-mysql, libdbd-mysql-perl
-Provides: freepbx-database
-Description: FreePBX - MySQL (4 or 5) support
- MySQL support for freePBX. Support for MySQL 4.1 and MySQL 5.0. Compatible
- with PHP4 or PHP5.
 
 Package: freepbx-panel
 Architecture: all

Modified: freepbx/branches/dbconfig-common/debian/freepbx-common.postinst
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/branches/dbconfig-common/debian/freepbx-common.postinst?rev=6388&op=diff
==============================================================================
--- freepbx/branches/dbconfig-common/debian/freepbx-common.postinst (original)
+++ freepbx/branches/dbconfig-common/debian/freepbx-common.postinst Wed Nov  5 15:54:29 2008
@@ -45,7 +45,6 @@
 	# provided by upstream, instead of our own amportal.conf
 	sed -r -i "s|AMPWEBROOT=[a-zA-Z0-9/]*|AMPWEBROOT=/usr/share/freepbx|" /etc/amportal.conf
 	sed -r -i "s|AMPBIN=[a-zA-Z0-9/]*|AMPBIN=/usr/share/asterisk/bin|" /etc/amportal.conf
-	/usr/share/freepbx-common/install-sql
 	/usr/share/freepbx-common/install_amp --no-files
 
 	# apply new configuration

Modified: freepbx/branches/dbconfig-common/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/branches/dbconfig-common/debian/rules?rev=6388&op=diff
==============================================================================
--- freepbx/branches/dbconfig-common/debian/rules (original)
+++ freepbx/branches/dbconfig-common/debian/rules Wed Nov  5 15:54:29 2008
@@ -105,8 +105,6 @@
 	chmod +x debian/freepbx-common/usr/share/freepbx-common/freepbx-post-reload
 	chmod -x debian/freepbx-common/usr/share/freepbx-common/libfreepbx.install.php
 	chmod -x debian/freepbx-common/usr/share/asterisk/bin/libfreepbx.confgen.php
-	chmod +x debian/freepbx-mysql/usr/share/freepbx-common/remove-sql
-	chmod +x debian/freepbx-mysql/usr/share/freepbx-common/install-sql
 	cp debian/freepbx-common.lintian  $(CURDIR)/debian/freepbx-common/usr/share/lintian/overrides/freepbx-common
 	cp debian/asterisk-sounds-moh-freepbx.lintian  $(CURDIR)/debian/asterisk-sounds-moh-freepbx/usr/share/lintian/overrides/asterisk-sounds-moh-freepbx
 #	chmod +x debian/freepbx-common/usr/sbin/update-freepbx