buildsys: fix source format and building dsc

also drop the (since dh compat 10) implied --with quilt for that
source format.

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

diff --git a/Makefile b/Makefile
index 304f07eafd3eb318b15f8f2c990c5b85a2ef1579..fd707a7df8b6a23be963d97c40ca181e09cd1a20 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ PACKAGE=novnc-pve
 
 SRCDIR=novnc
 BUILDDIR=$(SRCDIR).tmp
+ORIG_SRC_TAR=$(PACKAGE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz
 
 GITVERSION:=$(shell git rev-parse HEAD)
 
@@ -26,9 +27,12 @@ $(DEB): $(BUILDDIR)
        lintian $(DEB)
        @echo $(DEB)
 
+$(ORIG_SRC_TAR): $(BUILDDIR)
+       tar czf $(ORIG_SRC_TAR) -C $(BUILDDIR) .
+
 .PHONY: dsc
 dsc: $(DSC)
-$(DSC): $(BUILDDIR)
+$(DSC): $(ORIG_SRC_TAR) $(BUILDDIR)
        cd $(BUILDDIR); dpkg-buildpackage -S -uc -us -d
        lintian $(DSC)
 

diff --git a/debian/rules b/debian/rules
index f8b14e05a0685105e124f8a22a1fa809ace88916..486a68ecf5d752e71f1744ea2afe4f344944a81e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ include /usr/share/dpkg/pkg-info.mk
 export DEB_BUILD_HARDENING=1
 
 %:
-       dh ${@} --with quilt
+       dh ${@}
 
 override_dh_auto_build:
        esbuild --bundle app/ui.js > app.js

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)