Merge branch 'master' into archfix-201507

debian/qubes-core-agent.postinst

@@ -220,6 +220,10 @@ case "${1}" in
 
         chown user:user /home_volatile/user
 
+        if ! dpkg-statoverride --list /var/lib/qubes/dom0-updates >/dev/null 2>&1; then
+            dpkg-statoverride --update --add user user 775 /var/lib/qubes/dom0-updates
+        fi
+
         dpkg-divert --divert /etc/init/serial.conf.qubes-orig --package qubes-core-agent --rename --add /etc/init/serial.conf
 
         # Enable Qubes systemd units

debian/qubes-core-agent.postrm

@@ -48,6 +48,10 @@ if [ "${1}" = "remove" ] ; then
     done
 fi
 
+if [ "$1" = "purge" ]; then
+    dpkg-statoverride --remove /var/lib/qubes/dom0-updates || test $? -eq 2
+fi
+
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
 

misc/qubes-download-dom0-updates.sh

@@ -80,7 +80,7 @@ else
 fi
 
 if [ -z "$PKGLIST" -a -z "$UPDATES" ]; then
-    # No new updates
+    echo "No new updates available"
     if [ "$GUI" = 1 ]; then
         zenity --info --text="No new updates available"
     fi