X-Git-Url: https://git.proxmox.com/?p=vncterm.git;a=blobdiff_plain;f=Makefile;h=d185103508433bc155c0167ff9836c66628aa145;hp=abb85a68b6e19b05a86c74c33f86b49a990a5e73;hb=f2c7aa6b087244e1596b4b294ccd7236e4cce991;hpb=c39031e88393138b977e1e771f34b8ed6c04699d

diff --git a/Makefile b/Makefile
index abb85a6..d185103 100644
--- a/Makefile
+++ b/Makefile
@@ -2,14 +2,15 @@ RELEASE=4.0
 
 PACKAGE=vncterm
 # Note: also change version in debian/control and debian/changelog
-VERSION=1.2
+VERSION=1.3
 PACKAGERELEASE=1
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 CDATE:=$(shell date +%F)
 
-VNCVER=0.9.7
-VNCDIR=LibVNCServer-${VNCVER}
-VNCSRC=${VNCDIR}.tar.gz
+VNCVER=0.9.11
+VNCREL=LibVNCServer-${VNCVER}
+VNCDIR=libvncserver-${VNCREL}
+VNCSRC=${VNCREL}.tar.gz
 VNCLIB=${VNCDIR}/libvncserver/.libs/libvncserver.a
 
 TIGERVNCSRC=tigervnc-1.1.0.tgz
@@ -23,7 +24,8 @@ 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
@@ -34,11 +36,11 @@ ${VNCLIB} vnc: ${VNCSRC}
 	tar xf ${VNCSRC}
 	ln -s ../vncpatches ${VNCDIR}/patches
 	cd ${VNCDIR}; quilt push -a
-	cd ${VNCDIR}; ./configure; 
+	cd ${VNCDIR}; ./autogen.sh --without-ssl --without-websockets --without-tightvnc-filetransfer;
 	cd ${VNCDIR}; make
 
 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
+	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
@@ -81,7 +83,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
@@ -93,26 +96,20 @@ ${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 repoman@repo.proxmox.com upload
 
 .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