[Pkg-voip-commits] r6054 - in /asterisk-gui/trunk/debian: README.Debian README.source changelog control dirs patches/datadir_path patches/series patches/trademark postinst postrm

tzafrir-guest at alioth.debian.org tzafrir-guest at alioth.debian.org
Sat Aug 23 17:30:56 UTC 2008


Author: tzafrir-guest
Date: Sat Aug 23 17:30:56 2008
New Revision: 6054

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6054
Log:
More path fixes, trademark-issue fixes:

* New upstream svn snapshow (3698)
* Create a backups directory. Chown it on postinst, purge contents on purge.
* A new "trademark" patch to set the name to "GUI for Asterisk"
* More path fixes. Now in the scripts.
  - Thus backup/restore works.
  - And so should the file editor.

Added:
    asterisk-gui/trunk/debian/README.source
    asterisk-gui/trunk/debian/dirs
    asterisk-gui/trunk/debian/patches/trademark
    asterisk-gui/trunk/debian/postinst
    asterisk-gui/trunk/debian/postrm
Modified:
    asterisk-gui/trunk/debian/README.Debian
    asterisk-gui/trunk/debian/changelog
    asterisk-gui/trunk/debian/control
    asterisk-gui/trunk/debian/patches/datadir_path
    asterisk-gui/trunk/debian/patches/series

Modified: asterisk-gui/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/README.Debian?rev=6054&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/README.Debian (original)
+++ asterisk-gui/trunk/debian/README.Debian Sat Aug 23 17:30:56 2008
@@ -1,15 +1,15 @@
 Name
 ----
 Repeat after me: this package is not [the] "asterisk-gui". It is "A GUI 
-for Asterisk".
+for Asterisk". Trademark-related changes are:
+* debian/patches/trademark .
+* images have been replaced (TODO: finish replacing new ones).
 
 
 Hardware Detection:
 ------------------
 Zaptel hardware detection requires zaptel >= 1.4.8, as that version
 introduced new ioctls and the ztscan utility 
-
-mISDN hardware support is currently untested.
 
 
 Installation
@@ -58,8 +58,9 @@
 
 Supported Browsers
 ------------------
-Seems to be better. Please report browsers with decent javascript support 
-that do not work.
+Seems to be better. Most browsers with decent JavaScript support should 
+work. My initial testing has shown that Konqueror (3.5.9) doesn't seem
+to work, though.
 
 
 Proxy Setup
@@ -67,4 +68,3 @@
 You may wish to serve the content of the asterisk httpd through a
 different httpd that will also act as a proxy. Example configuration for
 apache2 is included in the examples directory for that task.
-

Added: asterisk-gui/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/README.source?rev=6054&op=file
==============================================================================
--- asterisk-gui/trunk/debian/README.source (added)
+++ asterisk-gui/trunk/debian/README.source Sat Aug 23 17:30:56 2008
@@ -1,0 +1,18 @@
+This package uses quilt for patches management.
+
+To get the patched source, run:
+
+  ./debian/rules patch
+
+
+The sources of the package are maintained in a subversion repository. 
+To get the latest version:
+
+  debcheckout asterisk-gui
+
+
+For more information about working with the repository, see:
+http://svn.debian.org/wsvn/pkg-voip/README?op=file
+
+For other useful information, see the pkg-voip team page:
+http://pkg-voip.alioth.debian.org/

Modified: asterisk-gui/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/changelog?rev=6054&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/changelog (original)
+++ asterisk-gui/trunk/debian/changelog Sat Aug 23 17:30:56 2008
@@ -1,4 +1,4 @@
-asterisk-gui (0.0.svn3671-1) UNRELEASED; urgency=low
+asterisk-gui (0.0.svn3698-1) UNRELEASED; urgency=low
 
   [ Kilian Krause ]
   * Fix build-deps (include dpatch).

Modified: asterisk-gui/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/control?rev=6054&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/control (original)
+++ asterisk-gui/trunk/debian/control Sat Aug 23 17:30:56 2008
@@ -4,7 +4,7 @@
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
 Build-Depends: cdbs, debhelper, quilt, sharutils
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/pkg-voip/asterisk-gui/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/?op=log
 Homepage: http://www.asterisk.org/

Added: asterisk-gui/trunk/debian/dirs
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/dirs?rev=6054&op=file
==============================================================================
--- asterisk-gui/trunk/debian/dirs (added)
+++ asterisk-gui/trunk/debian/dirs Sat Aug 23 17:30:56 2008
@@ -1,0 +1,1 @@
+var/lib/asterisk/gui_backups

Modified: asterisk-gui/trunk/debian/patches/datadir_path
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/patches/datadir_path?rev=6054&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/patches/datadir_path (original)
+++ asterisk-gui/trunk/debian/patches/datadir_path Sat Aug 23 17:30:56 2008
@@ -1,12 +1,12 @@
 # Fix datadir to be /usr/share/asterisk rather than /var/lib/asterisk
 # Upstream issue: http://bugs.digium.com/11629
 
