[Pkg-voip-commits] r6373 - in /freepbx/trunk/debian: README README.Debian changelog control freepbx-sqlite3.dirs freepbx-sqlite3.install patches/remove-sqlite patches/series rules sqlite3/
odd_bloke-guest at alioth.debian.org
odd_bloke-guest at alioth.debian.org
Thu Oct 30 16:11:26 UTC 2008
Author: odd_bloke-guest
Date: Thu Oct 30 16:11:26 2008
New Revision: 6373
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6373
Log:
Removed sqlite3 support.
Added:
freepbx/trunk/debian/patches/remove-sqlite
Removed:
freepbx/trunk/debian/freepbx-sqlite3.dirs
freepbx/trunk/debian/freepbx-sqlite3.install
freepbx/trunk/debian/sqlite3/
Modified:
freepbx/trunk/debian/README
freepbx/trunk/debian/README.Debian
freepbx/trunk/debian/changelog
freepbx/trunk/debian/control
freepbx/trunk/debian/patches/series
freepbx/trunk/debian/rules
Modified: freepbx/trunk/debian/README
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/README?rev=6373&op=diff
==============================================================================
--- freepbx/trunk/debian/README (original)
+++ freepbx/trunk/debian/README Thu Oct 30 16:11:26 2008
@@ -33,6 +33,5 @@
Examples:
apt-get install freepbx (install all freepbx)
- apt-get install freepbx-sqlite3 freepbx-common (bare minimum, with sqlite3 backend)
Diego Iastrubni <diego.iastrubni at xorcom.com>
Modified: freepbx/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/README.Debian?rev=6373&op=diff
==============================================================================
--- freepbx/trunk/debian/README.Debian (original)
+++ freepbx/trunk/debian/README.Debian Thu Oct 30 16:11:26 2008
@@ -8,11 +8,6 @@
If you just want the dialing plans FreePBX provides, you can
apt-get install asterisk-config-freepbx freepbx-common
-
-
-If you want install freepbx with the sqlite3 backend:
-
- apt-get install freepbx-sqlite3 asterisk-config-freepbx freepbx-common
Pakcages removed from the freepbx-modules meta package:
@@ -31,9 +26,9 @@
Note for packagers
------------------
-The vitual package "freepbx-database" is currently provided by 2 different packages:
-freepbx-mysql, freepbx-sqlite3. If you want to make another SQL backend (assuming it's
-supported by the source), the package must provide:
+The vitual package "freepbx-database" is currently provided by only one package,
+freepbx-mysql. If you want to make another SQL backend (assuming it's supported
+by the source), the package must provide:
/usr/share/freepbx-common/install-db
a script for installing the default DB to be used by freepbx
@@ -44,8 +39,8 @@
/usr/share/freepbx-common/amportal.conf
a default configuration for freepbx, which uses this DB
-The pavcage should provide "freepbx-database", and if possible should replace
-freepbx-mysql and freepbx-sqlite3.
+The package should provide "freepbx-database", and if possible should replace
+freepbx-mysql.
@@ -81,7 +76,7 @@
------------------------
The main freepbx package. Contains the core module, and is the smaller package
which can be installed which gives a working set of configuration. It depends
-on a SQL backend (currently freepbx-mysql or freepbx-sqlite3).
+on a SQL backend (currently freepbx-mysql).
When the user presses a red bar at the top of the screen, a post reload script
is executed. By default FreePBX will execute all the scripts found in
@@ -103,12 +98,6 @@
this is suported as well.
-Package: freepbx-sqlite3
-------------------------
-SQLite3 support for freePBX. If you install this package, freePBX will store it's configuration
-in a local SQLite3 file (usually localted in /var/lib/asterisk/freepbx.db).
-
-
Package: freepbx-panel
-----------------------
Flash operator panel. For more information about FOP please visit:
Modified: freepbx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/changelog?rev=6373&op=diff
==============================================================================
--- freepbx/trunk/debian/changelog (original)
+++ freepbx/trunk/debian/changelog Thu Oct 30 16:11:26 2008
@@ -27,12 +27,13 @@
* Added lintian override to asterisk-sounds-moh-freepbx as the .sln files in
question are Asterisk sound files rather than Windows development files.
* Added manpage for update-freepbx.
+ * Removed non-functional sqlite3 support.
[ Tzafrir Cohen ]
* Add Daniel Watkins as an uploader, and remove Diego.
* Standards version 3.8.0 . No change needed.
- -- Daniel Watkins <daniel.watkins at credativ.co.uk> Thu, 30 Oct 2008 10:27:03 +0000
+ -- Daniel Watkins <daniel.watkins at credativ.co.uk> Thu, 30 Oct 2008 16:10:55 +0000
freepbx (2.4.0~dfsg-1) UNRELEASED; urgency=low
Modified: freepbx/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/control?rev=6373&op=diff
==============================================================================
--- freepbx/trunk/debian/control (original)
+++ freepbx/trunk/debian/control Thu Oct 30 16:11:26 2008
@@ -77,20 +77,9 @@
Architecture: all
Depends: mysql5-server-5.0|mysql5-server-4.1|virtual-mysql-server, php5-mysql, libdbd-mysql-perl
Provides: freepbx-database
-Conflicts: freepbx-sqlite3
-Replaces: freepbx-sqlite3
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-sqlite3
-Architecture: all
-Depends: sqlite3, libapache2-mod-php5 | php5-cgi | php-cgi, php5-sqlite, libdbd-sqlite3-perl
-Conflicts: freepbx-mysql
-Replaces: freepbx-mysql
-Provides: freepbx-database
-Description: FreePBX - SQLite3 support
- SQLite3 support for freePBX. Compatible with PHP5 only.
Package: freepbx-panel
Architecture: all
Added: freepbx/trunk/debian/patches/remove-sqlite
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/remove-sqlite?rev=6373&op=file
==============================================================================
--- freepbx/trunk/debian/patches/remove-sqlite (added)
+++ freepbx/trunk/debian/patches/remove-sqlite Thu Oct 30 16:11:26 2008
@@ -1,0 +1,106 @@
+Index: freepbx-2.5.1~dfsg/install_amp
+===================================================================
+--- freepbx-2.5.1~dfsg.orig/install_amp 2008-10-30 15:54:19.000000000 +0000
++++ freepbx-2.5.1~dfsg/install_amp 2008-10-30 15:56:46.000000000 +0000
+@@ -960,24 +960,7 @@
+ break;
+
+ case "sqlite3":
+- if (!isset($amp_conf["AMPDBFILE"]))
+- die("You must setup properly AMPDBFILE in /etc/amportal.conf");
+-
+- if (isset($amp_conf["AMPDBFILE"]) == "")
+- die("AMPDBFILE in /etc/amportal.conf cannot be blank");
+-
+- /* on centos this extension is not loaded by default */
+- if (! extension_loaded('sqlite3.so') && ! extension_loaded('SQLITE3'))
+- dl('sqlite3.so');
+-
+- if (! @require_once('DB/sqlite3.php') )
+- {
+- out("FAILED");
+- fatal( "Your PHP installation has no PEAR/SQLite3 support. Please install php-sqlite3 and php-pear.");
+- }
+-
+- $datasource = "sqlite3:///" . $amp_conf["AMPDBFILE"] . "?mode=0666";
+- $db = DB::connect($datasource);
++ die_freepbx("SQLite3 support is not currently available in Debian.");
+ break;
+
+ default:
+Index: freepbx-2.5.1~dfsg/amportal.conf
+===================================================================
+--- freepbx-2.5.1~dfsg.orig/amportal.conf 2008-10-30 15:57:08.000000000 +0000
++++ freepbx-2.5.1~dfsg/amportal.conf 2008-10-30 15:57:24.000000000 +0000
+@@ -200,7 +200,7 @@
+ # less frequently (such as Astersisk Uptime) based on the INFO value
+
+ # FOPDISABLE=true|false # DEFAULT VALUE false
+-# Disables FOP in interface and retrieve_conf. Usefull for sqlite3 or if you don't want FOP.
++# Disables FOP in interface and retrieve_conf. Useful if you don't want FOP.
+
+ # ZAP2DAHDICOMPAT=true|false
+ # DEFAULT VALUE: false
+Index: freepbx-2.5.1~dfsg/amp_conf/htdocs/admin/common/db_connect.php
+===================================================================
+--- freepbx-2.5.1~dfsg.orig/amp_conf/htdocs/admin/common/db_connect.php 2008-10-30 15:58:20.000000000 +0000
++++ freepbx-2.5.1~dfsg/amp_conf/htdocs/admin/common/db_connect.php 2008-10-30 15:59:42.000000000 +0000
+@@ -36,27 +36,7 @@
+ break;
+
+ case "sqlite3":
+- if (!isset($amp_conf["AMPDBFILE"]))
+- die_freepbx("You must setup properly AMPDBFILE in /etc/amportal.conf");
+-
+- if (isset($amp_conf["AMPDBFILE"]) == "")
+- die_freepbx("AMPDBFILE in /etc/amportal.conf cannot be blank");
+-
+- /* on centos this extension is not loaded by default */
+- if (! extension_loaded('sqlite3') && ! extension_loaded('SQLITE3'))
+- dl('sqlite3.so');
+-
+- if (! @require_once('DB/sqlite3.php') )
+- {
+- die_freepbx("Your PHP installation has no PEAR/SQLite3 support. Please install php-sqlite3 and php-pear.");
+- }
+-
+- $datasource = "sqlite3:///" . $amp_conf["AMPDBFILE"] . "?mode=0666";
+- $options = array(
+- 'debug' => 4,
+- 'portability' => DB_PORTABILITY_NUMROWS
+- );
+- $db = DB::connect($datasource, $options);
++ die_freepbx("SQLite3 support is not currently available in Debian.");
+ break;
+
+ default:
+Index: freepbx-2.5.1~dfsg/amp_conf/bin/retrieve_conf
+===================================================================
+--- freepbx-2.5.1~dfsg.orig/amp_conf/bin/retrieve_conf 2008-10-30 16:01:28.000000000 +0000
++++ freepbx-2.5.1~dfsg/amp_conf/bin/retrieve_conf 2008-10-30 16:01:59.000000000 +0000
+@@ -238,24 +238,7 @@
+ break;
+
+ case "sqlite3":
+- if (!isset($amp_conf["AMPDBFILE"]))
+- fatal("You must setup properly AMPDBFILE in $amportalconf");
+-
+- if (isset($amp_conf["AMPDBFILE"]) == "")
+- fatal("AMPDBFILE in $amportalconf cannot be blank");
+-
+- /* on centos this extension is not loaded by default */
+- if (! extension_loaded('sqlite3.so') && ! extension_loaded('SQLITE3'))
+- dl('sqlite3.so');
+-
+- if (! @require_once('DB/sqlite3.php') )
+- {
+- die_freepbx("Your PHP installation has no PEAR/SQLite3 support. Please install php-sqlite3 and php-pear.");
+- }
+-
+- require_once('DB/sqlite3.php');
+- $datasource = "sqlite3:///" . $amp_conf["AMPDBFILE"] . "?mode=0666";
+- $db = DB::connect($datasource);
++ die_freepbx("SQLite3 support is not currently available in Debian.");
+ break;
+
+ default:
Modified: freepbx/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/series?rev=6373&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/series (original)
+++ freepbx/trunk/debian/patches/series Thu Oct 30 16:11:26 2008
@@ -16,3 +16,4 @@
noisy_fail_mod_msg
sqlite-no-dl
+debian/patches/remove-sqlite
Modified: freepbx/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/rules?rev=6373&op=diff
==============================================================================
--- freepbx/trunk/debian/rules (original)
+++ freepbx/trunk/debian/rules Thu Oct 30 16:11:26 2008
@@ -105,8 +105,8 @@
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-{sqlite3,mysql}/usr/share/freepbx-common/remove-sql
- chmod +x debian/freepbx-{sqlite3,mysql}/usr/share/freepbx-common/install-sql
+ 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
More information about the Pkg-voip-commits
mailing list