[pve-devel] r5388 - in vncterm/pve2: . debian

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-01-18 15:12:58 +0100 (Tue, 18 Jan 2011)
New Revision: 5388

Modified:
   vncterm/pve2/Makefile
   vncterm/pve2/README
   vncterm/pve2/VncViewer.jar
   vncterm/pve2/debian/changelog.Debian
   vncterm/pve2/debian/control
Log:
updates for tigervnc


Modified: vncterm/pve2/Makefile
===================================================================
--- vncterm/pve2/Makefile	2011-01-18 13:28:58 UTC (rev 5387)
+++ vncterm/pve2/Makefile	2011-01-18 14:12:58 UTC (rev 5388)
@@ -2,15 +2,17 @@
 LIBS=`libvncserver-config --libs` -lutil
 
 PACKAGE=vncterm
-VERSION=0.9
-PACKAGERELEASE=2
+VERSION=1.0
+PACKAGERELEASE=1
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 CDATE:=$(shell date +%F)
 
+TIGERVNCSRC=tigervnc-18-01-11.tgz
+
 DEB=${PACKAGE}_${VERSION}-${PACKAGERELEASE}_${ARCH}.deb
 SNAP=${PACKAGE}-${VERSION}-${CDATE}.tar.gz
 
-KEYSTORE=/home/dietmar/svn-lhotse/proxmox-dev/proxmox-java.keystore
+KEYSTORE=/home/dietmar/pve2-proxdev/proxmox-dev/proxmox-java.keystore
 
 all: vncterm
 	echo "ARCH: ${ARCH} FLAGS: ${CFLAGS} ${LIBS}" 
@@ -24,20 +26,21 @@
 vncterm: vncterm.c glyphs.h
 	gcc -g -o $@ vncterm.c -Wall -D_GNU_SOURCE ${CFLAGS} ${LIBS}
 
-VncViewer.jar:
-	rm -rf vnc_javasrc/
-	tar xzf tightvnc-1.3.10_javasrc.tar.gz
-	cd vnc_javasrc; patch -b -p 1 <../vncviewer.diff; make
-	jarsigner -keystore ${KEYSTORE} -signedjar VncViewer.jar vnc_javasrc/VncViewer.jar proxmox
+jar: tigervnc.org
+	rm -rf tigervnc VncViewer.jar
+	rsync -av --exclude .svn --exclude .svnignore  tigervnc.org/ tigervnc
+	ln -s ../tigerpatches tigervnc/patches
+	cd tigervnc; quilt push -a
+	cd tigervnc/java/src/com/tigervnc/vncviewer; make clean; make
+	jarsigner -keystore ${KEYSTORE} -signedjar VncViewer.jar  tigervnc/java/src/com/tigervnc/vncviewer/VncViewer.jar proxmox
 
+tigervnc.org: ${TIGERVNCSRC}
+	rm -rf tigervnc.org
+	tar xf ${TIGERVNCSRC}
 
-vncviewer.diff:
-	-diff -p -u vnc_javasrc/RfbProto.java.orig vnc_javasrc/RfbProto.java >$@
-	-diff -p -u vnc_javasrc/ClipboardFrame.java.orig vnc_javasrc/ClipboardFrame.java >>$@
-	-diff -p -u vnc_javasrc/VncViewer.java.orig vnc_javasrc/VncViewer.java >>$@
-	-diff -p -u vnc_javasrc/Makefile.orig vnc_javasrc/Makefile >>$@
-	-diff -p -u vnc_javasrc/VncCanvas.java.orig vnc_javasrc/VncCanvas.java >>$@
-	-diff -p -u vnc_javasrc/ButtonPanel.java.orig vnc_javasrc/ButtonPanel.java >>$@
+downlaod:
+	rm -rf tigervnc.org
+	svn co https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk tigervnc.org
 
 .PHONY: install
 install: vncterm vncterm.1 VncViewer.jar
@@ -79,7 +82,7 @@
 
 .PHONY: clean
 clean:
-	rm -rf vncterm vncterm.1 vncterm_*.deb vnc_javasrc *~ vncterm-*.tar.gz
+	rm -rf vncterm vncterm.1 vncterm_*.deb vnc_javasrc *~ vncterm-*.tar.gz glyphs.h
 
 .PHONY: distclean
 distclean: clean

Modified: vncterm/pve2/README
===================================================================
--- vncterm/pve2/README	2011-01-18 13:28:58 UTC (rev 5387)
+++ vncterm/pve2/README	2011-01-18 14:12:58 UTC (rev 5388)
@@ -16,15 +16,10 @@
 VNC Java Applet (for use in web based applications):
 ====================================================
 
-We use patched VncViewer files (TightVNC Java Viewer version 1.3.9):
+We use patched VncViewer files (latest TigerVNC sources):
 
-http://downloads.sourceforge.net/vnc-tight/tightvnc-1.3.9_javasrc.tar.gz
+http://www.tigervnc.com/
 
-the patch (vncviewer.diff) disables focus traversal and enables
- Alt-Gr Keyboard input
-
-We also support the system clipboard.
-
 We sign the applet to make clipboard working.
 
 

Modified: vncterm/pve2/VncViewer.jar
===================================================================
(Binary files differ)

Modified: vncterm/pve2/debian/changelog.Debian
===================================================================
--- vncterm/pve2/debian/changelog.Debian	2011-01-18 13:28:58 UTC (rev 5387)
+++ vncterm/pve2/debian/changelog.Debian	2011-01-18 14:12:58 UTC (rev 5388)
@@ -1,3 +1,9 @@
+vncterm (1.0-1) unstable; urgency=low
+
+  * use TigerVNC java sources
+
+ -- root <root at maui.maurer-it.com>  Tue, 18 Jan 2011 14:44:05 +0100
+
 vncterm (0.9-2) unstable; urgency=low
 
   * compiled for debian etch

Modified: vncterm/pve2/debian/control
===================================================================
--- vncterm/pve2/debian/control	2011-01-18 13:28:58 UTC (rev 5387)
+++ vncterm/pve2/debian/control	2011-01-18 14:12:58 UTC (rev 5388)
@@ -1,5 +1,5 @@
 Package: vncterm
-Version: 0.9-2
+Version: 1.0-1
 Section: x11
 Priority: optional
 Depends: libc6 (>= 2.7-18), libjpeg62, zlib1g (>= 1:1.2.1), libvncserver0