Merge tag 'jm_de51e155'

Tag for commit de51e155f3757ec2dd0b8f51ec7e7b5d9dff000b

# gpg: Signature made Fri Feb 20 01:56:42 2015 CET using RSA key ID 5A4C6DAD
# gpg: Good signature from "Jason Mehring (Qubes OS Signing Key) <nrgaway@gmail.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: E0E3 2283 FDCA C1A5 1007  8F27 1BB9 B1FB 5A4C 6DAD

Makefile.builder

@@ -15,6 +15,6 @@ 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:
 	-$(shell $(ORIG_SRC)/debian-quilt $(ORIG_SRC)/series-debian-vm.conf $(CHROOT_DIR)/$(DIST_SRC)/debian/patches)
-	tar cvfz $(ORIG_FILE) --exclude-vcs --exclude=deb --exclude=rpm --exclude=pkgs --exclude=debian -C $(CHROOT_DIR)/$(DIST_SRC) .
+	tar cfz $(ORIG_FILE) --exclude-vcs --exclude=rpm --exclude=pkgs --exclude=deb --exclude=debian -C $(CHROOT_DIR)/$(DIST_SRC) .
 
 # vim: filetype=make

debian/source/options

@@ -0,0 +1,4 @@
+extend-diff-ignore = "(^|/)(.git/.*)$"
+extend-diff-ignore = "(^|/)(deb/.*)$"
+extend-diff-ignore = "(^|/)(pkgs/.*)$"
+extend-diff-ignore = "(^|/)(rpm/.*)$"