diff -Nru op-panel-0.30~dfsg/debian/changelog op-panel-0.30~dfsg/debian/changelog --- op-panel-0.30~dfsg/debian/changelog 2010-11-12 06:00:38.000000000 +0000 +++ op-panel-0.30~dfsg/debian/changelog 2010-11-12 05:46:25.000000000 +0000 @@ -1,3 +1,31 @@ +op-panel (0.30~dfsg-3ubuntu1) natty; urgency=low + + * Merge from Debian Unstable, remaining changes: + - debian/patches/ : + + 04_callerid.dpatch : Print callerid name and number + + 05_register.dpatch : Grey out phones that don't have an IP address + + 07_ming43_buttons.dpatch : Gradient buttons for Ming 0.4.3 + + 08_sampleconfig.dpatch : Improved sample config files + - Modify all the patches to fit properly with the Debian patches + - Removed patch 06_ming43.dpatch as it is now in Debian. + + -- Bilal Akhtar Fri, 12 Nov 2010 08:43:12 +0300 + +op-panel (0.30~dfsg-3) unstable; urgency=low + + [ Gabriele Giacone ] + * Team upload. + * Added patch to remove SWFTEXTFIELD_USEFONT refs (Closes: #582377). + * Standards version to 3.9.1. + * Forced source format to 1.0. + * Fixed init script for dependency based boot sequence. + + [ Tzafrir Cohen ] + * Use a @debian.org email. + * Dpkg V3 format. Refresh patches while we're at it. + + -- Tzafrir Cohen Mon, 16 Aug 2010 01:12:49 +0300 + op-panel (0.30~dfsg-2ubuntu1) lucid; urgency=low * Merge from Debian (pkgvoip svn) diff -Nru op-panel-0.30~dfsg/debian/control op-panel-0.30~dfsg/debian/control --- op-panel-0.30~dfsg/debian/control 2010-11-12 06:00:38.000000000 +0000 +++ op-panel-0.30~dfsg/debian/control 2010-11-12 05:40:15.000000000 +0000 @@ -3,10 +3,11 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian VoIP Team -Uploaders: Alejandro Rios P. , Kilian Krause , Tzafrir Cohen -Build-Depends: debhelper (>= 5.0.0), dpatch +Uploaders: Alejandro Rios P. , Kilian Krause , + Tzafrir Cohen +Build-Depends: debhelper (>= 5.0.0) Build-Depends-Indep: perl (>= 5), libswf-perl (>= 0.3.0-8), ttf-dejavu-core -Standards-Version: 3.8.3 +Standards-Version: 3.9.1 Homepage: http://www.asternic.org/ Vcs-Svn: svn://svn.debian.org/pkg-voip/op-panel/trunk/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/op-panel/?op=log diff -Nru op-panel-0.30~dfsg/debian/copyright op-panel-0.30~dfsg/debian/copyright --- op-panel-0.30~dfsg/debian/copyright 2010-11-12 06:00:38.000000000 +0000 +++ op-panel-0.30~dfsg/debian/copyright 2010-11-12 04:57:16.000000000 +0000 @@ -56,7 +56,7 @@ b) the "Artistic License" which comes with Perl. On Debian systems, the complete text of the GNU General Public License -can be found in `/usr/share/common-licenses/GPL' and the Artistic +can be found in `/usr/share/common-licenses/GPL-1' and the Artistic Licence in `/usr/share/common-licenses/Artistic'. 3. The following files share the same Licensing terms that can be found diff -Nru op-panel-0.30~dfsg/debian/op-panel.init op-panel-0.30~dfsg/debian/op-panel.init --- op-panel-0.30~dfsg/debian/op-panel.init 2010-11-12 06:00:38.000000000 +0000 +++ op-panel-0.30~dfsg/debian/op-panel.init 2010-11-12 04:57:16.000000000 +0000 @@ -8,10 +8,8 @@ ### BEGIN INIT INFO # Provides: op-panel -# Required-Start: $syslog -# Required-Stop: $syslog -# Should-Start: $local_fs -# Should-Stop: $local_fs +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Flash Asterisk Operator Panel diff -Nru op-panel-0.30~dfsg/debian/patches/00list op-panel-0.30~dfsg/debian/patches/00list --- op-panel-0.30~dfsg/debian/patches/00list 2010-11-12 06:00:38.000000000 +0000 +++ op-panel-0.30~dfsg/debian/patches/00list 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -#01_op_server.pl.dpatch -02_cfgcomments.dpatch -03_libmingfonts.dpatch -04_callerid.dpatch -05_register.dpatch -06_ming43.dpatch -07_ming43_buttons.dpatch -08_sampleconfig.dpatch diff -Nru op-panel-0.30~dfsg/debian/patches/01_op_server.pl.dpatch op-panel-0.30~dfsg/debian/patches/01_op_server.pl.dpatch --- op-panel-0.30~dfsg/debian/patches/01_op_server.pl.dpatch 2010-11-12 06:00:38.000000000 +0000 +++ op-panel-0.30~dfsg/debian/patches/01_op_server.pl.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,92 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_op_server.pl.dpatch by Alejandro Rios P. -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad op-panel-0.26.dfsg~/op_server.pl op-panel-0.26.dfsg/op_server.pl ---- op-panel-0.26.dfsg~/op_server.pl 2006-09-09 07:00:06.000000000 +0000 -+++ op-panel-0.26.dfsg/op_server.pl 2006-09-09 07:01:11.000000000 +0000 -@@ -308,6 +308,9 @@ - $directorio = $confdir; - } - -+open( CONFIG, "<$directorio/op_server.cfg" ) -+ or die("Could not open op_server.cfg. Aborting..."); -+ - if ( $logdir ne "" ) { - open( STDOUT, ">>$logdir/output.log" ) - or die "Can't open output log $logdir/error.log"; -@@ -319,7 +322,8 @@ - defined( my $pid = fork ) or die "Can't Fork: $!"; - exit if $pid; - setsid or die "Can't start a new session: $!"; -- open MYPIDFILE, ">$pidfile"; -+ open MYPIDFILE, ">$pidfile" -+ or die "Failed to open PID file $pidfile for writing." ; - print MYPIDFILE $$; - close MYPIDFILE; - -@@ -9100,11 +9104,11 @@ - - =head1 NAME - --op_server.pl - Proxy server for the Asterisk Flash Operator Panel -+op_server - Proxy server for the Asterisk Flash Operator Panel - - =head1 SYNOPSIS - --op_server.pl [options] -+op_server [options] - - Options: - -?, --help -@@ -9125,11 +9129,11 @@ - - =item B<--pidfile> - --Specify the pid file to use when running in daemon mode. Defaults to /var/run/op_panel.pid -+Specify the pid file to use when running in daemon mode. Defaults to /var/run/op_panel.pid. See /etc/init.d/op-panel for Debian defaults. - - =item B<--confdir> - --Specify where to look for the configuration files. If omited, it will look for them in the same directory where op_server.pl resides -+Specify where to look for the configuration files. If omited, it will look for them in the same directory where op_server resides - - =item B<--logdir> - -@@ -9151,6 +9155,31 @@ - - =head1 DESCRIPTION - --B will read the given input file(s) and do someting useful with the contents thereof. -+B is a proxy server for the Flash Operator Panel. It reads configuration files and updates the data to display on the panel. - --=cut -+=head1 FILES -+ -+=over 8 -+ -+=item B -+ -+The configuration files of the operator panel daemon reside in that directory -+(may differ on other distributions). Those include: -+ -+=item B -+ -+The server's configuration file. See remarks in file for documentation. -+ -+=item B -+ -+Defines the layout of the operator panel, and also which phones to track. -+ -+=item B -+ -+The standard output of the daemon, including debugging prints and dumps. -+ -+=item B -+ -+The standard error of the daemon. Should normally be empty. -+ -+=cut diff -Nru op-panel-0.30~dfsg/debian/patches/02_cfgcomments.dpatch op-panel-0.30~dfsg/debian/patches/02_cfgcomments.dpatch --- op-panel-0.30~dfsg/debian/patches/02_cfgcomments.dpatch 2010-11-12 06:00:38.000000000 +0000 +++ op-panel-0.30~dfsg/debian/patches/02_cfgcomments.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_cfgcomments.dpatch by Alejandro Rios P. -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix sample configuration: -## DP: - reference the examples. -## DP: - Connect to Asterisk on localhost by default. -## DP: - The .swf file is in /usr/share/op-panel/flash . - -@DPATCH@ -diff -urNad --exclude=CVS --exclude=.svn ./op_astdb.cfg /tmp/dpep-work.2mpVad/op-panel-0.26/op_astdb.cfg ---- ./op_astdb.cfg 2006-05-10 07:03:40.000000000 -0500 -+++ /tmp/dpep-work.2mpVad/op-panel-0.26/op_astdb.cfg 2006-05-19 13:20:39.000000000 -0500 -@@ -1,3 +1,6 @@ -+; Here you can configure Asterisk Database settings for op-panel. -+; See /usr/share/doc/op-panel/examples -+ - ; FOP will ask for the value of the asterisk database families - ; specified between brackets. If the value is non empty, it will - ; send the commands to the flash client. Note that the family -#diff -urNad --exclude=CVS --exclude=.svn ./op_buttons.cfg /tmp/dpep-work.2mpVad/op-panel-0.26/op_buttons.cfg -#--- ./op_buttons.cfg 2006-05-10 07:03:40.000000000 -0500 -#+++ /tmp/dpep-work.2mpVad/op-panel-0.26/op_buttons.cfg 2006-05-19 13:20:39.000000000 -0500 -#@@ -1,3 +1,6 @@ -#+; Here you can configure button settings for op-panel. -#+; See /usr/share/doc/op-panel/examples -#+ -# [SIP/10] ; Channel name -# Position=1 ; Button number in the console -# Label="10 Fax" ; Text label for the button -diff -urNad --exclude=CVS --exclude=.svn ./op_server.cfg /tmp/dpep-work.2mpVad/op-panel-0.26/op_server.cfg ---- ./op_server.cfg 2006-05-10 07:03:40.000000000 -0500 -+++ /tmp/dpep-work.2mpVad/op-panel-0.26/op_server.cfg 2006-05-19 13:23:12.000000000 -0500 -@@ -1,6 +1,6 @@ - [general] - ; host or ip address of asterisk --manager_host=192.168.0.1 -+manager_host=127.0.0.1 - manager_port=5038 - ; user and secret for connecting to * manager - manager_user=user -@@ -50,7 +50,7 @@ - - ; location of the .swf file in your disk (must reside somewhere - ; inside your web root) --flash_dir=/var/www/html/panel -+flash_dir=/usr/share/op-panel/flash - - ; secret code for performing hangups and transfers - security_code=dkd4393kld diff -Nru op-panel-0.30~dfsg/debian/patches/03_libmingfonts.dpatch op-panel-0.30~dfsg/debian/patches/03_libmingfonts.dpatch --- op-panel-0.30~dfsg/debian/patches/03_libmingfonts.dpatch 2010-11-12 06:00:38.000000000 +0000 +++ op-panel-0.30~dfsg/debian/patches/03_libmingfonts.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 03_libmingfonts.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Replace the non-free Arial with DejaVu Sans. - -@DPATCH@ -diff -urNad op_panel-0.27~/ming-source/operator_panel.pl op_panel-0.27/ming-source/operator_panel.pl ---- op_panel-0.27~/ming-source/operator_panel.pl 2007-04-27 12:44:58.000000000 -0500 -+++ op_panel-0.27/ming-source/operator_panel.pl 2007-04-27 17:43:48.000000000 -0500 -@@ -31,8 +31,8 @@ - - - --$fuente="/usr/src/ming/util/fonts/Arial.fdb"; --$fuente_nombre="Arial"; -+$fuente="/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf"; -+$fuente_nombre="DejaVu Sans"; - - sub maketextfield { - $name = shift; diff -Nru op-panel-0.30~dfsg/debian/patches/04_callerid.dpatch op-panel-0.30~dfsg/debian/patches/04_callerid.dpatch --- op-panel-0.30~dfsg/debian/patches/04_callerid.dpatch 2010-11-12 06:00:38.000000000 +0000 +++ op-panel-0.30~dfsg/debian/patches/04_callerid.dpatch 2010-11-12 05:18:44.000000000 +0000 @@ -5,10 +5,9 @@ ## DP: Show both caller number and caller name @DPATCH@ -diff -urNad op-panel-0.29~/op_server.pl op-panel-0.29/op_server.pl ---- op-panel-0.29~/op_server.pl 2008-05-29 09:27:48.000000000 -0400 -+++ op-panel-0.29/op_server.pl 2008-06-18 14:48:25.000000000 -0400 -@@ -5110,6 +5110,8 @@ +--- a/op_server.pl ++++ b/op_server.pl +@@ -5147,6 +5147,8 @@ } $saved_clidnum{"$server^$hash_temporal{'Channel'}"} = $save_clidnum; $saved_clidname{"$server^$hash_temporal{'Channel'}"} = $save_clidname; diff -Nru op-panel-0.30~dfsg/debian/patches/05_register.dpatch op-panel-0.30~dfsg/debian/patches/05_register.dpatch --- op-panel-0.30~dfsg/debian/patches/05_register.dpatch 2010-11-12 06:00:38.000000000 +0000 +++ op-panel-0.30~dfsg/debian/patches/05_register.dpatch 2010-11-12 05:19:00.000000000 +0000 @@ -5,10 +5,9 @@ ## DP: Grey out phones that don't have an IP even if they do not use "qualify". @DPATCH@ -diff -urNad op-panel-0.29~/op_server.pl op-panel-0.29/op_server.pl ---- op-panel-0.29~/op_server.pl 2008-05-29 09:27:48.000000000 -0400 -+++ op-panel-0.29/op_server.pl 2008-06-18 14:48:25.000000000 -0400 -@@ -5280,8 +5282,14 @@ +--- a/op_server.pl ++++ b/op_server.pl +@@ -5319,8 +5319,14 @@ } if ( $state =~ /^Unm/ ) { diff -Nru op-panel-0.30~dfsg/debian/patches/cfgcomments op-panel-0.30~dfsg/debian/patches/cfgcomments --- op-panel-0.30~dfsg/debian/patches/cfgcomments 1970-01-01 00:00:00.000000000 +0000 +++ op-panel-0.30~dfsg/debian/patches/cfgcomments 2010-11-12 05:32:00.000000000 +0000 @@ -0,0 +1,49 @@ +Author: Alejandro Rios P. +Description: Fix sample configuration + +Debian-specific fixes to the sample configuration. + - reference the examples. + - Connect to Asterisk on localhost by default. + - The .swf file is in /usr/share/op-panel/flash . + +--- a/op_astdb.cfg ++++ b/op_astdb.cfg +@@ -1,3 +1,6 @@ ++; Here you can configure Asterisk Database settings for op-panel. ++; See /usr/share/doc/op-panel/examples ++ + ; FOP will ask for the value of the asterisk database families + ; specified between brackets. If the value is non empty, it will + ; send the commands to the flash client. Note that the family +--- a/op_server.cfg ++++ b/op_server.cfg +@@ -3,7 +3,7 @@ + use_amportal_conf=0; + + ; host or ip address of asterisk +-manager_host=192.168.0.1 ++manager_host=127.0.0.1 + manager_port=5038 + ; user and secret for connecting to * manager + manager_user=user +@@ -53,7 +53,7 @@ + + ; location of the .swf file in your disk (must reside somewhere + ; inside your web root) +-flash_dir=/var/www/html/panel ++flash_dir=/usr/share/op-panel/flash + + ; secret code for performing hangups and transfers + security_code=dkd4393kld +--- a/op_buttons.cfg ++++ b/op_buttons.cfg +@@ -1,6 +1,9 @@ + #Sample config file for 8 PSTN lines and 36 extensions + #More examples at the end of the file + ++# Here you can configure Asterisk Database settings for op-panel. ++# See /usr/share/doc/op-panel/examples ++ + [SIP/1101] + Position=n + Label="1101" diff -Nru op-panel-0.30~dfsg/debian/patches/libmingfonts op-panel-0.30~dfsg/debian/patches/libmingfonts --- op-panel-0.30~dfsg/debian/patches/libmingfonts 1970-01-01 00:00:00.000000000 +0000 +++ op-panel-0.30~dfsg/debian/patches/libmingfonts 2010-11-12 04:57:16.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Replace the non-free Arial with DejaVu Sans + +Avoid the need to embed the non-free Arial font. Replace it with a free +alternative. + +--- a/ming-source/operator_panel.pl ++++ b/ming-source/operator_panel.pl +@@ -34,8 +34,8 @@ $movie->setRate(20); + + + +-$fuente="/usr/src/ming/util/fonts/Arial.fdb"; +-$fuente_nombre="Arial"; ++$fuente="/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf"; ++$fuente_nombre="DejaVu Sans"; + + sub maketextfield { + $name = shift; diff -Nru op-panel-0.30~dfsg/debian/patches/op_server.pl op-panel-0.30~dfsg/debian/patches/op_server.pl --- op-panel-0.30~dfsg/debian/patches/op_server.pl 1970-01-01 00:00:00.000000000 +0000 +++ op-panel-0.30~dfsg/debian/patches/op_server.pl 2010-11-12 04:57:16.000000000 +0000 @@ -0,0 +1,92 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_op_server.pl.dpatch by Alejandro Rios P. +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad op-panel-0.26.dfsg~/op_server.pl op-panel-0.26.dfsg/op_server.pl +--- op-panel-0.26.dfsg~/op_server.pl 2006-09-09 07:00:06.000000000 +0000 ++++ op-panel-0.26.dfsg/op_server.pl 2006-09-09 07:01:11.000000000 +0000 +@@ -308,6 +308,9 @@ + $directorio = $confdir; + } + ++open( CONFIG, "<$directorio/op_server.cfg" ) ++ or die("Could not open op_server.cfg. Aborting..."); ++ + if ( $logdir ne "" ) { + open( STDOUT, ">>$logdir/output.log" ) + or die "Can't open output log $logdir/error.log"; +@@ -319,7 +322,8 @@ + defined( my $pid = fork ) or die "Can't Fork: $!"; + exit if $pid; + setsid or die "Can't start a new session: $!"; +- open MYPIDFILE, ">$pidfile"; ++ open MYPIDFILE, ">$pidfile" ++ or die "Failed to open PID file $pidfile for writing." ; + print MYPIDFILE $$; + close MYPIDFILE; + +@@ -9100,11 +9104,11 @@ + + =head1 NAME + +-op_server.pl - Proxy server for the Asterisk Flash Operator Panel ++op_server - Proxy server for the Asterisk Flash Operator Panel + + =head1 SYNOPSIS + +-op_server.pl [options] ++op_server [options] + + Options: + -?, --help +@@ -9125,11 +9129,11 @@ + + =item B<--pidfile> + +-Specify the pid file to use when running in daemon mode. Defaults to /var/run/op_panel.pid ++Specify the pid file to use when running in daemon mode. Defaults to /var/run/op_panel.pid. See /etc/init.d/op-panel for Debian defaults. + + =item B<--confdir> + +-Specify where to look for the configuration files. If omited, it will look for them in the same directory where op_server.pl resides ++Specify where to look for the configuration files. If omited, it will look for them in the same directory where op_server resides + + =item B<--logdir> + +@@ -9151,6 +9155,31 @@ + + =head1 DESCRIPTION + +-B will read the given input file(s) and do someting useful with the contents thereof. ++B is a proxy server for the Flash Operator Panel. It reads configuration files and updates the data to display on the panel. + +-=cut ++=head1 FILES ++ ++=over 8 ++ ++=item B ++ ++The configuration files of the operator panel daemon reside in that directory ++(may differ on other distributions). Those include: ++ ++=item B ++ ++The server's configuration file. See remarks in file for documentation. ++ ++=item B ++ ++Defines the layout of the operator panel, and also which phones to track. ++ ++=item B ++ ++The standard output of the daemon, including debugging prints and dumps. ++ ++=item B ++ ++The standard error of the daemon. Should normally be empty. ++ ++=cut diff -Nru op-panel-0.30~dfsg/debian/patches/remove_SWFTEXTFIELD_USEFONT op-panel-0.30~dfsg/debian/patches/remove_SWFTEXTFIELD_USEFONT --- op-panel-0.30~dfsg/debian/patches/remove_SWFTEXTFIELD_USEFONT 1970-01-01 00:00:00.000000000 +0000 +++ op-panel-0.30~dfsg/debian/patches/remove_SWFTEXTFIELD_USEFONT 2010-11-12 05:36:22.000000000 +0000 @@ -0,0 +1,375 @@ +Description: Remove references to SWFTEXTFIELD_USEFONT flag +Bug-Debian: http://bugs.debian.org/582377 +Author: Gabriele Giacone <1o5g4r8o@gmail.com> + +--- a/ming-source/operator_panel.pl ++++ b/ming-source/operator_panel.pl +@@ -42,7 +42,7 @@ + $font = shift; + $str = shift; + +- $txtfield = new SWF::TextField( SWFTEXTFIELD_MULTILINE | SWFTEXTFIELD_WORDWRAP | SWFTEXTFIELD_USEFONT ); ++ $txtfield = new SWF::TextField( SWFTEXTFIELD_MULTILINE | SWFTEXTFIELD_WORDWRAP ); + $txtfield->setHeight(254); + $txtfield->setBounds(200,30); + $txtfield->setName($name); +@@ -62,7 +62,7 @@ + ################################################# + ## SELECT TIMEOUT BOX + ################################################# +-$dropbox1 = new SWF::Sprite(); ++$dropbox1 = new SWF::MovieClip(); + ### Shape 1 ### + $s1 = new SWF::Shape(); + $s1->movePenTo(5600, 0); +@@ -207,7 +207,7 @@ + + $font_general = new SWF::Font($fuente); + +-$s8 = new SWF::TextField(SWFTEXTFIELD_NOEDIT | SWFTEXTFIELD_USEFONT | SWFTEXTFIELD_NOSELECT ); ++$s8 = new SWF::TextField(SWFTEXTFIELD_NOEDIT | SWFTEXTFIELD_NOSELECT ); + $s8->setBounds(1411, 398); + $s8->setFont($font_general); + #$s8->setFont(new SWF::Font("_sans")); +@@ -228,7 +228,7 @@ + + ## MovieCLIP progress graphic + ## +-$progressclip = new SWF::Sprite(); ++$progressclip = new SWF::MovieClip(); + + ### Shape 2 ### + $s2 = new SWF::Shape(); +@@ -1761,7 +1761,7 @@ + #$font_general = new SWF::Font($fuente); + + # Ventana INPUT del security code +-$codebox = new SWF::Sprite(); ++$codebox = new SWF::MovieClip(); + ### Shape 1 ### + $s1 = new SWF::Shape(); + $g = new SWF::Gradient(); +@@ -1828,7 +1828,7 @@ + $s3->drawLine(-4713, 0); + $i4 = $codebox->add($s3); + +-$s5 = new SWF::TextField(SWFTEXTFIELD_NOEDIT | SWFTEXTFIELD_MULTILINE | SWFTEXTFIELD_NOSELECT | SWFTEXTFIELD_USEFONT ); ++$s5 = new SWF::TextField(SWFTEXTFIELD_NOEDIT | SWFTEXTFIELD_MULTILINE | SWFTEXTFIELD_NOSELECT ); + $s5->setBounds(5650, 653); + $s5->setFont($font_general); + $s5->setHeight(320); +@@ -1839,7 +1839,7 @@ + $i5 = $codebox->add($s5); + $i5->moveTo(2704, 3067); + +-$s6 = new SWF::TextField( SWFTEXTFIELD_PASSWORD | SWFTEXTFIELD_USEFONT ); ++$s6 = new SWF::TextField( SWFTEXTFIELD_PASSWORD ); + $s6->setBounds(4579, 398); + $s6->setFont($font_general); + $s6->setHeight(320); +@@ -2032,7 +2032,7 @@ + # with the number constructed from javascript while setting + # the frame of the movieclip. + # +-$numdial = new SWF::Sprite(); ++$numdial = new SWF::MovieClip(); + $numdial->add(new SWF::Action(<<"EndOfActionScript")); + _global.numero_a_discar+="0"; + stop(); +@@ -2119,7 +2119,7 @@ + + # Detail Window movieclip + +-$detail_window = new SWF::Sprite(); ++$detail_window = new SWF::MovieClip(); + ### Shape 1 ### + $s1 = new SWF::Shape(); + $g = new SWF::Gradient(); +@@ -2164,7 +2164,7 @@ + $s1->drawLine(0, -3966); + $s1->drawCurve(0, -44, -30, -33); + +-$s3 = new SWF::TextField(SWFTEXTFIELD_NOEDIT | SWFTEXTFIELD_USEFONT ); ++$s3 = new SWF::TextField(SWFTEXTFIELD_NOEDIT ); + $s3->setBounds(3112, 377); + $s3->setFont($font_general); + $s3->setHeight(280); +@@ -2173,7 +2173,7 @@ + $s3->setName('title'); + $s3->addString('Last call details:'); + +-$s5 = new SWF::TextField(SWFTEXTFIELD_NOEDIT | SWFTEXTFIELD_USEFONT ); ++$s5 = new SWF::TextField(SWFTEXTFIELD_NOEDIT ); + $s5->setBounds(907, 330); + $s5->setFont($font_general); + $s5->setHeight(260); +@@ -2182,7 +2182,7 @@ + $s5->setName('label'); + $s5->addString('From:'); + +-$s6 = new SWF::TextField(SWFTEXTFIELD_NOEDIT | SWFTEXTFIELD_USEFONT ); ++$s6 = new SWF::TextField(SWFTEXTFIELD_NOEDIT ); + $s6->setBounds(1097, 330); + $s6->setFont($font_general); + $s6->setHeight(260); +@@ -2191,7 +2191,7 @@ + $s6->setName('duration_label'); + $s6->addString('Duration:'); + +-$s7 = new SWF::TextField(SWFTEXTFIELD_NOEDIT | SWFTEXTFIELD_USEFONT ); ++$s7 = new SWF::TextField(SWFTEXTFIELD_NOEDIT ); + $s7->setBounds(2517, 330); + $s7->setFont($font_general); + $s7->setHeight(260); +@@ -2199,7 +2199,7 @@ + $s7->align(SWFTEXTFIELD_ALIGN_LEFT); + $s7->setName('clid'); + +-$s8 = new SWF::TextField(SWFTEXTFIELD_NOEDIT | SWFTEXTFIELD_USEFONT ); ++$s8 = new SWF::TextField(SWFTEXTFIELD_NOEDIT ); + $s8->setBounds(2116, 330); + $s8->setFont($font_general); + $s8->setHeight(260); +@@ -2391,7 +2391,7 @@ + + + # Superdetail window +-$superdetails = new SWF::Sprite(); ++$superdetails = new SWF::MovieClip(); + $s1 = new SWF::Shape(); + $g = new SWF::Gradient(); + $g->addEntry(0.000000, 0xff, 0xff, 0xff); +@@ -2435,7 +2435,7 @@ + $s1->drawLine(0, -3966); + $s1->drawCurve(0, -44, -30, -33); + +-$s3 = new SWF::TextField(SWFTEXTFIELD_NOEDIT | SWFTEXTFIELD_MULTILINE | SWFTEXTFIELD_USEFONT ); ++$s3 = new SWF::TextField(SWFTEXTFIELD_NOEDIT | SWFTEXTFIELD_MULTILINE ); + $s3->setBounds(4939, 4740); + $s3->setFont($font_general); + $s3->setHeight(260); +@@ -2592,7 +2592,7 @@ + "); + + +-$fs3 = new SWF::TextField(SWFTEXTFIELD_NOEDIT | SWFTEXTFIELD_NOSELECT | SWFTEXTFIELD_USEFONT ); ++$fs3 = new SWF::TextField(SWFTEXTFIELD_NOEDIT | SWFTEXTFIELD_NOSELECT ); + $fs3->setBounds(939, 200); + $fs3->setName('titlefs3'); + $fs3->setFont($font_general); +@@ -2601,7 +2601,7 @@ + $fs3->align(SWFTEXTFIELD_ALIGN_LEFT); + $fs3->addString('Queue'); + +-$fs2 = new SWF::TextField(SWFTEXTFIELD_NOEDIT | SWFTEXTFIELD_NOSELECT | SWFTEXTFIELD_USEFONT ); ++$fs2 = new SWF::TextField(SWFTEXTFIELD_NOEDIT | SWFTEXTFIELD_NOSELECT ); + $fs2->setBounds(939, 200); + $fs2->setName('titlefs2'); + $fs2->setFont($font_general); +@@ -2610,7 +2610,7 @@ + $fs2->align(SWFTEXTFIELD_ALIGN_LEFT); + $fs2->addString('Call'); + +-$sptab = new SWF::Sprite(); ++$sptab = new SWF::MovieClip(); + $sptab->add($s8); + $sptab->add($s8a); + $sptab->nextFrame(); +@@ -2674,7 +2674,7 @@ + + + +-$ventana_debug = new SWF::Sprite(); ++$ventana_debug = new SWF::MovieClip(); + ### Shape 1 ### + $s1 = new SWF::Shape(); + $s1->movePenTo(120, -120); +@@ -2750,7 +2750,7 @@ + $s4->drawLine(0, -3966); + $s4->drawCurve(0, -44, -30, -33); + +-$s6 = new SWF::TextField(SWFTEXTFIELD_NOEDIT | SWFTEXTFIELD_NOSELECT | SWFTEXTFIELD_USEFONT ); ++$s6 = new SWF::TextField(SWFTEXTFIELD_NOEDIT | SWFTEXTFIELD_NOSELECT ); + $s6->setBounds(8104, 398); + $s6->setFont($font_general); + $s6->setHeight(320); +@@ -2874,7 +2874,7 @@ + $s11->drawLine(0, -3620); + $s11->drawLine(8158, 0); + +-$s13 = new SWF::TextField(SWFTEXTFIELD_NOEDIT | SWFTEXTFIELD_MULTILINE | SWFTEXTFIELD_USEFONT ); ++$s13 = new SWF::TextField(SWFTEXTFIELD_NOEDIT | SWFTEXTFIELD_MULTILINE ); + $s13->setBounds(8000, 3606); + $s13->setFont($font_general); + $s13->setHeight(320); +@@ -2918,7 +2918,7 @@ + + + +-$ledcolor = new SWF::Sprite(); ++$ledcolor = new SWF::MovieClip(); + $s1 = new SWF::Shape(); + $s1->movePenTo(524, 125); + $s1->setLeftFill(255, 0x00, 0x00); +@@ -2940,7 +2940,7 @@ + $ledcolor->nextFrame(); # end of frame 1 + + +-$ledsombra = new SWF::Sprite(); ++$ledsombra = new SWF::MovieClip(); + $s2 = new SWF::Shape(); + $s2->movePenTo(216, -124); + $s2->setRightFill(0x00, 0x00, 0x00, 0x32); +@@ -3038,7 +3038,7 @@ + $i2->addColor(0x00, 0x00, 0x00); + $ledsombra->nextFrame(); + +-$ledbrillo = new SWF::Sprite(); ++$ledbrillo = new SWF::MovieClip(); + $s4 = new SWF::Shape(); + $g = new SWF::Gradient(); + $g->addEntry(0.368627, 0x00, 0x00, 0x00, 0x00); +@@ -3111,7 +3111,7 @@ + + ####### Arrow + +-my $fle = new SWF::Sprite(); ++my $fle = new SWF::MovieClip(); + ### Shape 1 ### + $s1 = new SWF::Shape(); + $s1->movePenTo(5642, 3859); +@@ -3751,7 +3751,7 @@ + $s_icon2->drawLine(20, 0); + + # icon3 Movieclip +-my $i_icon2 = new SWF::Sprite(); ++my $i_icon2 = new SWF::MovieClip(); + my $item = $i_icon2->add($s_icon2); + $item->scaleTo(0.5); + $i_icon2->nextFrame(); +@@ -4758,7 +4758,7 @@ + $s_icon1_f2->drawCurve(-73, 273, -12, 177); + + # Icon1 Movieclip +-my $i_icon1 = new SWF::Sprite(); ++my $i_icon1 = new SWF::MovieClip(); + $item = $i_icon1->add($s_icon1); + $item->scaleTo(0.5); + $item->moveTo(-3000, -2100); +@@ -4770,7 +4770,7 @@ + $i_icon1->nextFrame(); + + +-$envelope = new SWF::Sprite(); ++$envelope = new SWF::MovieClip(); + ### Shape 1 ### + $s1 = new SWF::Shape(); + $s1->movePenTo(8722, 1745); +@@ -4954,7 +4954,7 @@ + + + +-$telefono3 = new SWF::Sprite(); ++$telefono3 = new SWF::MovieClip(); + ### Shape 1 ### + $s1 = new SWF::Shape(); + $s1->movePenTo(7575, 1918); +@@ -5027,7 +5027,7 @@ + + ### Shape 1 ### + +-$telefono4 = new SWF::Sprite(); ++$telefono4 = new SWF::MovieClip(); + $s1 = new SWF::Shape(); + $s1->movePenTo(8338, 3364); + $s1->setLeftFill(0x00, 0x00, 0x00); +@@ -5268,7 +5268,7 @@ + + + +-$conference1 = new SWF::Sprite(); ++$conference1 = new SWF::MovieClip(); + ### Shape 1 ### + $s1 = new SWF::Shape(); + $s1->movePenTo(7708, 2179); +@@ -5961,7 +5961,7 @@ + $conference1->nextFrame(); # end of frame 1 + + +-$conference2 = new SWF::Sprite(); ++$conference2 = new SWF::MovieClip(); + ### Shape 1 ### + $s1 = new SWF::Shape(); + $s1->movePenTo(6139, 1671); +@@ -6167,7 +6167,7 @@ + + + # status log toolbar +-# $statusbar = new SWF::Sprite(); ++# $statusbar = new SWF::MovieClip(); + ### Shape 1 ### + # $s1 = new SWF::Shape(); + # $s1->movePenTo(19920, 0); +@@ -6185,7 +6185,7 @@ + + + +-$extrainfo = new SWF::Sprite(); ++$extrainfo = new SWF::MovieClip(); + ### Shape 1 ### + $s1 = new SWF::Shape(); + $s1->movePenTo(5400, 0); +@@ -6212,7 +6212,7 @@ + $i2 = $extrainfo->add($s1); + $i2->scaleTo(0.5); + +-#$s3 = new SWF::TextField(SWFTEXTFIELD_USEFONT ); ++#$s3 = new SWF::TextField(); + #$s3->setBounds(3740, 398); + #$s3->setFont($font_general); + #$s3->setHeight(320); +@@ -6228,7 +6228,7 @@ + + + +-$boton_ayuda = new SWF::Sprite(); ++$boton_ayuda = new SWF::MovieClip(); + ### Shape 1 ### + $s1 = new SWF::Shape(); + $s1->movePenTo(439, 222); +@@ -6421,7 +6421,7 @@ + $boton_ayuda->nextFrame(); # end of frame 1 + + +-$boton_debug = new SWF::Sprite(); ++$boton_debug = new SWF::MovieClip(); + ### Shape 1 ### + $s1 = new SWF::Shape(); + $s1->movePenTo(415, 159); +@@ -6669,7 +6669,7 @@ + + + +-$boton_reload = new SWF::Sprite(); ++$boton_reload = new SWF::MovieClip(); + ### Shape 1 ### + $s1 = new SWF::Shape(); + $s1->movePenTo(424, 154); +@@ -6866,7 +6866,7 @@ + $boton_reload->remove($i1); + + +-$boton_security = new SWF::Sprite(); ++$boton_security = new SWF::MovieClip(); + ### Shape 1 ### + $s1 = new SWF::Shape(); + $s1->movePenTo(493, 135); +@@ -7057,7 +7057,7 @@ + $boton_security->nextFrame(); # end of frame 1 + $boton_security->remove($i1); + +-$boton_security_unlock = new SWF::Sprite(); ++$boton_security_unlock = new SWF::MovieClip(); + ### Shape 1 ### + $s1 = new SWF::Shape(); + $s1->movePenTo(493, 135); diff -Nru op-panel-0.30~dfsg/debian/patches/series op-panel-0.30~dfsg/debian/patches/series --- op-panel-0.30~dfsg/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ op-panel-0.30~dfsg/debian/patches/series 2010-11-12 05:39:19.000000000 +0000 @@ -0,0 +1,8 @@ +#op_server.pl +08_sampleconfig.dpatch +cfgcomments +libmingfonts +remove_SWFTEXTFIELD_USEFONT +04_callerid.dpatch +05_register.dpatch +07_ming43_buttons.dpatch diff -Nru op-panel-0.30~dfsg/debian/rules op-panel-0.30~dfsg/debian/rules --- op-panel-0.30~dfsg/debian/rules 2010-11-12 06:00:38.000000000 +0000 +++ op-panel-0.30~dfsg/debian/rules 2010-11-12 04:57:16.000000000 +0000 @@ -4,9 +4,7 @@ # Based on example file by Joey Hess. # Uncomment this to turn on verbose mode. -export DH_VERBOSE=1 - -include /usr/share/dpatch/dpatch.make +#export DH_VERBOSE=1 DEBVERSION:=$(shell head -n 1 debian/changelog \ | sed -e 's/^[^(]*(\([^)]*\)).*/\1/') @@ -29,25 +27,24 @@ build: build-stamp -build-stamp: patch-stamp +build-stamp: dh_testdir # Add here commands to compile the package. /usr/bin/perl ming-source/operator_panel.pl /usr/bin/perl ming-source/comunicator.pl - /usr/bin/pod2man --section 8 op_server.pl debian/op_server.8 - mv op_server.pl op_server + if [ ! -r op_server ]; then mv op_server.pl op_server; fi + /usr/bin/pod2man --section 8 op_server debian/op_server.8 touch build-stamp -clean: clean-patched unpatch - -clean-patched: +clean: dh_testdir dh_testroot rm -f build-stamp # Add here commands to clean up after the build process. rm -f debian/op_server.8 + if [ -r op_server ]; then mv op_server op_server.pl; fi rm -f *.swf dh_clean diff -Nru op-panel-0.30~dfsg/debian/source/format op-panel-0.30~dfsg/debian/source/format --- op-panel-0.30~dfsg/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ op-panel-0.30~dfsg/debian/source/format 2010-11-12 06:00:39.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt)