From 51bb3df5ff6d95d8e0b20e68e05c29b750efef60 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Thu, 7 Feb 2013 16:33:23 +0100
Subject: [PATCH] comps: install volume control software

For both Xfce and KDE.
---
 conf/comps-qubes.xml     | 43 ++++++++++++++++++++++++++++++++++++++++
 conf/qubes-kickstart.cfg |  2 ++
 2 files changed, 45 insertions(+)

diff --git a/conf/comps-qubes.xml b/conf/comps-qubes.xml
index 132aac6..dfc242f 100644
--- a/conf/comps-qubes.xml
+++ b/conf/comps-qubes.xml
@@ -995,6 +995,20 @@
       <packagereq>xfsprogs</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>sound-basic</id>
+    <name>Sound basic support</name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">alsamixergui</packagereq>
+      <packagereq type="default">paman</packagereq>
+      <packagereq type="default">paprefs</packagereq>
+      <packagereq type="default">pavucontrol</packagereq>
+      <packagereq type="default">pavumeter</packagereq>
+      <packagereq type="default">volumeicon</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>base-x</id>
     <name>X Window System</name>
@@ -1026,6 +1040,7 @@
       <packagereq type="mandatory">oxygen-icon-theme</packagereq>
       <packagereq type="mandatory">qubes-kde-dom0</packagereq>
       <packagereq type="mandatory">xsettings-kde</packagereq>
+      <packagereq type="default">kmix</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1077,6 +1092,31 @@
       <packagereq>xfwm4-themes</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>xfce-media</id>
+    <name>Multimedia support for Xfce</name>
+    <name xml:lang="de">Multimedia-Unterstützung für Xfce</name>
+    <name xml:lang="hu">Multimédia támogatás az XFCE számára</name>
+    <name xml:lang="ja">Xfce 向けのマルチメディアサポート</name>
+    <name xml:lang="nl">Multimedia ondersteuning voor Xfce</name>
+    <name xml:lang="pl">Obsługa multimediów w środowisku Xfce</name>
+    <name xml:lang="uk">Мультимедійні програми для Xfce</name>
+    <name xml:lang="zh_TW">Xfce 多媒體支援</name>
+    <description>Multimedia support for Xfce</description>
+    <description xml:lang="de">Multimedia-Unterstützung für Xfce</description>
+    <description xml:lang="hu">Multimédia támogatás az XFCE számára</description>
+    <description xml:lang="ja">Xfce 向けのマルチメディアサポート</description>
+    <description xml:lang="nl">Multimedia ondersteuning voor Xfce</description>
+    <description xml:lang="pl">Obsługa multimediów w środowisku Xfce</description>
+    <description xml:lang="uk">Мультимедійні програми для Xfce</description>
+    <description xml:lang="zh_TW">Xfce 多媒體支援</description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>pavucontrol</packagereq>
+      <packagereq>xfce4-mixer</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>xfce-extra-plugins</id>
     <name>Extra plugins for the Xfce panel</name>
@@ -1127,6 +1167,7 @@
      <groupid>base-x</groupid>
      <groupid>hardware-support</groupid>
      <groupid>fonts</groupid>
+     <groupid>sound-basic</groupid>
      <groupid>qubes</groupid>
      <groupid>kde-desktop-qubes</groupid>
     </grouplist>
@@ -1142,9 +1183,11 @@
      <groupid>base-x</groupid>
      <groupid>hardware-support</groupid>
      <groupid>fonts</groupid>
+     <groupid>sound-basic</groupid>
      <groupid>qubes</groupid>
      <groupid>xfce-desktop-qubes</groupid>
      <groupid>xfce-extra-plugins</groupid>
+     <groupid>xfce-media</groupid>
     </grouplist>
   </environment>
   <langpacks>
diff --git a/conf/qubes-kickstart.cfg b/conf/qubes-kickstart.cfg
index a3ef25d..8b81e87 100644
--- a/conf/qubes-kickstart.cfg
+++ b/conf/qubes-kickstart.cfg
@@ -14,6 +14,8 @@ repo --name=dom0-updates --baseurl=file:///tmp/qubes-installer/yum/dom0-updates/
 @kde-desktop-qubes
 @xfce-desktop-qubes
 @xfce-extra-plugins
+@xfce-media
+@sound-basic
 @fonts
 @hardware-support
 @qubes