[Pkg-voip-commits] r7800 - in /op-panel/trunk/debian: changelog control rules

[alerios at alioth.debian.org]

Author: alerios
Date: Fri Nov 13 20:17:51 2009
New Revision: 7800

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7800
Log:
 * Merging changes from ../branches/bug555234
 * Works for me with flash client.


Modified:
    op-panel/trunk/debian/changelog
    op-panel/trunk/debian/control
    op-panel/trunk/debian/rules

Modified: op-panel/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/op-panel/trunk/debian/changelog?rev=7800&op=diff
==============================================================================
--- op-panel/trunk/debian/changelog (original)
+++ op-panel/trunk/debian/changelog Fri Nov 13 20:17:51 2009
@@ -16,6 +16,10 @@
   [ Patrick Matthäi ]
   * Do not ignore errors in postrm script.
     Thanks lintian.
+
+  [ Alejandro Rios P. ]
+  * Remove embeded prototype.js and symlink to libjs-prototype (Closes: #475294).
+  * Depend on libjs-prototype >= 1.6.0.2 (Closes: #555234).
 
  -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Mon, 11 May 2009 13:25:21 +0300
 

Modified: op-panel/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/op-panel/trunk/debian/control?rev=7800&op=diff
==============================================================================
--- op-panel/trunk/debian/control (original)
+++ op-panel/trunk/debian/control Fri Nov 13 20:17:51 2009
@@ -2,7 +2,7 @@
 Section: comm
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
-Uploaders: Alejandro Rios P. <alejandro.rios at avatar.com.co>, Kilian Krause <kilian at debian.org>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Uploaders: Alejandro Rios P. <alerios at debian.org>, Kilian Krause <kilian at debian.org>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>
 Build-Depends: debhelper (>= 5.0.0), dpatch
 Build-Depends-Indep: perl (>= 5), libswf-perl (>= 0.3.0-8), ming-fonts-dejavu (>= 0.3.0-8)
 Standards-Version: 3.8.0
@@ -12,7 +12,7 @@
 
 Package: op-panel
 Architecture: all
-Depends: perl (>= 5), adduser
+Depends: perl (>= 5), adduser, libjs-prototype (>= 1.6.0.2)
 Recommends: asterisk
 Enhances: destar
 Description: switchboard type application for the Asterisk PBX

Modified: op-panel/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/op-panel/trunk/debian/rules?rev=7800&op=diff
==============================================================================
--- op-panel/trunk/debian/rules (original)
+++ op-panel/trunk/debian/rules Fri Nov 13 20:17:51 2009
@@ -61,11 +61,12 @@
 	# Add here commands to install the package into debian/op-panel.
 	cp -a op_server.pl debian/op-panel/usr/sbin/op_server
 	cp -a operator_panel.swf		debian/op-panel/usr/share/op-panel/flash/
-	cp -a comunicator.swf			debian/op-panel/usr/share/op-panel/dhtml/
+	cp -ra dhtml/* comunicator.swf			debian/op-panel/usr/share/op-panel/dhtml/
 	ln -s /usr/share/op-panel/flash         debian/op-panel/var/www/op-panel-flash
 	ln -s /usr/share/op-panel/dhtml         debian/op-panel/var/www/op-panel-dhtml
 	ln -sf /var/lib/op-panel/variables.txt  debian/op-panel/usr/share/op-panel/flash
 	ln -sf /var/lib/op-panel/variables.txt  debian/op-panel/usr/share/op-panel/dhtml
+	ln -sf ../../../javascript/prototype/prototype.js debian/op-panel/usr/share/op-panel/dhtml/js/ 
 
 # Build architecture-dependent files here.
 binary-arch: build install
@@ -97,6 +98,7 @@
 	@@cd ../tarballs/op_panel-$(UPVERSION).tmp ; \
 	tar xfz ../$(UPFILENAME)
 	@@find ../tarballs/op_panel-$(UPVERSION).tmp -type f -name '*.swf'|xargs -r rm
+	@@find ../tarballs/op_panel-$(UPVERSION).tmp -type f -name 'prototype.js'|xargs -r rm
 	@@cd ../tarballs/op_panel-$(UPVERSION).tmp ; \
 	tar cfz ../$(FILENAME) *
 	@@echo Cleaning up...