[Pkg-voip-commits] r5751 - in /freepbx/trunk/debian: TODO.Debian asterisk-config-freepbx.postinst changelog patches/clean-install-amp rules

tzafrir-guest at alioth.debian.org tzafrir-guest at alioth.debian.org
Sun May 18 19:58:07 UTC 2008


Author: tzafrir-guest
Date: Sun May 18 19:58:07 2008
New Revision: 5751

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5751
Log:
* New upstream release: 2.4.0 .
* rules: get-orig-source: wget -N conflicts with -O .
* A simpler and more correct awk than current sed for filtering conf
  files of a package.
* Patch clean-install-amp is slightly smaller.

Modified:
    freepbx/trunk/debian/TODO.Debian
    freepbx/trunk/debian/asterisk-config-freepbx.postinst
    freepbx/trunk/debian/changelog
    freepbx/trunk/debian/patches/clean-install-amp
    freepbx/trunk/debian/rules

Modified: freepbx/trunk/debian/TODO.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/TODO.Debian?rev=5751&op=diff
==============================================================================
--- freepbx/trunk/debian/TODO.Debian (original)
+++ freepbx/trunk/debian/TODO.Debian Sun May 18 19:58:07 2008
@@ -4,3 +4,4 @@
    the installed amportal.conf?
  * rename /etc/amportal.conf to /etc/freepbx.conf
  * Get rid of chmod -R g+w /etc/asterisk in the postinst script.
+ * Split patch clean-install-amp to separate smaller patches.

Modified: freepbx/trunk/debian/asterisk-config-freepbx.postinst
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/asterisk-config-freepbx.postinst?rev=5751&op=diff
==============================================================================
--- freepbx/trunk/debian/asterisk-config-freepbx.postinst (original)
+++ freepbx/trunk/debian/asterisk-config-freepbx.postinst Sun May 18 19:58:07 2008
@@ -39,7 +39,7 @@
 		# find conffiles under /etc/asterisk belonging to asterisk-config
 		# and chown them to user asterisk.
 		conf_files=`dpkg-query -W -f='${Conffiles}\n' asterisk-config-freepbx 2>/dev/null | \
-		  sed -nr -e 's; (/etc/asterisk/.*) [0-9a-f]*;\1;p'`
+			awk '/^ \/etc\/asterisk/ {print $1}'`
 		chown asterisk: $conf_files 2>/dev/null
 		inc_files=`grep -h '^#include' $conf_files | grep -v '\*' \
 			| tr -d '"' | cut -d' ' -f2 | sort -u`

Modified: freepbx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/changelog?rev=5751&op=diff
==============================================================================
--- freepbx/trunk/debian/changelog (original)
+++ freepbx/trunk/debian/changelog Sun May 18 19:58:07 2008
@@ -1,3 +1,13 @@
+freepbx (2.4.0~dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * rules: get-orig-source: wget -N conflicts with -O .
+  * A simpler and more correct awk than current sed for filtering conf files 
+    of a package.
+  * Patch clean-install-amp is slightly smaller.
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sun, 18 May 2008 22:54:18 +0300
+
 freepbx (2.3.1~dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release.

Modified: freepbx/trunk/debian/patches/clean-install-amp
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/clean-install-amp?rev=5751&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/clean-install-amp (original)
+++ freepbx/trunk/debian/patches/clean-install-amp Sun May 18 19:58:07 2008
@@ -7,6 +7,8 @@
 ## but only take chaege of installing the needed updates. I also removed
 ## some dependencies checking, as they are already taken care by 
 ## dpkg.
+## 
+## TODO: split this patch to separate fixes.
 
 --- freepbx-2.3.1~dfsg.orig/install_amp
 +++ freepbx-2.3.1~dfsg/install_amp
@@ -148,47 +150,6 @@
  
  
  // normally this would be the contents of ASTETCDIR/version, but this is for simplicity, as we just read it above
-@@ -900,25 +901,7 @@ switch ($db_engine)
- 		break;
- 	
- 	case "sqlite":
--		if (! @ include('DB/sqlite.php'))
--		{
--			out("FAILED");
--			fatal( "Your PHP installation lacks SQLite support" );
--		}
--	
--		if (!isset($amp_conf["AMPDBFILE"]))
--			die("You must setup properly AMPDBFILE in ".AMP_CONF);
--	
--		if (isset($amp_conf["AMPDBFILE"]) == "")
--			die("AMPDBFILE in ".AMP_CONF." cannot be blank");
--	
--		$DSN = array (
--			"database" => $amp_conf["AMPDBFILE"],
--			"mode" => 0666
--		);
--	
--		$db = new DB_sqlite();
--		$db->connect( $DSN );
-+		die_freepbx("SQLite2 support is deprecated. Please use sqlite3 only.");
- 		break;
- 	
- 	case "sqlite3":
-@@ -928,6 +911,13 @@ switch ($db_engine)
- 		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') )
-+			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);
 @@ -975,15 +965,15 @@ if ($install_files)
  }
  

Modified: freepbx/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/rules?rev=5751&op=diff
==============================================================================
--- freepbx/trunk/debian/rules (original)
+++ freepbx/trunk/debian/rules Sun May 18 19:58:07 2008
@@ -146,7 +146,7 @@
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
 	@@echo Downloading $(UPFILENAME) from $(URL) ...
-	wget -N  -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
+	wget -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
 
 	tar xfz ../tarballs/$(UPFILENAME)
 	mv $(PACKAGE)-$(UPVERSION) $(PACKAGE)-$(UPVERSION).tmp




More information about the Pkg-voip-commits mailing list