X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=546f5786860421cb9c5b913b0ed1bb925c9f91a5;hb=a94e0490c7c164e22898cfde3ac9cb47ca81232d;hp=000f0c6a8cc8bd971e9db4819a08e83506102078;hpb=c5b723232ea0821e22530e5cfdf84c2d91a41c06;p=pve-http-server.git

diff --git a/Makefile b/Makefile
index 000f0c6..546f578 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,12 @@
+include /usr/share/dpkg/pkg-info.mk
+include /usr/share/dpkg/architecture.mk
+
 PACKAGE=libpve-http-server-perl
-PKGVER=2.0
-PKGREL=6
 
-DEB=${PACKAGE}_${PKGVER}-${PKGREL}_all.deb
+GITVERSION:=$(shell git rev-parse HEAD)
+BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}
+
+DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
 
 DESTDIR=
 
@@ -15,7 +19,7 @@ WWWFONTSDIR=${WWWBASEDIR}/fonts
 WWWJSDIR=${WWWBASEDIR}/js
 
 # bootstrap library
-BTVER=3.3.7
+BTVER=3.4.1
 BTDIR=bootstrap-${BTVER}-dist
 BTSRC=${BTDIR}.zip
 
@@ -25,7 +29,7 @@ BTDATA = 							\
 	${BTDIR}/js/bootstrap.min.js				\
 	${BTDIR}/fonts/glyphicons-halflings-regular.ttf
 
-JQVER=3.3.1
+JQVER=3.4.1
 JQSRC=jquery-${JQVER}.min.js
 
 all:
@@ -33,9 +37,10 @@ all:
 .PHONY: deb
 deb: ${DEB}
 ${DEB}:
-	rm -rf build
-	rsync -a * build
-	cd build; dpkg-buildpackage -b -us -uc
+	rm -rf ${BUILDDIR}
+	rsync -a * ${BUILDDIR}
+	echo "git clone git://git.proxmox.com/git/pve-http-server\\ngit checkout $(GITVERSION)" > $(BUILDDIR)/debian/SOURCE
+	cd ${BUILDDIR}; dpkg-buildpackage -b -us -uc
 	lintian ${DEB}
 
 download_bootstrap:
@@ -45,7 +50,7 @@ download_bootstrap:
 
 download_jquery:
 	rm -f ${JQSRC} ${JQSRC}.tmp
-	wget https://code.jquery.com/jquery-3.1.1.min.js -O ${JQSRC}.tmp
+	wget https://code.jquery.com/jquery-${JQVER}.min.js -O ${JQSRC}.tmp
 	mv ${JQSRC}.tmp ${JQSRC}
 
 ${BTDATA}: ${BTSRC}
@@ -57,6 +62,7 @@ install: ${BTDATA}
 	install -d -m 755 ${PERL5DIR}/PVE/APIServer
 	install -m 0644 PVE/APIServer/AnyEvent.pm ${PERL5DIR}/PVE/APIServer
 	install -m 0644 PVE/APIServer/Formatter.pm ${PERL5DIR}/PVE/APIServer
+	install -m 0644 PVE/APIServer/Utils.pm ${PERL5DIR}/PVE/APIServer
 	install -d -m 755 ${PERL5DIR}/PVE/APIServer/Formatter
 	install -m 0644 PVE/APIServer/Formatter/Standard.pm ${PERL5DIR}/PVE/APIServer/Formatter
 	install -m 0644 PVE/APIServer/Formatter/Bootstrap.pm ${PERL5DIR}/PVE/APIServer/Formatter