ibump version to 1.1-6

[vncterm.git] / Makefile

diff --git a/Makefile b/Makefile
index 72514b5ac889747016711549064a3bfd187023ec..81b11d87eceb1e3c4a223e90cc01108325c16428 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,9 @@
-RELEASE=2.0
+RELEASE=3.1
 
 PACKAGE=vncterm
-VERSION=1.0
-PACKAGERELEASE=2
+# Note: also change version in debian/control and debian/changelog
+VERSION=1.1
+PACKAGERELEASE=6
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 CDATE:=$(shell date +%F)
 
@@ -12,11 +13,12 @@ VNCSRC=${VNCDIR}.tar.gz
 VNCLIB=${VNCDIR}/libvncserver/.libs/libvncserver.a
 
 TIGERVNCSRC=tigervnc-1.1.0.tgz
+#TIGERVNCSRC=tigervnc-1.2.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
 
@@ -39,18 +41,24 @@ 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
 
 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 "proxmox server solutions gmbh's comodo ca limited id"
+
+# this is for version 1.2
+#      ln -s ../newtigerpatches tigervnc/patches
+#      cd tigervnc/java;cmake -G "Unix Makefiles"; make
+#      jarsigner -keystore ${KEYSTORE} -signedjar VncViewer.jar  tigervnc/java/VncViewer.jar proxmox
 
 tigervnc.org: ${TIGERVNCSRC}
        rm -rf tigervnc.org
        tar xf ${TIGERVNCSRC}
 
-downlaod:
+download:
        rm -rf tigervnc.org
        svn co https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/tags/1_1_0 tigervnc.org 
        tar cf ${TIGERVNCSRC} tigervnc.org