File project.diff of Package 000package-groups

--- groups.yml.orig
+++ groups.yml
@@ -9,18 +9,15 @@
 OUTPUT:
   - dvd:
       includes:
+      - staging
       - filesystems
       - supplements_openqa
-      - supplements
       - kernel
       - base
       - x11
       - yast
       - kde
       - gnome
-      - xfce
-      # some extra packages we have space for
-      - extra
     # TODO:
     #   exclude *-basedon packages
     #   exclude SLED and SLES packages
@@ -67,7 +64,10 @@ base:
     - php7-pgsql # FIXME: move to pattern, needed by openqa
     - php7-mysql # FIXME: move to pattern, needed by openqa
     - chrony # FIXME: move to base pattern, boo#1072351
-    - quota-nfs # FIXME: move to pattern, needed by openQA
+    - Mesa-demo # FIXME: required by mate-tweak only, needed by openqa
+    - Mesa-demo-x # FIXME: required by fusion-icon and mate-tweak, needed by openqa
+    - salt-master: [x86_64] # FIXME: needed by openqa
+    - salt-minion: [x86_64] # FIXME: needed by openqa
 
 x11:
     - lightdm # todo: put in pattern boo#1081760
@@ -76,6 +76,7 @@ x11:
     - patterns-desktop-laptop
     - MozillaThunderbird # FIXME: only Suggests in pattern, needed by openQA
     - notification-daemon # FIXME: move to pattern. needed to avoid GNOME getting pulled in always
+    - vlc # FIXME: was Recommends in pattern on TW but not in Leap, needed by openQA
 
 kde:
     - patterns-kde-kde
@@ -112,7 +113,6 @@ xfce:
 
 yast:
     - patterns-yast-yast2_basis
-    - autoyast2 # FIXME: should be in some pattern
 
 staging:
     -  staging-build-key