Put ubuntu gtk+3 into main .sfs

woof-distro/x86/ubuntu/upupbb/DISTRO_PKGS_SPECS-ubuntu-bionic

@@ -48,7 +48,7 @@ yes|arp-scan|arp-scan|exe,dev,doc,nls| #needed by peasyscan-noarch
 yes|aspell|libaspell15,libaspell-dev|exe,dev,doc,nls| #needed by abiword.
 yes|atk|gir1.2-atk-1.0,libatk1.0-0,libatk1.0-data,libatk1.0-dev|exe,dev,doc,nls|
 yes|atkmm|libatkmm-1.6-1v5,libatkmm-1.6-dev|exe,dev,doc,nls
-yes|at-spi2-atk_dev|libatspi2.0-0,libatk-bridge2.0-0,libatk-adaptor,libatk-bridge2.0-dev|exe>dev,dev,doc,nls| #needed by gtk+3_dev
+yes|at-spi2-atk_dev|libatk-adaptor,libatk-bridge2.0-dev|exe>dev,dev,doc,nls| #needed by gtk+3_dev
 yes|attr|libattr1,libattr1-dev|exe,dev,doc,nls
 yes|audiofile|libaudiofile1,libaudiofile-dev|exe,dev,doc,nls
 yes|audit|libaudit-common,libaudit1,libaudit-dev|exe,dev,doc,nls| #needed by xorg.
@@ -83,7 +83,7 @@ yes|cgtkcalc||exe,dev>null,doc,nls
 yes|chntpw|chntpw|exe,dev,doc,nls
 yes|cifs-utils|cifs-utils|exe,dev,doc,nls
 yes|cmake|cmake,cmake-data,cmake-curses-gui|exe>dev,dev,doc,nls
-yes|colord_dev|libcolord2,libcolord-dev|exe>dev,dev,doc,nls| #needed by gtk+3_dev
+yes|colord_dev|libcolord-dev|exe>dev,dev,doc,nls| #needed by gtk+3_dev
 yes|compton|compton,libconfig9|exe,dev,doc,nls
 yes|copy-fast||exe
 yes|coreutils|coreutils|exe,dev>null,doc,nls
@@ -230,8 +230,7 @@ yes|gtk2-engines-pixbuf|gtk2-engines-pixbuf|exe,dev,doc,nls
 yes|gtkam|gtkam|exe,dev>null,doc,nls|
 yes|gtkdialog4||exe,dev,doc>dev,nls| #modify all pets that need this to explicitly call 'gtkdialog' or 'gtkdialog4'.
 yes|gtk+|gir1.2-gtk-2.0,libgtk2.0-0,libgtk2.0-dev|exe,dev,doc,nls
-yes|gtk+3||exe
-yes|gtk+3_dev|libgtk-3-0,libgtk-3-dev,libgtk-3-common|exe>dev,dev,doc,nls
+yes|gtk+3|libgtk-3-0,libgtk-3-dev,libgtk-3-common,libatk-bridge2.0-0,libatspi2.0-0,libwayland-cursor0,libcolord2,librest-0.7-0|exe,dev,doc,nls
 yes|gtklp|gtklp|exe,dev,doc,nls| #stupid deb has no .desktop file -- need a template.
 yes|gtkmm|libgtkmm-2.4-1v5,libgtkmm-2.4-dev|exe,dev,doc,nls
 yes|gtksourceview|libgtksourceview2.0-0,libgtksourceview2.0-common,libgtksourceview2.0-dev|exe,dev,doc,nls
@@ -697,7 +696,7 @@ yes|vorbis-tools|vorbis-tools|exe,dev,doc,nls
 yes|wag_profiles||exe| #taken out of net_setup pet, see forum t=82092&start=300
 yes|waitmax||exe
 yes|wavplay||exe
-yes|wayland_dev|libwayland-client0,libwayland-cursor0,libwayland-dev,libwayland-server0|exe>dev,dev,doc,nls| #needed by gtk+3_dev libwayland-server0 needed by gstreamer. GSTREAMER1.0 have taken out gtk3
+yes|wayland_dev|libwayland-client0,libwayland-dev,libwayland-server0|exe>dev,dev,doc,nls| #needed by gtk+3_dev libwayland-server0 needed by gstreamer. GSTREAMER1.0 have taken out gtk3
 yes|wcpufreq||exe,dev,doc,nls| #using this instead of cpu-scaling-ondemand.
 yes|wget|wget|exe,dev>null,doc,nls
 yes|wireless-tools|wireless-tools,libiw30,libiw-dev|exe,dev,doc,nls