From d15ce1ffa4ecc3e5f0b2992331b93a3d64f3fb4b Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 24 May 2023 18:46:03 +0200 Subject: [PATCH] buildsys: fix DSC target and set source format to 3.0 (quilt) Signed-off-by: Thomas Lamprecht --- Makefile | 14 +++++++++++--- debian/source/format | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a9e7f66..d3b28f2 100644 --- 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 d3827e7..163aaf8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -1.0 +3.0 (quilt) -- 2.39.2