[Pkg-voip-commits] r5183 - in /freepbx/trunk/debian: changelog control patches/00list patches/install_amp_no_asterisk.dpatch

Wed Feb 6 23:19:22 UTC 2008

Author: tzafrir-guest
Date: Wed Feb  6 23:19:21 2008
New Revision: 5183

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5183
Log:
* There is a single freepbx-modules package now. No need to provide a
  meta-package of our own. 
* install_amp_no_asterisk.dpatch: we can install eve if asterisk is not
  running.

Added:
    freepbx/trunk/debian/patches/install_amp_no_asterisk.dpatch   (with props)
Modified:
    freepbx/trunk/debian/changelog
    freepbx/trunk/debian/control
    freepbx/trunk/debian/patches/00list

Modified: freepbx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/changelog?rev=5183&op=diff
==============================================================================

--- freepbx/trunk/debian/changelog (original)
+++ freepbx/trunk/debian/changelog Wed Feb  6 23:19:21 2008
@@ -3,8 +3,12 @@
   * New upstream release.
   * fix-ari-link.dpatch: update for 2.3.1 .
   * clean-install-amp.dpatch: update to 2.3.1 and remove some messages.
-
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sun, 11 Nov 2007 06:34:36 +0200
+  * There is a single freepbx-modules package now. No need to provide a
+    meta-package of our own. 
+  * install_amp_no_asterisk.dpatch: we can install eve if asterisk is not
+    running.
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Thu,  7 Feb 2008 01:16:22 +0200
 
 freepbx (2.3.0~dfsg-1) UNRELEASED; urgency=low
 

Modified: freepbx/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/control?rev=5183&op=diff
==============================================================================
--- freepbx/trunk/debian/control (original)
+++ freepbx/trunk/debian/control Wed Feb  6 23:19:21 2008
@@ -12,7 +12,7 @@
 
 Package: freepbx
 Architecture: all
-Depends: freepbx-common, asterisk-sounds-moh-freepbx, freepbx-module-core, freepbx-module-dashboard, freepbx-module-featurecodeadmin, freepbx-module-infoservices, freepbx-module-recordings, freepbx-module-voicemail
+Depends: freepbx-modules, asterisk-sounds-moh-freepbx
 Recommends: ari, freepbx-panel
 Description: web-based management interface for the Asterisk PBX
  FreePBX (formally AMP) is a web-based GUI for the Asterisk PBX. 
@@ -34,7 +34,7 @@
 Recommends: sox
 Provides: asterisk-config-custom
 Replaces: asterisk-config, asterisk-config-amportal
-Conflicts: asterisk-config-amportal, amportal-agi
+Conflicts: asterisk-config, asterisk-config-amportal, amportal-agi
 Description: FreePBX - config files for the Asterisk PBX
  FreePBX (formally AMP) is a web-based GUI for the Asterisk PBX. 
  This package contains config files to replace Asterisk config files.
@@ -61,35 +61,9 @@
 Description: extra sounds for FreePBX
  These are some sound files needed for the directory and application AGIs.
 
-Package: freepbx-modules
-Architecture: all
-Depends: freepbx-common, freepbx-module-announcement, freepbx-module-asterisk-cli, freepbx-module-blacklist, freepbx-module-callback, freepbx-module-callforward, freepbx-module-callwaiting, freepbx-module-cidlookup, freepbx-module-conferences, freepbx-module-customerdb, freepbx-module-dictate, freepbx-module-disa, freepbx-module-donotdisturb, freepbx-module-findmefollow, freepbx-module-inventorydb, freepbx-module-ivr, freepbx-module-logfiles, freepbx-module-manager, freepbx-module-miscapps, freepbx-module-miscdests, freepbx-module-paging, freepbx-module-parking, freepbx-module-pbdirectory, freepbx-module-phonebook, freepbx-module-phpagiconf, freepbx-module-phpinfo, freepbx-module-pinsets, freepbx-module-printextensions, freepbx-module-queues, freepbx-module-ringgroups, freepbx-module-speeddial, freepbx-module-timeconditions, freepbx-module-asteriskinfo, freepbx-module-daynight
-Description: FreePBX modules
- This is a meta package which installs all the free modules supplied by
- FreePBX. This package does not provide any file, by it just installs
- a bunch of modules.
- .
- Note that freepbx-module-backup is not part of this package, as it's currently 
- broken. If you want, you can still install it manually. Same goes for 
- freepbx-module-music which needs RW permissions to some directories it 
- currently has not. freepbx-module-framework is not tested at all. 
- 
-Package: freepbx-modules-nonfree
-Architecture: all
-Depends: freepbx-module-irc, freepbx-module-gabcast, freepbx-module-javassh, freepbx-module-zoip
-Description: FreePBX modules - non free
- This is a meta package which installs all the modules supplied by
- FreePBX. This package does not provide any file, by it just installs
- a bunch of modules which cannot be re-built.
- .
- The packages javassh, gabcast and irc contain flash (or java) images
- which cannot re-built. They are all safe for re-distribution (hopefully...)
- .
- The package freepbx-module-zoip is not tested yet.
-
 Package: freepbx-common
 Architecture: all
-Replaces: amportal-common, freepbx-module-core
+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|php4-cgi, php-db|php4-pear(<< 4:4.4.0-0), php5-cli|php4-cli, php5-pear|php-pear|php4-pear, php-curl|php5-curl|php4-curl, libdbi-perl
 Description: FreePBX administration panel

Modified: freepbx/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/00list?rev=5183&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/00list (original)
+++ freepbx/trunk/debian/patches/00list Wed Feb  6 23:19:21 2008
@@ -8,6 +8,7 @@
 #ast-config-dirs		<- moved to freepbx-module-core
 disable-online-updates
 clean-install-amp
+install_amp_no_asterisk
 #fix-agibin-dir			<- not needed any more
 fix-ari-link
 #fix-permissions

Added: freepbx/trunk/debian/patches/install_amp_no_asterisk.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/install_amp_no_asterisk.dpatch?rev=5183&op=file
==============================================================================
--- freepbx/trunk/debian/patches/install_amp_no_asterisk.dpatch (added)
+++ freepbx/trunk/debian/patches/install_amp_no_asterisk.dpatch Wed Feb  6 23:19:21 2008
@@ -1,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## install_amp_no_asterisk.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: We can install freepbx without Asterisk running.
+
+ at DPATCH@
+diff -urNad freepbx-2.3.1~dfsg~/install_amp freepbx-2.3.1~dfsg/install_amp
+--- freepbx-2.3.1~dfsg~/install_amp	2008-02-06 21:41:26.197912522 +0200
++++ freepbx-2.3.1~dfsg/install_amp	2008-02-06 21:45:12.061547702 +0200
+@@ -682,14 +682,6 @@
+ out("OK");
+ 
+ 
+-outn("Checking if Asterisk is running..");
+-exec("pidof asterisk", $pid_val, $ret);
+-if ($ret) {
+-	out("FAILED");
+-	fatal($argv[0]."\n\tAsterisk must be running. If this is a first time install, you should start\n\tAsterisk by typing './start_asterisk start'\n\tFor upgrading, you should run 'amportal start'");
+-}
+-out("running with PID: ".$pid_val[0]."..OK");
+-
+ // **** Check for amportal.conf, create if necessary
+ 
+ outn("Checking for ".AMP_CONF."..");

Propchange: freepbx/trunk/debian/patches/install_amp_no_asterisk.dpatch
------------------------------------------------------------------------------
    svn:executable = *