---- asterisk-gui-0.0.svn2268.orig/config/js/astman.js
-+++ asterisk-gui-0.0.svn2268/config/js/astman.js
-@@ -2422,17 +2422,18 @@ var asterisk_guitools = "asterisk_guitoo
+--- a/config/js/astman.js
++++ b/config/js/astman.js
+@@ -2531,17 +2531,18 @@ var ASTGUI = {
  
  ASTGUI.paths = {};
-
+ 
 -ASTGUI.paths['guiInstall'] = '/var/lib/asterisk/static-http/config/';
 +ASTGUI.paths['astDataDir'] = '/usr/share/asterisk';
 +ASTGUI.paths['guiInstall'] = ASTGUI.paths['astDataDir'] + '/static-http/config/';
@@ -20,9 +20,31 @@
 +ASTGUI.paths['Sounds'] = ASTGUI.paths['astDataDir'] + '/sounds/';
 +ASTGUI.paths['MOH'] = ASTGUI.paths['astDataDir'] + '/moh/' ; // path for music on hold files
  ASTGUI.paths['menusRecord'] = ASTGUI.paths['Sounds'] + 'record/' ;
-
+ 
 -ASTGUI.paths['scripts'] = '/var/lib/asterisk/scripts/';/* Directory for gui scripts (listfiles, for example) */	
-+ASTGUI.paths['scripts'] = ASTGUI.paths['astDataDir'] + '/scripts/';/* Directory for gui scripts (listfiles, for example) */	
++ASTGUI.paths['scripts'] = ASTGUI.paths['astDataDir'] + '/scripts/';/* Directory for gui scripts (listfiles, for example) */
  ASTGUI.paths['output_SysInfo'] = './sysinfo_output.html' ;
  ASTGUI.paths['voicemails_dir'] = '/var/spool/asterisk/voicemail/default/' ;
  
+--- a/scripts/listfiles
++++ b/scripts/listfiles
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+-SYSINFO_OUTPUT="/var/lib/asterisk/static-http/config/sysinfo_output.html"
++
++# (a symlink to the actual temporary file)
++SYSINFO_OUTPUT="/usr/share/asterisk/static-http/config/sysinfo_output.html"
+ 
+ #/bin/echo "<div id=list_files>" > $SYSINFO_OUTPUT
+ /bin/mkdir -p $1
+--- a/scripts/gui_sysinfo
++++ b/scripts/gui_sysinfo
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+-SYSINFO_OUTPUT="/var/lib/asterisk/static-http/config/sysinfo_output.html"
++
++# (a symlink to the actual temporary file)
++SYSINFO_OUTPUT="/usr/share/asterisk/static-http/config/sysinfo_output.html"
+ 
+ UNAME="`uname -a`"
+ /bin/echo "<div id=si_uname>$UNAME</div>" > $SYSINFO_OUTPUT

Modified: asterisk-gui/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/patches/series?rev=6054&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/patches/series (original)
+++ asterisk-gui/trunk/debian/patches/series Sat Aug 23 17:30:56 2008
@@ -3,3 +3,4 @@
 #change_colors
 #sysinfo_path
 #log_path
+trademark

Added: asterisk-gui/trunk/debian/patches/trademark
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/patches/trademark?rev=6054&op=file
==============================================================================
--- asterisk-gui/trunk/debian/patches/trademark (added)
+++ asterisk-gui/trunk/debian/patches/trademark Sat Aug 23 17:30:56 2008
@@ -1,0 +1,38 @@
+The following patch is added to avoid potential issues with 
+http://www.digium.com/en/company/view-policy.php?id=Trademark-Policy
+
+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" />
+ <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>
+ 
+-<h2>Asterisk&trade; Configuration Engine</h2>
++<h2>GUI for Asterisk&trade;</h2>
+ 
+ <table align="center" id='loginForm'>
+ 	<tr>	<td colspan="2"><BR></td>
+--- a/config/index.html
++++ b/config/index.html
+@@ -85,7 +85,7 @@ var sessionData = {
+ 
+ </script>
+ <head>
+-	<title>Asterisk Configuration GUI</title>
++	<title>GUI for Asterisk</title>
+ 	<link rel="shortcut icon" href="images/favicon.ico" />
+ </head>
+ <body topmargin=1 leftmargin=2>
+@@ -106,7 +106,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>

Added: asterisk-gui/trunk/debian/postinst
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/postinst?rev=6054&op=file
==============================================================================
--- asterisk-gui/trunk/debian/postinst (added)
+++ asterisk-gui/trunk/debian/postinst Sat Aug 23 17:30:56 2008
@@ -1,0 +1,43 @@
+#!/bin/sh
+# postinst script for #PACKAGE#
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+        # the user and group should be created by the package asterisk:
+	chown asterisk: /var/lib/asterisk/gui_backups
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

Added: asterisk-gui/trunk/debian/postrm
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/postrm?rev=6054&op=file
==============================================================================
--- asterisk-gui/trunk/debian/postrm (added)
+++ asterisk-gui/trunk/debian/postrm Sat Aug 23 17:30:56 2008
@@ -1,0 +1,43 @@
+#!/bin/sh
+# postrm script for #PACKAGE#
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    purge)
+        rm -rf /var/lib/asterisk/gui_backups/*
+	rm -rf /var/spool/asterisk/tmp/sysinfo_output.html
+    ;;
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+




More information about the Pkg-voip-commits mailing list