X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=6113247bb078aaaabc2bd2bf5d67451aee504208;hb=92146ce512c27b73e9d78d56249ad9e3ea8a410d;hp=03b9500a771bdde40e66661578ca110abbce30e7;hpb=e84c155b334019999a4ab3fb75991e71299a50ce;p=dab.git

diff --git a/Makefile b/Makefile
index 03b9500..6113247 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,6 @@
-RELEASE=2.2
-
-VERSION=1.2
+VERSION=3.0
 PACKAGE=dab
-PKGREL=4
+PKGREL=2
 
 
 SCRIPTS=        				\
@@ -12,6 +10,8 @@ SCRIPTS=        				\
 	scripts/init_urandom			\
 	scripts/ssh_gen_host_keys		
 
+GITVERSION:=$(shell cat .git/refs/heads/master)
+
 DEB=${PACKAGE}_${VERSION}-${PKGREL}_all.deb
 
 DESTDIR=
@@ -20,6 +20,8 @@ DATADIR=${PREFIX}/lib/${PACKAGE}
 SBINDIR=${PREFIX}/sbin
 MANDIR=${PREFIX}/share/man
 DOCDIR=${PREFIX}/share/doc/${PACKAGE}
+PODDIR=${DOCDIR}/pod
+
 MAN1DIR=${MANDIR}/man1/
 PERLDIR=${PREFIX}/share/perl5/
 
@@ -30,19 +32,22 @@ dinstall: deb
 	dpkg -i ${DEB}
 
 .PHONY: install
-install: dab dab.1 DAB.pm devices.tar.gz ${SCRIPTS}
+install: dab dab.1 dab.1.pod DAB.pm devices.tar.gz ${SCRIPTS}
 	install -d ${DESTDIR}${SBINDIR}
 	install -m 0755 dab ${DESTDIR}${SBINDIR}
 	install -d ${DESTDIR}${MAN1DIR}
 	install -m 0644 dab.1 ${DESTDIR}${MAN1DIR}
-	gzip -f9 ${DESTDIR}${MAN1DIR}/dab.1
+	gzip -n -f9 ${DESTDIR}${MAN1DIR}/dab.1
+	install -d ${DESTDIR}${PODDIR}
+	install -m 0644 dab.1.pod ${DESTDIR}${PODDIR}
 	install -D -m 0644 DAB.pm ${DESTDIR}${PERLDIR}/PVE/DAB.pm
 	install -d ${DESTDIR}${DATADIR}/scripts
 	install -m 0755 ${SCRIPTS} ${DESTDIR}${DATADIR}/scripts
 	install -m 0644 devices.tar.gz ${DESTDIR}${DATADIR}
 
 .PHONY: deb
-deb ${DEB}: dab dab.1 DAB.pm control changelog.Debian
+deb: ${DEB}
+${DEB}: dab dab.1 DAB.pm control changelog.Debian
 	rm -rf debian
 	mkdir debian
 	make DESTDIR=debian install
@@ -50,8 +55,9 @@ deb ${DEB}: dab dab.1 DAB.pm control changelog.Debian
 	sed -e s/@@VERSION@@/${VERSION}/ -e s/@@PKGRELEASE@@/${PKGREL}/ <control >debian/DEBIAN/control
 	install -D -m 0644 copyright debian/${DOCDIR}/copyright
 	install -m 0644 changelog.Debian debian/${DOCDIR}
-	gzip -9 debian/${DOCDIR}/changelog.Debian
-	dpkg-deb --build debian	
+	echo "git clone git://git.proxmox.com/git/dab.git\\ngit checkout ${GITVERSION}" >  debian/${DOCDIR}/SOURCE
+	gzip -n -9 debian/${DOCDIR}/changelog.Debian
+	fakeroot dpkg-deb --build debian	
 	mv debian.deb ${DEB}
 	rm -rf debian
 	lintian ${DEB}
@@ -60,26 +66,25 @@ deb ${DEB}: dab dab.1 DAB.pm control changelog.Debian
 dab.pdf: dab.1
 	groff -man dab.1 |ps2pdf - > dab.pdf
 
-dab.1: dab
-	rm -f dab.1
-	pod2man -n $< -s 1 -r ${VERSION} <$< >$@
+dab.1.pod: dab
+	podselect $< > $@.tmp
+	mv $@.tmp $@
+
+dab.1: dab.1.pod
+	rm -f $@
+	pod2man -n $< -s 1 -r ${VERSION} <$< >$@.tmp
+	mv $@.tmp $@
 
 
 .PHONY: clean
 clean:
-	rm -f ${DEB} dab.1 dab.pdf *~ 
+	rm -f ${DEB} dab.1 dab.1.pod dab.pdf *.tmp *~ 
 
 .PHONY: distclean
 distclean: clean
 
 .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 pve --dist stretch