X-Git-Url: https://git.proxmox.com/?p=vncterm.git;a=blobdiff_plain;f=Makefile;h=930faaa240ef29a6721712bddfea9aa91031da6d;hp=40e024607c0c15a75a113405111e7b39a6484853;hb=bdbcef679d80c86f68208520368d709ef21d406e;hpb=e20fdc6c027c421075d7f6a8483178db0c6e2405

diff --git a/Makefile b/Makefile
index 40e0246..930faaa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,6 @@
-RELEASE=4.0
-
 PACKAGE=vncterm
 # Note: also change version in debian/control and debian/changelog
-VERSION=1.3
+VERSION=1.4
 PACKAGERELEASE=1
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 CDATE:=$(shell date +%F)
@@ -13,14 +11,9 @@ VNCDIR=libvncserver-${VNCREL}
 VNCSRC=${VNCREL}.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/comodo-for-java.keystore
-
 all: vncterm
 
 glyphs.h: genfont
@@ -42,37 +35,13 @@ ${VNCLIB} vnc: ${VNCSRC}
 vncterm: vncterm.c glyphs.h ${VNCLIB}
 	gcc -O2 -g -o $@ vncterm.c -Wall -Wno-deprecated-declarations -D_GNU_SOURCE -I ${VNCDIR} ${VNCLIB} -lnsl -lpthread -lz -ljpeg -lutil -lgnutls -lpng
 
-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 "dc475d72-124a-11e4-a53f-005056c00008"
-
-# 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}
-
-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
 
 .PHONY: install
-install: vncterm vncterm.1 VncViewer.jar
+install: vncterm vncterm.1
 	mkdir -p ${DESTDIR}/usr/share/doc/${PACKAGE}
 	mkdir -p ${DESTDIR}/usr/share/man/man1
 	mkdir -p ${DESTDIR}/usr/bin
 	install -s -m 0755 vncterm ${DESTDIR}/usr/bin
-	mkdir -p ${DESTDIR}/usr/share/vncterm/
-	install -m 0644 VncViewer.jar ${DESTDIR}/usr/share/vncterm/
 
 .PHONY: dinstall
 dinstall: ${DEB}
@@ -83,7 +52,8 @@ vncterm.1: vncterm.pod
 	pod2man -n $< -s 1 -r ${VERSION} <$< >$@
 
 .PHONY: deb
-${DEB} deb:
+deb: $(DEB)
+${DEB}:
 	make clean
 	rm -rf dest
 	mkdir dest
@@ -95,30 +65,23 @@ ${DEB} deb:
 	install -m 0644 copyright dest/usr/share/doc/${PACKAGE}
 	install -m 0644 vncterm.1 dest/usr/share/man/man1
 	install -m 0644 debian/changelog.Debian dest/usr/share/doc/${PACKAGE}
-	gzip --best dest/usr/share/man/*/*
-	gzip --best dest/usr/share/doc/${PACKAGE}/changelog.Debian
-	dpkg-deb --build dest
+	gzip -n --best dest/usr/share/man/*/*
+	gzip -n --best dest/usr/share/doc/${PACKAGE}/changelog.Debian
+	fakeroot dpkg-deb --build dest
 	mv dest.deb ${DEB}
 	rm -rf dest
 	lintian ${DEB}	
 
 .PHONY: upload
 upload: ${DEB}
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
-	mkdir -p /pve/${RELEASE}/extra
-	rm -f /pve/${RELEASE}/extra/${PACKAGE}_*.deb
-	rm -f /pve/${RELEASE}/extra/Packages*
-	cp ${DEB} /pve/${RELEASE}/extra
-	cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
+	tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pmg,pve --dist stretch
 
 .PHONY: clean
 clean:
-	rm -rf vncterm vncterm.1 vncterm_*.deb tigervnc *~ ${VNCDIR} vncterm-*.tar.gz glyph.h.tmp
+	rm -rf vncterm vncterm.1 vncterm_*.deb genfont *~ ${VNCDIR} vncterm-*.tar.gz glyph.h.tmp
 
 .PHONY: distclean
 distclean: clean
-	rm -rf tigervnc.org
 
 .PHONY: dist
 ${SNAP} dist: distclean