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

* qubesos/pr/37:
  Move trusty check and locales-all fix inside source-debian-quilt-copy-in
  Fix build for trusty - locales-all not available

Makefile.builder

@@ -13,6 +13,9 @@ 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 [ $(DIST) == trusty ] ; then \
+		sed -i /locales-all/d $(CHROOT_DIR)/$(DIST_SRC)/debian/control ;\
+	fi
 	-$(shell $(ORIG_SRC)/debian-quilt $(ORIG_SRC)/series-debian-vm.conf $(CHROOT_DIR)/$(DIST_SRC)/debian/patches)
 	tar cfz $(ORIG_FILE) --exclude-vcs --exclude=rpm --exclude=pkgs --exclude=deb --exclude=debian -C $(CHROOT_DIR)/$(DIST_SRC) .