[Pkg-voip-commits] r6341 - in /freepbx/trunk/debian: changelog freepbx-common.postinst patches/clean-install-amp rules

[odd_bloke-guest at alioth.debian.org]

Author: odd_bloke-guest
Date: Wed Oct 29 13:37:31 2008
New Revision: 6341

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6341
Log:
Removed use of /var/www.

Modified:
    freepbx/trunk/debian/changelog
    freepbx/trunk/debian/freepbx-common.postinst
    freepbx/trunk/debian/patches/clean-install-amp
    freepbx/trunk/debian/rules

Modified: freepbx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/changelog?rev=6341&op=diff
==============================================================================
--- freepbx/trunk/debian/changelog (original)
+++ freepbx/trunk/debian/changelog Wed Oct 29 13:37:31 2008
@@ -17,8 +17,12 @@
       unstable.
     + Fixed inconsistent whitespace.
   * debian/patches: Refreshed patches.
-
- -- Daniel Watkins <daniel.watkins at credativ.co.uk>  Fri, 24 Oct 2008 14:50:35 +0100
+  * debian/patches/clean-install-amp: Changed $webroot to be /usr/share/freepbx
+    rather than /var/www.
+  * debian/rules: Don't link /usr/share/freepbx into /var/www, as per lintian
+    error.
+
+ -- Daniel Watkins <daniel.watkins at credativ.co.uk>  Fri, 24 Oct 2008 14:52:56 +0100
 
 freepbx (2.3.1~dfsg-1) UNRELEASED; urgency=low
 

Modified: freepbx/trunk/debian/freepbx-common.postinst
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/freepbx-common.postinst?rev=6341&op=diff
==============================================================================
--- freepbx/trunk/debian/freepbx-common.postinst (original)
+++ freepbx/trunk/debian/freepbx-common.postinst Wed Oct 29 13:37:31 2008
@@ -113,7 +113,7 @@
 			issue_install
 		fi
 		
-		# amportal.conf contains passwords, it should not be wold
+		# amportal.conf contains passwords, it should not be world
 		# readable, adjust permissions
 		# reported upstread as: http://freepbx.org/trac/ticket/1878
 		chown asterisk: /etc/amportal.conf

Modified: freepbx/trunk/debian/patches/clean-install-amp
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/clean-install-amp?rev=6341&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/clean-install-amp (original)
+++ freepbx/trunk/debian/patches/clean-install-amp Wed Oct 29 13:37:31 2008
@@ -12,8 +12,8 @@
 
 Index: freepbx-2.4.0~dfsg/install_amp
 ===================================================================
---- freepbx-2.4.0~dfsg.orig/install_amp	2008-10-24 14:40:59.000000000 +0100
-+++ freepbx-2.4.0~dfsg/install_amp	2008-10-24 14:42:16.000000000 +0100
+--- freepbx-2.4.0~dfsg.orig/install_amp	2008-10-24 14:44:38.000000000 +0100
++++ freepbx-2.4.0~dfsg/install_amp	2008-10-24 14:45:12.000000000 +0100
 @@ -7,12 +7,12 @@
  define("AMP_CONF", "/etc/amportal.conf");
  define("ASTERISK_CONF", "/etc/asterisk/asterisk.conf");
@@ -25,7 +25,7 @@
 -$webroot	= "/var/www/html";
 -$fopwebroot	= "";				// if blank, will use $webroot/panel
 -$ampsbin_dir = "/usr/local/sbin";	// default if not set
-+$webroot	= "/var/www";
++$webroot	= "/usr/share/freepbx";
 +$fopwebroot	= "/usr/share/op-panel/flash";				// if blank, will use $webroot/panel
 +$ampsbin_dir = "/usr/share/asterisk/bin";	// default if not set
  $ampbin_dir = "/var/lib/asterisk/bin";

Modified: freepbx/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/rules?rev=6341&op=diff
==============================================================================
--- freepbx/trunk/debian/rules (original)
+++ freepbx/trunk/debian/rules Wed Oct 29 13:37:31 2008
@@ -78,7 +78,6 @@
 	
 	dh_link -p freepbx-common usr/share/freepbx/		usr/share/freepbx/admin
 	dh_link -p freepbx-panel usr/share/op-panel/flash	usr/share/freepbx/panel
-	dh_link -p freepbx-common usr/share/freepbx/		var/www/freepbx
 
 #	this file is only part of freepbx-admin, no need to install it on the configuration package
 	rm -f debian/asterisk-config-freepbx/etc/asterisk/manager.d/freepbx.conf