Merge remote-tracking branch 'qubesos/pr/71'

* qubesos/pr/71:
  Fix Ubuntu template builds

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