libvncserver: refresh TLS patch

[vncterm.git] / Makefile

diff --git a/Makefile b/Makefile
index e4246cf64ce232b21979cd1c58aac70024e954f6..c5523fb4d42aea980b643efe842565e284fe3511 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-RELEASE=3.0
+RELEASE=4.0
 
 PACKAGE=vncterm
 # Note: also change version in debian/control and debian/changelog
-VERSION=1.1
+VERSION=1.2
 PACKAGERELEASE=1
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 CDATE:=$(shell date +%F)
@@ -18,12 +18,13 @@ TIGERVNCSRC=tigervnc-1.1.0.tgz
 DEB=${PACKAGE}_${VERSION}-${PACKAGERELEASE}_${ARCH}.deb
 SNAP=${PACKAGE}-${VERSION}-${CDATE}.tar.gz
 
-KEYSTORE=/home/dietmar/pve2-proxdev/proxmox-dev/proxmox-java.keystore
+KEYSTORE=/home/dietmar/pve2-proxdev/proxmox-dev/comodo-for-java.keystore
 
 all: vncterm
 
 glyphs.h: genfont
-       ./genfont > glyphs.h
+       ./genfont > glyphs.h.tmp
+       mv glyphs.h.tmp glyphs.h
 
 genfont: genfont.c
        gcc -g -O2 -o $@ genfont.c -Wall -D_GNU_SOURCE -lz
@@ -38,15 +39,17 @@ ${VNCLIB} vnc: ${VNCSRC}
        cd ${VNCDIR}; make
 
 vncterm: vncterm.c glyphs.h ${VNCLIB}
-       gcc -O2 -g -o $@ vncterm.c -Wall -D_GNU_SOURCE -I ${VNCDIR} ${VNCLIB} -lnsl -lpthread -lz -ljpeg -lutil -lgnutls
+       gcc -O2 -g -o $@ vncterm.c -Wall -Wno-deprecated-declarations -D_GNU_SOURCE -I ${VNCDIR} ${VNCLIB} -lnsl -lpthread -lz -ljpeg -lutil -lgnutls
 
 jar: tigervnc.org
+       if test ! -f /usr/share/icedtea-web/plugin.jar; then echo "please install package icedtea-netx-common"; exit 1; fi
        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
+       jarsigner -keystore ${KEYSTORE} -signedjar VncViewer.jar  tigervnc/java/src/com/tigervnc/vncviewer/VncViewer.jar "dc475d72-124a-11e4-a53f-005056c00008"
+
 # this is for version 1.2
 #      ln -s ../newtigerpatches tigervnc/patches
 #      cd tigervnc/java;cmake -G "Unix Makefiles"; make
@@ -110,7 +113,7 @@ upload: ${DEB}
 
 .PHONY: clean
 clean:
-       rm -rf vncterm vncterm.1 vncterm_*.deb tigervnc *~ ${VNCDIR} vncterm-*.tar.gz
+       rm -rf vncterm vncterm.1 vncterm_*.deb tigervnc *~ ${VNCDIR} vncterm-*.tar.gz glyph.h.tmp
 
 .PHONY: distclean
 distclean: clean
@@ -124,4 +127,4 @@ ${SNAP} dist: distclean
 
 .PHONY: uploaddist
 uploaddist: ${SNAP}
-       scp ${SNAP} pve.proxmox.com:/home/ftp/sources/
\ No newline at end of file
+       scp ${SNAP} pve.proxmox.com:/home/ftp/sources/