buildsys: fix DSC target and set source format to 3.0 (quilt)

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/Makefile b/Makefile
index a9e7f669cf8e189648678077e9abc99c0c2de29f..d3b28f258121a33c9b6122ae9c6d42f3db0981e3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ PACKAGE=pve-eslint
 
 GITVERSION:=$(shell git rev-parse HEAD)
 BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
+ORIG_SRC_TAR=$(PACKAGE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz
 
 DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb
 DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
@@ -26,10 +27,16 @@ $(BUILDDIR): .any-eslint-js
        mv $@.tmp $@
 
 dsc: $(DSC)
-$(DSC): $(BUILDDIR)
-       cd $(BUILDDIR); dpkg-buildpackage -S -uc -us
+       $(MAKE) clean
+       $(MAKE) $(DSC)
        lintian $(DSC)
 
+$(DSC): $(BUILDDIR) $(ORIG_SRC_TAR)
+       cd $(BUILDDIR); dpkg-buildpackage -S -uc -us -d
+
+$(ORIG_SRC_TAR): $(BUILDDIR)
+       tar czf $(ORIG_SRC_TAR) --exclude="$(BUILDDIR)/debian" $(BUILDDIR)
+
 deb: $(DEB)
 $(DEB): $(BUILDDIR)
        cd $(BUILDDIR); dpkg-buildpackage -b -uc -us
@@ -84,7 +91,8 @@ distclean: clean
 
 .PHONY: clean
 clean:
-       rm -rf *~ debian/*~ *.deb $(BUILDSRC) *.tmp/ $(BUILDDIR) *.changes *.tar.gz *.dsc *.buildinfo
+       rm -rf $(UPSTREAM)-v[0-9]*/ *.tmp/ $(PACKAGE)-[0-9]*/
+       rm -f *.deb *.dsc *.changes $(PACKAGE)*.tar* *.build *.buildinfo .any-eslint-js
 
 .PHONY: dinstall
 dinstall: deb

diff --git a/debian/source/format b/debian/source/format
index d3827e75a5cadb9fe4a27e1cb9b6d192e7323120..163aaf8d82b6c54f23c45f32895dbdfdcc27b047 100644 (file)
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)