Split pulseaudio support into pulseaudio-qubes subpackage

Fixes QubesOS/qubes-issues#2648

debian/control

@@ -29,13 +29,11 @@ Package: qubes-gui-agent
 Architecture: any
 Depends:
     gnome-keyring,
-    pulseaudio,
     xserver-xorg-core,
     xinit,
     x11-xserver-utils,
     qubes-core-agent (>= 3.0.14),
     qubesdb-vm,
-    libpulse0,
     libxdamage1,
     libxcomposite1,
     libxt6,
@@ -46,7 +44,7 @@ Depends:
     xserver-xorg-input-qubes (= ${binary:Version}),
     ${shlibs:Depends},
     ${misc:Depends}
-Recommends: qt4-qtconfig
+Recommends: qt4-qtconfig, pulseaudio-qubes
 Provides: x-display-manager, xserver-xorg-legacy
 Description: Makes X11 windows available to qubes dom0
  The Qubes GUI agent allows the forwarding of running app windows to the
@@ -78,3 +76,14 @@ Breaks: qubes-gui-agent (<< 3.2.11-1)
 Description: X input driver for injecting events from qubes-gui-agent
  This driver inject input events delivered through qubes-gui-agent.
  Additionally it helps retrieving composition buffers of windows.
+
+Package: pulseaudio-qubes
+Architecture: any
+Depends:
+    pulseaudio,
+    libpulse0,
+    ${shlibs:Depends},
+Replaces: qubes-gui-agent (<< 4.0.0-1)
+Breaks: qubes-gui-agent (<< 4.0.0-1)
+Description: Audio support for Qubes VM
+ Pulseaudio module to enable sound support in Qubes VM

debian/pulseaudio-qubes.install

@@ -0,0 +1,4 @@
+etc/pulse/qubes-default.pa
+etc/xdg/autostart/qubes-pulseaudio.desktop
+usr/bin/start-pulseaudio-with-vchan
+usr/lib/pulse-*/modules/module-vchan-sink.so

debian/qubes-gui-agent.install

@@ -1,9 +1,20 @@
-usr/bin/*
-usr/share/glib-2.0/schemas/20_qubes-gui-vm.gschema.override
+etc/X11/*
+etc/profile.d/*
+etc/security/limits.d/90-qubes-gui.conf
+etc/qubes-rpc/qubes.SetMonitorLayout
+etc/xdg/autostart/qubes-icon-sender.desktop
+etc/xdg/Trolltech.conf
+etc/xdg/Xresources
+etc/xdg/fonts.conf
+etc/xdg/xsettingsd
+lib/systemd/system/qubes-gui-agent.service
+usr/bin/qubes-change-keyboard-layout
+usr/bin/qubes-gui
+usr/bin/qubes-run-xorg.sh
+usr/bin/qubes-session
+usr/bin/qubes-set-monitor-layout
 usr/lib/qubes/icon-sender
-usr/lib/pulse-*/modules/module-vchan-sink.so
 usr/lib/sysctl.d/30-qubes-gui-agent.conf
 usr/lib/tmpfiles.d/*
-lib/systemd/system/qubes-gui-agent.service
-etc/*
+usr/share/glib-2.0/schemas/20_qubes-gui-vm.gschema.override
 var/log/qubes

rpm_spec/gui-agent.spec

@@ -59,17 +59,25 @@ Requires:	python-xpyb
 Provides:   qubes-gui-vm
 Obsoletes:  qubes-gui-vm < 4.0.0
 
+
+%package -n pulseaudio-qubes
+Summary: Audio support for Qubes VM
 # The vchan sink needs .h files from pulseaudio sources
 # that are not exported by any *-devel packages; thus they are internal and
 # possible to change across version. They are copied to gui git. 
 # It is possible that our code will work fine with any later pulseaudio
 # version; but this needs to be verified for each pulseaudio version.
 Requires:	pulseaudio = %{pa_ver}
+Conflicts:  qubes-gui-vm < 4.0.0
+
+%description -n pulseaudio-qubes
+ Pulseaudio module to enable sound support in Qubes VM
 
 %define _builddir %(pwd)
 
 %description
-The Qubes GUI agent that needs to be installed in VM in order to provide the Qubes fancy GUI.
+The Qubes GUI agent that needs to be installed in VM in order to provide the
+Qubes fancy GUI.
 
 %prep
 # we operate on the current directory, so no need to unpack anything
@@ -131,8 +139,6 @@ rm -f %{name}-%{version}
 /usr/bin/qubes-run-xorg.sh
 /usr/bin/qubes-change-keyboard-layout
 /usr/bin/qubes-set-monitor-layout
-/usr/bin/start-pulseaudio-with-vchan
-%{_libdir}/pulse-%{pa_ver}/modules/module-vchan-sink.so
 %{_libdir}/xorg/modules/drivers/qubes_drv.so
 %{_libdir}/xorg/modules/drivers/dummyqbs_drv.so
 %attr(0644,root,root) /etc/X11/xorg-qubes.conf.template
@@ -141,8 +147,6 @@ rm -f %{name}-%{version}
 /etc/profile.d/qubes-gui.csh
 /etc/profile.d/qubes-session.sh
 %config /etc/security/limits.d/90-qubes-gui.conf
-/etc/pulse/qubes-default.pa
-/etc/xdg/autostart/qubes-pulseaudio.desktop
 %config /etc/xdg/Trolltech.conf
 /etc/X11/xinit/xinitrc.d/qubes-keymap.sh
 /etc/X11/xinit/xinitrc.d/20qt-x11-no-mitshm.sh
@@ -152,10 +156,16 @@ rm -f %{name}-%{version}
 %config /etc/sysconfig/desktop
 /etc/sysconfig/modules/qubes-u2mfn.modules
 /lib/systemd/system/qubes-gui-agent.service
-/usr/lib/tmpfiles.d/qubes-pulseaudio.conf
 /usr/lib/tmpfiles.d/qubes-session.conf
 /usr/lib/sysctl.d/30-qubes-gui-agent.conf
 %{_datadir}/glib-2.0/schemas/20_qubes-gui-vm.gschema.override
 /usr/lib/qubes/icon-sender
 /etc/xdg/autostart/qubes-icon-sender.desktop
 %dir /var/log/qubes
+
+%files -n pulseaudio-qubes
+/usr/lib/tmpfiles.d/qubes-pulseaudio.conf
+/etc/pulse/qubes-default.pa
+/usr/bin/start-pulseaudio-with-vchan
+%{_libdir}/pulse-%{pa_ver}/modules/module-vchan-sink.so
+/etc/xdg/autostart/qubes-pulseaudio.desktop