Merge commit '9644d86845d11f67751a099c56320ad269218354'

* commit '9644d86845d11f67751a099c56320ad269218354':
  sudoers.d: Stops QT from using the MIT-SHM X11 Shared Memory Extension
  debian: Move python-xdg to depends section in debian/control

Makefile

@@ -121,6 +121,7 @@ install-common:
 	install -m 0644 -D misc/fstab $(DESTDIR)/etc/fstab
 
 	install -D -m 0440 misc/qubes.sudoers $(DESTDIR)/etc/sudoers.d/qubes
+	install -D -m 0440 misc/sudoers.d_qt_x11_no_mitshm $(DESTDIR)/etc/sudoers.d/qt_x11_no_mitshm
 
 	install -d $(DESTDIR)/var/lib/qubes
 
@@ -220,6 +221,5 @@ install-deb: install-common install-systemd install-systemd-dropins
 	install -m 644 network/80-qubes.conf $(DESTDIR)/etc/sysctl.d/
 	install -D -m 644 misc/profile.d_qt_x11_no_mitshm.sh $(DESTDIR)/etc/profile.d/qt_x11_no_mitshm.sh
 	install -D -m 440 misc/sudoers.d_umask $(DESTDIR)/etc/sudoers.d/umask
-	install -D -m 440 misc/sudoers.d_qt_x11_no_mitshm $(DESTDIR)/etc/sudoers.d/qt_x11_no_mitshm
 
 install-vm: install-rh install-common

debian/control

@@ -25,6 +25,7 @@ Depends:
     psmisc,
     python2.7,
     python-gi,
+    python-xdg,
     qubes-utils (>= 3.0.1),
     sudo,
     systemd,
@@ -49,7 +50,6 @@ Recommends:
     network-manager-gnome,
     ntpdate,
     python-nautilus,
-    python-xdg,
     system-config-printer,
     tinyproxy,
     xsettingsd,

rpm_spec/core-vm.spec

@@ -357,6 +357,7 @@ rm -f %{name}-%{version}
 %config(noreplace) /etc/qubes-rpc/qubes.GetImageRGBA
 %config(noreplace) /etc/qubes-rpc/qubes.SetDateTime
 %config(noreplace) /etc/sudoers.d/qubes
+%config(noreplace) /etc/sudoers.d/qt_x11_no_mitshm
 %config(noreplace) /etc/sysconfig/iptables.qubes
 %config(noreplace) /etc/sysconfig/ip6tables.qubes
 /usr/lib/qubes/init/iptables