From 80b5c942069710f75aa7faea141e31c1cba60b33 Mon Sep 17 00:00:00 2001
From: Paul Holcomb <pholcomb@cpoint.net>
Date: Tue, 14 Nov 2017 00:04:40 -0600
Subject: [PATCH] Fix Ubuntu template builds

4.0 template builds use `<package>.install` files with dh_install.  The
differences between Debian and Ubuntu packages also need to be represented
in these files.
---
 Makefile         | 2 ++
 Makefile.builder | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/Makefile b/Makefile
index 6a6aadf..5a19bca 100644
--- a/Makefile
+++ b/Makefile
@@ -302,6 +302,8 @@ endif
 
 ifeq ($(shell lsb_release -is), Debian)
 	install -m 0644 misc/qubesxdg.py $(DESTDIR)/$(PYTHON2_SITELIB)/
+else ifeq ($(shell lsb_release -is), Ubuntu)
+	install -m 0644 misc/qubesxdg.py $(DESTDIR)/$(PYTHON2_SITELIB)/
 else
 	install -m 0644 misc/py2/qubesxdg.py* $(DESTDIR)/$(PYTHON2_SITELIB)/
 endif
diff --git a/Makefile.builder b/Makefile.builder
index 3c3b8e4..bd11afc 100644
--- a/Makefile.builder
+++ b/Makefile.builder
@@ -12,6 +12,11 @@ endif
 source-debian-quilt-copy-in: VERSION = $(shell cat $(ORIG_SRC)/version)
 source-debian-quilt-copy-in: ORIG_FILE = "$(CHROOT_DIR)/$(DIST_SRC)/../qubes-core-agent_$(VERSION).orig.tar.gz"
 source-debian-quilt-copy-in:
+	if [ $(DISTRIBUTION) == qubuntu ] ; then \
+		sed -i /avahi-daemon.service.d/d $(CHROOT_DIR)/$(DIST_SRC)/debian/qubes-core-agent.install ;\
+		sed -i /exim4.service.d/d $(CHROOT_DIR)/$(DIST_SRC)/debian/qubes-core-agent.install ;\
+		sed -i /netfilter-persistent.service.d/d $(CHROOT_DIR)/$(DIST_SRC)/debian/qubes-core-agent.install ;\
+	fi
 	if [ $(DIST) == trusty ] ; then \
 		sed -i /locales-all/d $(CHROOT_DIR)/$(DIST_SRC)/debian/control ;\
 	fi