[Pkg-voip-commits] r3209 - in freepbx/trunk/debian: . patches rapid

Diego Iastrubni elcuco-guest at alioth.debian.org
Thu Mar 8 11:33:25 CET 2007 

Author: elcuco-guest
Date: 2007-03-08 10:33:22 +0000 (Thu, 08 Mar 2007)
New Revision: 3209

Removed:
   freepbx/trunk/debian/patches/fix-enums.dpatch
   freepbx/trunk/debian/patches/fix-warning-sqlite.dpatch
   freepbx/trunk/debian/rapid/upgrades/
Modified:
   freepbx/trunk/debian/TODO.Debian
   freepbx/trunk/debian/asterisk-sounds-moh-freepbx.install
   freepbx/trunk/debian/changelog
   freepbx/trunk/debian/control
   freepbx/trunk/debian/freepbx-admin.install
   freepbx/trunk/debian/patches/00list
   freepbx/trunk/debian/patches/fix-module_admin.dpatch
   freepbx/trunk/debian/rules
Log:
new upstream release. lets change some things:

 * polished the patches to work with the new version, and removed obsolete ones.
 * sqlite2 is obsolete. it does not work, and i do not support it. (since i am the only programmer of this code, i can decide this). sqlite3 ownz you 
all anyway. 
 * get-orig-source cleans the upstream tarball much nicer now: op-panel and ari are no longer on the source. they already have their own packages.
 * music on hold is not generated by the get-orig-source, now the files are *.sln, and packaged by upstream.
 * removed obsolete upgrades from the 1.0.10 era.

todo:
 * generate random passwords for the manager and mysql
 * make a new virtual package freepbx-database. this will be provided by freepbx-mysql4, freepbx-mysql5, and freepbx-sqlite3. i hope this will clean up 
the mess in the control file a little bit. i hope.
 * remove the files in the rapi directory down to the debian directory.
 * get rich



Modified: freepbx/trunk/debian/TODO.Debian
===================================================================
--- freepbx/trunk/debian/TODO.Debian	2007-03-07 15:18:01 UTC (rev 3208)
+++ freepbx/trunk/debian/TODO.Debian	2007-03-08 10:33:22 UTC (rev 3209)
@@ -1,5 +1,3 @@
 * more testing 
-* finish the support for sqlite (migrate to sqlite3...?)
-* test other http servers, mathopd is supported, but new httpd servers are welcomed
 * find a more generic way of dialing with httpd servers and sql servers
 * find a way to remove the www-data from the group asterisk  (ari is the problem right now)

Modified: freepbx/trunk/debian/asterisk-sounds-moh-freepbx.install
===================================================================
--- freepbx/trunk/debian/asterisk-sounds-moh-freepbx.install	2007-03-07 15:18:01 UTC (rev 3208)
+++ freepbx/trunk/debian/asterisk-sounds-moh-freepbx.install	2007-03-08 10:33:22 UTC (rev 3209)
@@ -1 +1 @@
-amp_conf/mohmp3/*.wav			usr/share/asterisk/mohwav/
+amp_conf/mohmp3/*.sln			usr/share/asterisk/mohwav/

Modified: freepbx/trunk/debian/changelog
===================================================================
--- freepbx/trunk/debian/changelog	2007-03-07 15:18:01 UTC (rev 3208)
+++ freepbx/trunk/debian/changelog	2007-03-08 10:33:22 UTC (rev 3209)
@@ -1,3 +1,15 @@
+freepbx (2.2.1~dfsg-1) UNRELEASED; urgency=low
+
+  [ Diego Iastrubni ]
+  * New upstream release
+  * SQLite2 is deprecated, SQLite3 and MySQL are supported.
+  * Source cleanup: ari and op-panel are no longer on the source tree 
+    (same for cdr code which was not free by dfsg)
+  * Removed obsolete updates from 1.0.10
+  * asterisk-sounds-moh-freepbx: files are now *.sln, packaged by upstream
+
+ -- Diego Iastrubni <diego.iastrubni at xorcom.com>  Thu,  8 Mar 2007 11:03:32 +0200
+
 freepbx (2.2.0~dfsg-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET

Modified: freepbx/trunk/debian/control
===================================================================
--- freepbx/trunk/debian/control	2007-03-07 15:18:01 UTC (rev 3208)
+++ freepbx/trunk/debian/control	2007-03-08 10:33:22 UTC (rev 3209)
@@ -69,17 +69,9 @@
  mysql and mathopd, using php-cgi.
  Please install this package before installing freepbx-admin.
  
-Package: freepbx-mathopd-sqlite
-Architecture: all
-Depends: mathopd, php5-cgi|php4-cgi, sqlite, php5-sqlite|php4-sqlite 
-Description: FreePBX - mathopd+sqlite support package
- Dummy package to install all packages needed for installing FreePBX with 
- mathopd and sqlite.
- Please install this package before installing freepbx-admin.
-
 Package: freepbx-mathopd-sqlite3
 Architecture: all
-Depends: mathopd, php5-cgi|php4-cgi, sqlite3, php5-sqlite3|php4-sqlite
+Depends: mathopd, php5-cgi|php4-cgi, sqlite3, php5-sqlite3
 Description: FreePBX - mathopd+sqlite3 support package
  Dummy package to install all packages needed for installing FreePBX with 
  mathopd and sqlite.
@@ -156,7 +148,7 @@
 Architecture: all
 Replaces: amportal-common, freepbx-module-core
 Conflicts: amportal-common, freepbx-module-core, freepbx-vmail
-Depends: adduser, asterisk-config-freepbx, asterisk(>= 1.2), apache|apache2|mathopd, libapache-mod-php4|libapache2-mod-php4|libapache2-mod-php5|php5-cgi|php4-cgi, mysql-server|virtual-mysql-server|sqlite|sqlite3, php-db|php4-pear(<< 4:4.4.0-0), php5-mysql|php4-mysql|php5|sqlite3|php5-sqlite3|php4-sqlite, php5-cli|php4-cli, php5-pear|php-pear|php4-pear, libdbi-perl
+Depends: adduser, asterisk-config-freepbx, asterisk(>= 1.2), apache|apache2|httpd-cgi, libapache-mod-php4|libapache2-mod-php4|libapache2-mod-php5|php5-cgi|php4-cgi, mysql-server|virtual-mysql-server|sqlite3, php-db|php4-pear(<< 4:4.4.0-0), php5-mysql|php4-mysql|php5|sqlite3|php5-sqlite3, php5-cli|php4-cli, php5-pear|php-pear|php4-pear, 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 

Modified: freepbx/trunk/debian/freepbx-admin.install
===================================================================
--- freepbx/trunk/debian/freepbx-admin.install	2007-03-07 15:18:01 UTC (rev 3208)
+++ freepbx/trunk/debian/freepbx-admin.install	2007-03-08 10:33:22 UTC (rev 3209)
@@ -25,7 +25,6 @@
 SQL/*.sql						usr/share/freepbx-common/sql/
 debian/rapid/newinstall.sqlite3.sql			usr/share/freepbx-common/sql/
 upgrades/*						usr/share/freepbx-common/upgrades/
-debian/rapid/upgrades/*					usr/share/freepbx-common/upgrades/
 
 debian/rapid/apache2					etc/
 debian/rapid/apache					etc/

Modified: freepbx/trunk/debian/patches/00list
===================================================================
--- freepbx/trunk/debian/patches/00list	2007-03-07 15:18:01 UTC (rev 3208)
+++ freepbx/trunk/debian/patches/00list	2007-03-08 10:33:22 UTC (rev 3209)
@@ -1,7 +1,5 @@
 # fix bugs
-fix-enums
 fix-module_admin
-fix-warning-sqlite
 use-conf-defaults
 fix-open-or-die
 

Deleted: freepbx/trunk/debian/patches/fix-enums.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-enums.dpatch	2007-03-07 15:18:01 UTC (rev 3208)
+++ freepbx/trunk/debian/patches/fix-enums.dpatch	2007-03-08 10:33:22 UTC (rev 3209)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-enums.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
-##
-## DP: Fix an enum bug, as reported by http://www.freepbx.org/2007/01/06/whoops-enum-lookups-broken-in-220/
-
- at DPATCH@
-diff -urNad freepbx-2.2.0~dfsg~/amp_conf/astetc/extensions.conf freepbx-2.2.0~dfsg/amp_conf/astetc/extensions.conf
---- freepbx-2.2.0~dfsg~/amp_conf/astetc/extensions.conf	2007-01-05 00:32:40.000000000 +0200
-+++ freepbx-2.2.0~dfsg/amp_conf/astetc/extensions.conf	2007-01-14 11:42:04.000000000 +0200
-@@ -425,7 +425,7 @@
- ; to 1: Be compliant with all the depreciated bits in asterisk 1.2 and
- ; above, and 2: to give a good shot at attempting to be compliant with
- ; RFC3761 by honouring the order in which records are returned.
--exten => s,1,GotoIf($["${ARG3}" = ""]?PASSWD:NOPASSWD); arg3 is pattern password 
-+exten => s,1,GotoIf($["${ARG3}" != ""“”]?PASSWD:NOPASSWD); arg3 is pattern password
- exten => s,n(PASSWD),Authenticate(${ARG3}) 
- exten => s,n(NOPASSWD),Macro(user-callerid,SKIPTTL) 
- exten => s,n,Macro(record-enable,${CALLERID(number)},OUT)

Modified: freepbx/trunk/debian/patches/fix-module_admin.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-module_admin.dpatch	2007-03-07 15:18:01 UTC (rev 3208)
+++ freepbx/trunk/debian/patches/fix-module_admin.dpatch	2007-03-08 10:33:22 UTC (rev 3209)
@@ -5,9 +5,9 @@
 ## DP: work around buggy freepbx-modules uninstall script (closes upstream 1731)
 
 @DPATCH@
-diff -urNad upstream~/amp_conf/bin/module_admin upstream/amp_conf/bin/module_admin
---- upstream~/amp_conf/bin/module_admin	2006-10-23 10:44:58.000000000 +0200
-+++ upstream/amp_conf/bin/module_admin	2007-01-31 10:03:08.000000000 +0200
+diff -urNad freepbx-2.2.1~dfsg~/amp_conf/bin/module_admin freepbx-2.2.1~dfsg/amp_conf/bin/module_admin
+--- freepbx-2.2.1~dfsg~/amp_conf/bin/module_admin	2007-01-31 10:18:14.000000000 +0200
++++ freepbx-2.2.1~dfsg/amp_conf/bin/module_admin	2007-03-08 11:45:40.000000000 +0200
 @@ -52,7 +52,7 @@
  }
  
@@ -37,14 +37,12 @@
  	// connect to database
  	if (!file_exists(AMP_BASE_INCLUDE_PATH.'/common/db_connect.php')) {
  		fatal('Cannot locate '.AMP_BASE_INCLUDE_PATH.'/common/db_connect.php');
-@@ -461,6 +467,10 @@
- 	out('WARNING: "force" is enabled, it is possible to create problems');
- }
- 
-+// freepbx modules will include the unsintall scripts
-+// using relative paths. why not modifiying the include dir...?
+@@ -464,7 +470,7 @@
+ // freepbx modules will include the unsintall scripts
+ // using relative paths. why not modifiying the include dir...?
+ // fix for ticket:1731
+-chdir ( $amp_conf\["AMPWEBROOT"\] . "/admin/" );
 +chdir ( $amp_conf["AMPWEBROOT"] . "/admin/" );
-+
+ 
  switch ($operation ) {
  	case 'list':
- 		showList();

Deleted: freepbx/trunk/debian/patches/fix-warning-sqlite.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-warning-sqlite.dpatch	2007-03-07 15:18:01 UTC (rev 3208)
+++ freepbx/trunk/debian/patches/fix-warning-sqlite.dpatch	2007-03-08 10:33:22 UTC (rev 3209)
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-warning-sqlite.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
-##
-## DP: Do not issue warnings on sqlite when the default password has not been modified
-## DP: Fixes upstream bug 1732
-
- at DPATCH@
-diff -urNad upstream~/amp_conf/htdocs/admin/config.php upstream/amp_conf/htdocs/admin/config.php
---- upstream~/amp_conf/htdocs/admin/config.php	2006-12-31 10:24:16.000000000 +0200
-+++ upstream/amp_conf/htdocs/admin/config.php	2007-01-31 12:45:41.000000000 +0200
-@@ -316,8 +316,11 @@
- 			if ($amp_conf['AMPMGRPASS'] == 'amp111') {
- 				printf( "<div class=\"warning\"><p>%s</p></div>", dgettext("welcome text", "Warning: You are running freePBX and ").$amp_conf['AMPENGINE'].dgettext("welcome page", " with the default manager pass. You should consider changing this to something else.")." ".sprintf('(<a href="http://aussievoip.com/wiki/index.php?page=freePBX-ManagerPass" target="_new">%s</a>)', _("Help")) );
- 			}
--			if ($amp_conf['AMPDBPASS'] == 'amp109') {
--				printf( "<div class=\"warning\"><p>%s</p></div>", dgettext("welcome text", "Warning: You are running freePBX and ").$amp_conf['AMPDBENGINE'].dgettext("welcome page", " with the default password ")." ".sprintf('(<a href="http://aussievoip.com/wiki/index.php?page=freePBX-MysqlPass" target="_new">%s</a>)', _("Help")) );
-+			
-+			if ( ($amp_conf["AMPDBENGINE"] == "mysql") || ($amp_conf["AMPDBENGINE"] == "pgsql")) {
-+				if  ($amp_conf['AMPDBPASS'] == 'amp109') {
-+					printf( "<div class=\"warning\"><p>%s</p></div>", dgettext("welcome text", "Warning: You are running freePBX and ").$amp_conf['AMPDBENGINE'].dgettext("welcome page", " with the default password ")." ".sprintf('(<a href="http://aussievoip.com/wiki/index.php?page=freePBX-MysqlPass" target="_new">%s</a>)', _("Help")) );
-+				}
- 			}
- 
- 

Modified: freepbx/trunk/debian/rules
===================================================================
--- freepbx/trunk/debian/rules	2007-03-07 15:18:01 UTC (rev 3208)
+++ freepbx/trunk/debian/rules	2007-03-08 10:33:22 UTC (rev 3209)
@@ -156,17 +156,16 @@
 	tar xfz ../tarballs/$(UPFILENAME)
 	mv $(PACKAGE)-$(UPVERSION) $(PACKAGE)-$(UPVERSION).tmp
 
-#	mp3 are bad, lets convert them to wav
-	for i in $(PACKAGE)-$(UPVERSION).tmp/amp_conf/mohmp3/*.mp3; do \
-		j=`echo $$i | sed 's/\\.mp3//g'` ;\
-		sox "$${i}" -w -c1 -t wav -r 8000 -t wav "$${j}-8khz.wav" resample -q ;\
-		rm -f $$i ;\
-	done
-
 # jpgraph is problematic
 	rm -f  $(PACKAGE)-$(UPVERSION).tmp/amp_conf/htdocs/admin/reports.php
 	rm -fr $(PACKAGE)-$(UPVERSION).tmp/amp_conf/htdocs/admin/cdr
 
+# op-panel should not be part of this package
+	ls $(PACKAGE)-$(UPVERSION).tmp/amp_conf/htdocs_panel/* | egrep -v '\.php|\.cfg' | xargs rm -f
+
+# ari has it's own package
+	rm -fr $(PACKAGE)-$(UPVERSION).tmp/amp_conf/htdocs/recordings
+
 # repackage the new source
 	cd $(PACKAGE)-$(UPVERSION).tmp ; \
 	mkdir $(PACKAGE)_$(UPVERSION).dfsg;\

More information about the Pkg-voip-commits mailing list