[Pkg-voip-commits] r7655 - in /asterisk-gui/trunk/debian: TODO.Debian changelog patches/bri_signalling patches/datadir_path patches/series patches/trademark

tzafrir-guest at alioth.debian.org tzafrir-guest at alioth.debian.org
Tue Oct 6 13:46:32 UTC 2009 

Author: tzafrir-guest
Date: Tue Oct  6 13:46:31 2009
New Revision: 7655

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7655
Log:
New upstream release: 4980
 - Patch bri_signalling accepted upstream.
 - Indentation and such fixes in patch tradmark
 - Minor fix to patch datadir_path as well.

Mostly by Riccardo Magliocchetti.

Removed:
    asterisk-gui/trunk/debian/patches/bri_signalling
Modified:
    asterisk-gui/trunk/debian/TODO.Debian
    asterisk-gui/trunk/debian/changelog
    asterisk-gui/trunk/debian/patches/datadir_path
    asterisk-gui/trunk/debian/patches/series
    asterisk-gui/trunk/debian/patches/trademark

Modified: asterisk-gui/trunk/debian/TODO.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/TODO.Debian?rev=7655&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/TODO.Debian (original)
+++ asterisk-gui/trunk/debian/TODO.Debian Tue Oct  6 13:46:31 2009
@@ -1,1 +1,6 @@
 * Use jquery from libjs-jquery
+  W: asterisk-gui: embedded-javascript-library usr/share/asterisk/static-http/config/js/jquery.js
+* Configration backup/restore
+  W: asterisk-gui: package-contains-empty-directory usr/share/asterisk/static-http/config/private/bkps/
+  W: asterisk-gui: package-contains-empty-directory usr/share/asterisk/gui_backups/
+* Test with a new installation - does it "loop"?

Modified: asterisk-gui/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/changelog?rev=7655&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/changelog (original)
+++ asterisk-gui/trunk/debian/changelog Tue Oct  6 13:46:31 2009
@@ -1,4 +1,4 @@
-asterisk-gui (2.0.4.9.svn.4809-1) UNRELEASED; urgency=low
+asterisk-gui (2.0.4.9.svn.4980-1) UNRELEASED; urgency=low
 
   [ Tzafrir Cohen ]
   * Initial release from digium SVN (Closes: #496258).
@@ -6,4 +6,7 @@
   [ Victor Seva ]
   * Added debian/watch
 
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sun, 24 Aug 2008 07:37:40 +0300
+  [ Riccardo Magliocchetti ]
+  * Updates
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Tue, 06 Oct 2009 14:57:03 +0200

Modified: asterisk-gui/trunk/debian/patches/datadir_path
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/patches/datadir_path?rev=7655&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/patches/datadir_path (original)
+++ asterisk-gui/trunk/debian/patches/datadir_path Tue Oct  6 13:46:31 2009
@@ -7,16 +7,17 @@
 
 --- a/scripts/listfiles
 +++ b/scripts/listfiles
-@@ -1,5 +1,5 @@
+@@ -1,6 +1,6 @@
  #!/bin/sh
+ 
 -SYSINFO_OUTPUT="/var/lib/asterisk/static-http/config/sysinfo_output.html"
 +SYSINFO_OUTPUT="/usr/share/asterisk/static-http/config/tmp/sysinfo_output.html"
  
  #/bin/echo "<div id=list_files>" > $SYSINFO_OUTPUT
- /bin/mkdir -p $1
+ /bim/mkdir -p -- "$1"
 --- a/config/js/index.js
 +++ b/config/js/index.js
-@@ -253,23 +253,26 @@ var onLogInFunctions = {
+@@ -272,23 +272,26 @@ var onLogInFunctions = {
  		if( ASTERISK_CONF === null ){ ASTERISK_CONF = new ASTGUI.customObject ; } // if context 'directories' not found in asterisk.conf
  		sessionData.directories.asteriskConfig =  ASTERISK_CONF.getProperty('astetcdir') ||  '/etc/asterisk/' ;
  		sessionData.directories.astvarlibdir = ASTERISK_CONF.getProperty('astvarlibdir') || '/var/lib/asterisk/' ;

Modified: asterisk-gui/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/patches/series?rev=7655&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/patches/series (original)
+++ asterisk-gui/trunk/debian/patches/series Tue Oct  6 13:46:31 2009
@@ -1,3 +1,2 @@
 trademark
 datadir_path
-bri_signalling

Modified: asterisk-gui/trunk/debian/patches/trademark
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/patches/trademark?rev=7655&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/patches/trademark (original)
+++ asterisk-gui/trunk/debian/patches/trademark Tue Oct  6 13:46:31 2009
@@ -4,35 +4,35 @@
 Thus we are called "GUI for Asterisk" and not any other name.
 --- a/config/home.html
 +++ b/config/home.html
-@@ -133,9 +133,9 @@ var updatePassword = function(){
- <link href="stylesheets/schwing.css" media="all" rel="Stylesheet" type="text/css" />
+@@ -28,9 +28,9 @@
+ </head>
  <body topmargin=0  bgcolor="EFEFEF">
  
--<div class="iframeTitleBar">Welcome to the Asterisk&trade; Configuration Panel</div>
-+<div class="iframeTitleBar">Welcome to the GUI for Asterisk&trade;</div>
+-	<div class="iframeTitleBar">Welcome to the Asterisk&trade; Configuration Panel</div>
++	<div class="iframeTitleBar">Welcome to the GUI for Asterisk&trade;</div>
  
--<h2>Asterisk&trade; Configuration Engine</h2>
-+<h2>GUI for Asterisk&trade;</h2>
+-	<h2>Asterisk&trade; Configuration Engine</h2>
++	<h2>GUI for Asterisk&trade;</h2>
  
- <table align="center" id='loginForm'>
- 	<tr>	<td colspan="2"><BR></td>
+ 	<table align="center" id='loginForm'>
+ 		<tr>	<td colspan="2"><BR></td>
 --- a/config/index.html
 +++ b/config/index.html
-@@ -97,7 +97,7 @@ var sessionData = {
- <script src="js/pbx2.js"></script>
- <script src="js/index.js"></script>
+@@ -20,7 +20,7 @@
+ -->
+ <html>
  <head>
 -	<title>Asterisk Configuration GUI</title>
 +	<title>GUI for Asterisk</title>
+ 	<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1" />
  	<link rel="shortcut icon" href="images/favicon.ico" />
- </head>
- <body topmargin=1 leftmargin=2>
-@@ -118,7 +118,7 @@ var sessionData = {
- 	<div id="accordion_div" style='display:none; width: 170px;'>
- 		<div page='home.html?status=1'>
- 			<div class="ui-accordion-link">Home</div>
--			<div class="ui-accordion-desc">Asterisk Configuration Panel - Please click on a panel to manage related features</div>
-+			<div class="ui-accordion-desc">GUI for Asterisk - Please click on a panel to manage related features</div>
- 		</div>
- 		<div page='digital.html'>
- 			<div class="ui-accordion-link">Configure Hardware</div>
+ 
+@@ -45,7 +45,7 @@
+ 		<div id="accordion_div" style='display:none; width: 170px;'>
+ 			<div page='home.html?status=1'>
+ 				<div class="ui-accordion-link">Home</div>
+-				<div class="ui-accordion-desc">Asterisk Configuration Panel - Please click on a panel to manage related features</div>
++				<div class="ui-accordion-desc">GUI for Asterisk - Please click on a panel to manage related features</div>
+ 			</div>
+ 			<div page='digital.html'>
+ 				<div class="ui-accordion-link">Configure Hardware</div>

More information about the Pkg-voip-commits mailing list