bump version to 8.2.1

[qemu-server.git] / Makefile

diff --git a/Makefile b/Makefile
index c780d4f3adf828c69189273b99e0d19d4ef62635..133468daf298d796761fd8d53b02a1e69ad107de 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
-include /usr/share/dpkg/pkg-info.mk
-include /usr/share/dpkg/architecture.mk
+include /usr/share/dpkg/default.mk
 
 PACKAGE=qemu-server
 BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
@@ -25,9 +24,7 @@ DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
 
 DEBS=$(DEB) $(DBG_DEB)
 
-# this requires package pve-doc-generator
-export NOVIEW=1
-include /usr/share/pve-doc-generator/pve-doc-generator.mk
+-include /usr/share/pve-doc-generator/pve-doc-generator.mk
 
 all:
 
@@ -81,9 +78,10 @@ install: $(PKGSOURCES)
        cd $(DESTDIR)/$(MAN5DIR); ln -s -f qm.conf.5.gz vm.conf.5.gz
 
 $(BUILDDIR):
-       rm -rf $(BUILDDIR)
-       rsync -a * $(BUILDDIR)
-       echo "git clone git://git.proxmox.com/git/qemu-server.git\\ngit checkout $(GITVERSION)" > $(BUILDDIR)/debian/SOURCE
+       rm -rf $(BUILDDIR) $(BUILDDIR).tmp
+       rsync -a * $(BUILDDIR).tmp
+       echo "git clone git://git.proxmox.com/git/qemu-server.git\\ngit checkout $(GITVERSION)" > $(BUILDDIR).tmp/debian/SOURCE
+       mv $(BUILDDIR).tmp $(BUILDDIR)
 
 .PHONY: deb
 deb: $(DEBS)
@@ -98,6 +96,9 @@ $(DSC): $(BUILDDIR)
        cd $(BUILDDIR); dpkg-buildpackage -S -us -uc -d
        lintian $(DSC)
 
+sbuild: $(DSC)
+       sbuild $(DSC)
+
 .PHONY: test
 test:
        PVE_GENERATING_DOCS=1 perl -I. ./qm verifyapi
@@ -112,8 +113,7 @@ upload: $(DEB)
 clean:
        $(MAKE) -C test $@
        rm -rf $(PACKAGE)-*/ *.deb *.build *.buildinfo *.changes *.dsc $(PACKAGE)_*.tar.?z
-       $(MAKE) cleanup-docgen
-       find . -name '*~' -exec rm {} ';'
+       rm -f *.xml.tmp *.1 *.5 *.8 *{synopsis,opts}.adoc docinfo.xml
 
 
 .PHONY: distclean