Re: [pve-devel] [PATCH qemu] build: use 3.0 source format

2018-03-13 Thread Dietmar Maurer
I don't really like this. Why not simply:

 %:
dh $@ --with quilt



> diff --git a/debian/source/format b/debian/source/format
> new file mode 100644
> index 000..163aaf8
> --- /dev/null
> +++ b/debian/source/format
> @@ -0,0 +1 @@
> +3.0 (quilt)
> -- 
> 2.14.2
> 
> 
> ___
> pve-devel mailing list
> pve-devel@pve.proxmox.com
> https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

___
pve-devel mailing list
pve-devel@pve.proxmox.com
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel


[pve-devel] [PATCH qemu] build: use 3.0 source format

2018-03-13 Thread Fabian Grünbichler
instead of manually including and calling quilt. resulting binary debs
are identical.

Signed-off-by: Fabian Grünbichler 
---
note: the rules file could probably benefit from further cleanup, but this was
trivial and easily verifiable ;)

 debian/rules | 8 ++--
 debian/source/format | 1 +
 2 files changed, 3 insertions(+), 6 deletions(-)
 create mode 100644 debian/source/format

diff --git a/debian/rules b/debian/rules
index 4209404..02fcce8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,10 +20,6 @@ ARCH ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 PACKAGE=pve-qemu-kvm
 destdir := $(CURDIR)/debian/$(PACKAGE)
 
-ifneq "$(wildcard /usr/share/quilt/quilt.make)" ""
-include /usr/share/quilt/quilt.make
-endif
-
 CFLAGS = -Wall
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -48,7 +44,7 @@ config.status: configure
--enable-virtfs --disable-libnfs \
--disable-guest-agent --disable-guest-agent-msi
 
-build: patch build-stamp
+build: build-stamp
 
 build-stamp:  config.status
dh_testdir
@@ -60,7 +56,7 @@ build-stamp:  config.status
 
touch $@
 
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
-- 
2.14.2


___
pve-devel mailing list
pve-devel@pve.proxmox.com
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel