Attachment #5088 for bug #23303

View | Details | Raw Unified | Return to bug 23303
Collapse All | Expand All

Lines 1-3 Link Here

(-)a/branches/ucs-3.1/ucs/virtualization/univention-virtual-machine-manager-daemon/debian/changelog (+6 lines)
		1	univention-virtual-machine-manager-daemon (2.0.30-4) UNRELEASED; urgency=low
		2
		3	* Update TightVNC Java Applet (Bug #23303)
		4
		5	-- Philipp Hahn <hahn@univention.de> Wed, 20 Feb 2013 15:53:16 +0100
		6
1	univention-virtual-machine-manager-daemon (2.0.30-3) unstable; urgency=low	7	univention-virtual-machine-manager-daemon (2.0.30-3) unstable; urgency=low
2		8
3	* Disallow snapshots with floppy images (Bug #30472)	9	* Disallow snapshots with floppy images (Bug #30472)

Lines 29-35 Recommends: libvirt-bin, Link Here

(-)a/branches/ucs-3.1/ucs/virtualization/univention-virtual-machine-manager-daemon/debian/control (-1 / +1 lines)
29	univention-nagios-uvmmd	29	univention-nagios-uvmmd
30	Description: UCS Virtual Machine Manager Daemon	30	Description: UCS Virtual Machine Manager Daemon
31	This package contains the UCS Virtual Machine Manager Daemon	31	This package contains the UCS Virtual Machine Manager Daemon
32	used to collect informations from a farm of virtualization servers.	32	used to collect information from a farm of virtualization servers.
33		33
34	Package: python-univention-virtual-machine-manager	34	Package: python-univention-virtual-machine-manager
35	Architecture: all	35	Architecture: all

Lines 1-27 Link Here

(-)a/branches/ucs-3.1/ucs/virtualization/univention-virtual-machine-manager-daemon/debian/copyright (-22 / +30 lines)
1	Copyright 2002-2012 Univention GmbH	1	Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
		2	Upstream-Name: univention-virtual-machine-manager-daemon
		3	Upstream-Maintainer: Univention GmbH <packages@univention.de>
		4	Upstream-Source: http://www.univention.de/
2		5
3	http://www.univention.de/	6	Files: tightvnc-jviewer.jar
		7	Copyright: (C) 2010, 2011, 2012 GlavSoft LLC.
		8	License: GPL v2
		9	The full text of the GPL is distributed in
		10	/usr/share/common-licenses/GPL-2 on Debian systems.
4		11
5	All rights reserved.	12	Files: *
		13	Copyright: (C) 2002-2013 Univention GmbH
		14	License: AGPL v3
		15	The source code of the software contained in this package
		16	as well as the source package itself are made available
		17	under the terms of the GNU Affero General Public License version 3
		18	(GNU AGPL V3) as published by the Free Software Foundation.
6		19
7	The source code of the software contained in this package	20	Binary versions of this package provided by Univention to you as
8	as well as the source package itself are made available	21	well as other copyrighted, protected or trademarked materials like
9	under the terms of the GNU Affero General Public License version 3	22	Logos, graphics, fonts, specific documentations and configurations,
10	(GNU AGPL V3) as published by the Free Software Foundation.	23	cryptographic keys etc. are subject to a license agreement between
		24	you and Univention and not subject to the GNU AGPL V3.
11		25
12	Binary versions of this package provided by Univention to you as	26	In the case you use the software under the terms of the GNU AGPL V3,
13	well as other copyrighted, protected or trademarked materials like	27	the program is provided in the hope that it will be useful,
14	Logos, graphics, fonts, specific documentations and configurations,	28	but WITHOUT ANY WARRANTY; without even the implied warranty of
15	cryptographic keys etc. are subject to a license agreement between	29	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	you and Univention and not subject to the GNU AGPL V3.	30	GNU Affero General Public License for more details.
17		31
18	In the case you use the software under the terms of the GNU AGPL V3,	32	You should have received a copy of the GNU Affero General Public
19	the program is provided in the hope that it will be useful,	33	License with the Debian GNU/Linux or Univention distribution in file
20	but WITHOUT ANY WARRANTY; without even the implied warranty of	34	/usr/share/common-licenses/AGPL-3; if not, see
21	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	35	<http://www.gnu.org/licenses/>.
22	GNU Affero General Public License for more details.
23
24	You should have received a copy of the GNU Affero General Public
25	License with the Debian GNU/Linux or Univention distribution in file
26	/usr/share/common-licenses/AGPL-3; if not, see
27	<http://www.gnu.org/licenses/>.

Lines 1-3 Link Here

(-)a/branches/ucs-3.1/ucs/virtualization/univention-virtual-machine-manager-daemon/debian/ucslint.overrides (+2 lines)
		1	# deb5 format
		2	0010-4: debian/copyright
1	# ucslint-Bug: Does not handle credential passing using other constructs like "${CREDENTIALS[@]}"	3	# ucslint-Bug: Does not handle credential passing using other constructs like "${CREDENTIALS[@]}"
2	0001-2: 44univention-virtual-machine-manager-daemon.inst	4	0001-2: 44univention-virtual-machine-manager-daemon.inst
3	# No copyright for internal test scripts	5	# No copyright for internal test scripts

Lines 31-38 Link Here

(-)a/branches/ucs-3.1/ucs/virtualization/univention-virtual-machine-manager-daemon/debian/univention-virtual-machine-manager-daemon.init (-2 / +2 lines)
31	#	31	#
32	### BEGIN INIT INFO	32	### BEGIN INIT INFO
33	# Provides: univention-virtual-machine-manager-daemon	33	# Provides: univention-virtual-machine-manager-daemon
34	# Required-Start: $network $local_fs	34	# Required-Start: $network $local_fs $remote_fs
35	# Required-Stop:	35	# Required-Stop: $remote_fs
36	# Should-Start: $named	36	# Should-Start: $named
37	# Should-Stop:	37	# Should-Stop:
38	# Default-Start: 2 3 4 5	38	# Default-Start: 2 3 4 5

Lines 1-4 Link Here

(-)a/branches/ucs-3.1/ucs/virtualization/univention-virtual-machine-manager-daemon/debian/univention-virtual-machine-manager-daemon.install (-1 / +1 lines)
1	TightVncViewer.jar var/www	1	tightvnc-jviewer.jar var/www
2	src/univention-virtual-machine-manager-daemon src/univention-virtual-machine-manager usr/sbin	2	src/univention-virtual-machine-manager-daemon src/univention-virtual-machine-manager usr/sbin
3	uvmmd-check.sh usr/lib/univention-virtual-machine-manager-daemon	3	uvmmd-check.sh usr/lib/univention-virtual-machine-manager-daemon
4	uvmmd-nodes.py uvmmd-ldap.py usr/lib/univention-directory-listener/system	4	uvmmd-nodes.py uvmmd-ldap.py usr/lib/univention-directory-listener/system

Lines 300-307 define([ Link Here

(-)a/branches/ucs-3.1/ucs/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm.js (-3 / +2 lines)
300		300
301	vncLink: function( ids, items ) {	301	vncLink: function( ids, items ) {
302	tools.umcpCommand( 'uvmm/domain/get', { domainURI : ids[ 0 ] } ).then( lang.hitch( this, function( response ) {	302	tools.umcpCommand( 'uvmm/domain/get', { domainURI : ids[ 0 ] } ).then( lang.hitch( this, function( response ) {
303	var w = window.open();	303	var w = window.open("about:blank", "_blank", "location=no,scrollbars=no,status=no,titlebar=no,toolbar=no");
304	var html = lang.replace( "<html><head><title>{domainName} on {nodeName}</title></head><body><applet archive='/TightVncViewer.jar' code='com.tightvnc.vncviewer.VncViewer' height='100%%' width='100%%'><param name='host' value='{vnc_host}' /><param name='port' value='{vnc_port}' /><param name='offer relogin' value='no' />VNC-Java-Applet does not work; try external VNC viewer <a href='vnc://{vnc_host}:{vnc_port}'>vnc://{vnc_host}:{vnc_port}</a>.</applet></body></html>", {	304	var html = lang.replace("<html><head><title>{domainName} on {nodeName}</title></head><body style='margin:0'><applet archive='/tightvnc-jviewer.jar' code='com.glavsoft.viewer.Viewer' height='100%%' width='100%%'><param name='Host' value='{vnc_host}' /><param name='Port' value='{vnc_port}' /><param name='OpenNewWindow' value='no' /><param name='ShowControls' value='yes' />VNC-Java-Applet does not work; try external VNC viewer <a href='vnc://{vnc_host}:{vnc_port}'>vnc://{vnc_host}:{vnc_port}</a>.</applet></body></html>", {
305	domainName: entities.encode(items[ 0 ].label),	305	domainName: entities.encode(items[ 0 ].label),
306	nodeName: entities.encode(items[ 0 ].nodeName),	306	nodeName: entities.encode(items[ 0 ].nodeName),
307	vnc_host: entities.encode(response.result.vnc_host),	307	vnc_host: entities.encode(response.result.vnc_host),
308	-

Return to bug 23303