diff -Zbw ubuntustudio.trusty/audio ubuntustudio.xenial/audio
5c5
< Task-Seeds: ffmpeg-common
---
> Task-Seeds: pre-seeds
9,11d8
<  * (a2jmidid)
<  * (alsa-tools)
<  * (alsa-tools-gui)
16,18d12
<  * (ffado-tools)
<  * (ffado-dbus-server)
<  * (ffado-mixer-qt4)
21,22d14
<  * (gladish)
<  * (gmidimonitor)
27,29d18
<  * (jack-keyboard)
<  * (jack-rack)
<  * (jackd)
30a20
>  * (kid3-qt)
32,33d21
<  * (meterbridge)
<  * (mudita24)
35c23
<  * (patchage)
---
>  * (petri-foo)
37d24
<  * (pulseaudio-module-jack)
39,45d25
<  * (qasconfig)
<  * (qashctl)
<  * (qasmixer)
<  * (qjackctl)
<  * (qmidiarp)
<  * (qmidinet)
<  * (qmidiroute)
49d28
<  * (rtirq-init)
51,53d29
<  * (specimen)
<  * (ubuntustudio-controls)
<  * (vkeybd)
55,56d30
<  * (zita-ajbridge)
<  * (zynjacku)
59,110c33,35
< # Pure Data libraries (usually a part of pd-extended 
< # - would be nice to be replaces by a pd-all package in Debian)
<  * (pd-arraysize)
<  * (pd-aubio)
<  * (pd-bassemu)
<  * (pd-beatpipe)
<  * (pd-boids)
<  * (pd-bsaylor)
<  * (pd-chaos)
<  * (pd-comport)
<  * (pd-csound)
<  * (pd-cxc)
<  * (pd-cyclone)
<  * (pd-earplug)
<  * (pd-ekext)
<  * (pd-ext13)
<  * (pd-fftease)
<  * (pd-flite)
<  * (pd-freeverb)
<  * (pd-ggee)
<  * (pd-hcs)
<  * (pd-hid)
<  * (pd-iemambi)
<  * (pd-iemmatrix)
<  * (pd-iemnet)
<  * (pd-jmmmp)
<  * (pd-libdir)
<  * (pd-list-abs)
<  * (pd-lyonpotpourri)
<  * (pd-mapping)
<  * (pd-markex)
<  * (pd-maxlib)
<  * (pd-mjlib)
<  * (pd-moonlib)
<  * (pd-motex)
<  * (pd-osc)
<  * (pd-pan)
<  * (pd-pddp)
<  * (pd-pdogg)
<  * (pd-pdp)
<  * (pd-pdstring)
<  * (pd-plugin)
<  * (pd-pmpd)
<  * (pd-purepd)
<  * (pd-readanysf)
<  * (pd-sigpack)
<  * (pd-smlib)
<  * (pd-unauthorized)
<  * (pd-vbap)
<  * (pd-wiimote)
<  * (pd-windowing)
<  * (pd-zexy)
---
> # Pure Data libraries 
> # Pull them in via the Debian multimedia-puredata metapackage
>  * (multimedia-puredata)
112a38
>  * ubuntustudio-audio-core
Only in ubuntustudio.xenial/: audio-core
diff -Zbw ubuntustudio.trusty/audio-plugins ubuntustudio.xenial/audio-plugins
25d24
<  * (lv2fil)
42a42
>  * (x42-plugins)
diff -Zbw ubuntustudio.trusty/blacklist ubuntustudio.xenial/blacklist
1,8d0
< # blacklist: gnome1
< # We want to avoid shipping GNOME 1.x components if possible
< gconf
< libxml
< libcapplet
< gnome-bin
< gnome-libs
< 
12,24c4
< 
< # java-common build-depends
< #dpsyco
< # various build-depends, pulls in lua, consider standarizing html->text
< #elinks
< # could be removed by getting rid of CHILL, which nothing uses
< gcc-2.95
< # tcl8.3 and tcl8.4 is more than enough, consider dropping tcl8.3 too
< tcl8.0
< # no one actually uses this anymore
< #zephyr
< # mdz, 2004-06-15: only pulled in by vim
< ruby1.8
---
> # If you add to this list explain why a package is blacklisted.
31,40d10
< ## mdz: Packages noticed in 2004-06-14 review of germinate output
< uw-imap
< # We shall only ship current kernel-source
< kernel-source-2.4.22
< kernel-source-2.4.23
< kernel-source-2.4.24
< kernel-source-2.4.25
< kernel-source-2.2.25
< # results in lots of unwanted setuid-ness; modern stuff uses X or fb
< svgalib
49,57d18
< # mdz, 2004-06-14: many, many bugs and unmaintained (both debian and upstream)
< metamail
< # mdz, 2004-06-14: lots of unsafe string handling, CVE-2002-0789,
< # CAN-2003-0436, CAN-2003-0437
< mnogosearch
< # mdz, 2004-06-14: requires no explanation
< wu-ftpd
< # mdz, 2004-06-14: CAN-2003-0781, unmaintained upstream, Debian#210444
< ecartis
61,63c22,36
< # mdz, 2004-06-14: upstream deliberately obfuscates vulnerabilities
< # mdz, 2004-06-20: CAN-2002-0757, CAN-2003-0101, SNS 74, SNS 75
< webmin
---
> 
> # Xubuntu doesn't need GNOME's user guide.
> gnome-user-guide
> 
> # blacklist: unity
> # We don't use unity or gnome, and use lightdm-gtk-greeter
> gnome-control-center
> gnome-session
> unity
> unity-control-center
> unity-greeter
> 
> # blacklist other libreoffice themes until lp #1483914 is sorted
> libreoffice-style-human
> libreoffice-style-tango
Common subdirectories: ubuntustudio.trusty/.bzr and ubuntustudio.xenial/.bzr
diff -Zbw ubuntustudio.trusty/desktop ubuntustudio.xenial/desktop
0a1,4
> Ubuntu Studio desktop seed
> ====================
> 
> ----------------------
3,4d6
< Task-Enhances: ubuntustudio-audio | ubuntustudio-graphics | ubuntustudio-photography | ubuntustudio-publishing | ubuntustudio-video
< Task-Test-limited: ubuntustudio-audio ubuntustudio-graphics ubuntustudio-photography ubuntustudio-publishing ubuntustudio-video
8c10,14
< Task-Seeds: desktop-common
---
> Task-Name: ubuntustudio-desktop
> Task-Seeds: desktop-common desktop-core
> ----------------------
> 
> ## This seed inherits packages from 'desktop-core', so will appear to be missing many important packages.
10c16
< = Network Services =
---
> == Network Services ==
14,15d19
<  * (avahi-autoipd)              # IPv4 link-local interface configuration support
<  * (network-manager-gnome)	# replacing gnome-network-admin due to usability
19,23c23
< = Printing =
< 
<  * cups-driver-gutenprint     # a ton of cupsys ppds, for real comprehensive printer support
< 
< = GUI infrastructure =
---
> == GUI infrastructure ==
25,31c25,29
<  * xterm                    # Provide a backup terminal and complete X env.
<  * (libnotify-bin)	    # various scripts need notify-send (such as .bashrc's "alert")
< 
< Extra fonts (should be common, but not so for space reasons):
< 
<  * fonts-droid # required by our theme - len 20120723 & replaces ttf-wqy-microhei
<  * (ttf-unfonts-core)
---
> == Extra fonts (should be common, but not so for space reasons) ==
>  * (fonts-noto-hinted)
>  * (fonts-noto-mono)
>  * (fonts-noto-cjk)
>  * (fonts-nanum)
35,36c33
< Input methods:
< 
---
> == Input methods ==
39c36
< = Desktop Xfce/GNOME Apps =
---
> == Desktop Xfce Apps ==
41c38
< Common with Ubuntu:
---
> === Common with Ubuntu ===
42a40
>  * (whoopsie)              # http://wiki.ubuntu.com/ErrorTracker
45,46c43,44
<  * (gcalctool)
<  * lightdm                  # Proposed GDM replacement for Oneiric, see https://blueprints.launchpad.net/ubuntu/+spec/desktop-o-lightdm
---
>  * (gnome-calculator)
>  * (gnome-software)
50d47
<  * (libpam-gnome-keyring)
52,54d48
<  * (gnome-time-admin)
<  * (gparted)
<  * (gucharmap)              # SebastienBacher
58,61c52
<  * ssh-askpass-gnome
<  * (synaptic)               # default GUI package manager
<  * software-center
<  * software-properties-gtk  # default GUI sources.list editor / extra drivers
---
>  * update-manager
63d53
<  * (update-manager)         # in case we loose depends somewhere Len 20120902
65,69d54
<  * (xdg-utils)              # useful utilities
<  * pulseaudio
<  * (pulseaudio-module-gconf)
<  * (pulseaudio-module-x11)
<  * (pavucontrol)
71,85c56,58
<  * arandr                   # for multi-head support
<  * (brasero)
<  * gedit
<  * (totem-mozilla)
<  * ubuntu-settings
< 
< Xfce core:
<  * xfwm4
<  * xfdesktop4
<  * xfce4-panel
<  * libxfce4ui-utils         # LP: 1002250
<  * xfce4-settings
<  * xfce4-session
<  * thunar
<  * xfce4-appfinder
---
>  * (gvfs-backends)      # otherwise no network tab
> 
> === Xfce core ===
87c60
<  * thunar-volman
---
>  * (libxfce4ui-utils)   # for xfce4-about
89,90c62,63
< Xfce goodies:
<  * (catfish) # file search utility 20130221 Len
---
> === Xfce goodies ===
>  * (xfce4-xkb-plugin)
92d64
<  * (xfce4-fsguard-plugin)
94d65
<  * (xfce4-mount-plugin)
100d70
<  * (xfce4-screenshooter)
102d71
<  * (xfce4-smartbookmark-plugin)
105d73
<  * (xfce4-mixer)
108,109d75
<  * (xfce4-volumed)
<  * (xfce4-terminal)
111d76
<  * (parole)
113d77
<  * (xfce4-power-manager)
116,124c80,82
<  * xfce4-notifyd
< 
< Indicator/Ayatana stuff:
<  * (xfce4-indicator-plugin)
<  * (indicator-application)
<  * (indicator-sound)
<  * (indicator-messages)
< 
< Themes: we will ship only the very best looking themes. We won't ship everything that Debian ships, just a custom package that includes the themes we want. These packages are included for size guidance until we have Ubuntu-specific packages.
---
>  * (xfburn)
>  * (parole)
>  * (xfpanel-switch)
126,128c84,102
<  * gtk2-engines			# DanielHolbach (gtk2-engines were merged into one package)
<  * gtk2-engines-pixbuf
<  * dmz-cursor-theme
---
> === Other Desktop GUI Apps ===
>  * (simple-scan)
>  * (lightdm-gtk-greeter-settings)
>  * (catfish)
>  * (thunderbird) 
>  * (pidgin)
>  * (pidgin-otr)
>  * (mousepad)
>  * (evince)
>  * (blueman)
>  * (menulibre) # menu editor
>  * (mugshot) # user config
>  * (gtk-theme-config)
> 
> === LibreOffice ===
>  * (libreoffice-style-elementary) [!powerpc !armhf]
>  * (libreoffice-gtk) [!powerpc !armhf]
>  * (libreoffice-writer) [!powerpc !armhf]
>  * (libreoffice-calc) [!powerpc !armhf]
130c104,105
< The gstreamer0.10 packages we want to install:
---
> === Indicator/Ayatana stuff ===
>  * (indicator-messages)
132,134c107,109
<  * (gstreamer0.10-alsa)
<  * (gstreamer0.10-plugins-base-apps)
<  * (gstreamer0.10-pulseaudio)
---
> === Games: We only ship a few by default ===
>  * (gnome-mines) [!powerpc]
>  * (gnome-sudoku) [!powerpc]
136c111,112
< Make oss programs work with pulse/alsa, here to replace oss-compat
---
> === Themes ===
>  * (xubuntu-community-wallpapers)
138c114
<  * osspd
---
> == The gstreamer1.0 packages we want to install ==
140c116
< Accessibility tools:
---
>  * (gstreamer1.0-pulseaudio)
141a118
> == Accessibility tools ==
143,144c120
<  * (xcursor-themes)
<  * (gnome-orca)
---
>  * (onboard)
145a122,123
>  * (brltty-x11)
>  * (xcursor-themes)
148,184d125
< # Depends on gnome-session, brings in unity # 20110830 astraljava
< # * (mousetweaks)
< 
< = Other Desktop GUI Apps =
< 
<  * (simple-scan)
<  * (xscreensaver)
<  * (screensaver-default-images)
<  * (xscreensaver-gl)    
<  * (xscreensaver-data)  
<  * (usb-creator-gtk) [i386 amd64]
<  * (vinagre)
<  * (xchat)
<  * evince
<  * (blueman)
<  * (audacious)
<  * (audacious-plugins)
<  * (shotwell)
<  * (alacarte)  # added as per quantal blueprints - Len 20120723
< 
< Desktop Experience:
< 
< # * (indicator-messages)
< 
< Documentation:
< 
<  * doc-base			# integrates with scrollkeeper
< 
< = Development =
< 
< Here we provide a minimal development environment sufficient to build kernel
< drives, so that this is possible on the live CD and in scenarious where
< it is problematic to get these packages onto the installed system in order
< to compile a driver. -mdz
< 
<  * (gcc)
<  * (make)
186c127
< = Other =
---
> == Documentation ==
188c129
< # explicitly stating all ubuntustudio-* packages even though some are depends of others
---
> == Development ==
189a131,135
> == Other ==
>  * (apt-offline) 
>  * (inxi)
>  * (pastebinit)
>  * ubuntustudio-desktop-core
191,203d136
<  * (ubuntustudio-default-settings)
<  * (xubuntu-icon-theme)             # to get elementary and elementary-dark icon themes
<  * (ubuntustudio-icon-theme)    # adds Studio specific icons
<  * (ubuntustudio-lightdm-theme)
<  * (ubuntustudio-look)
<  * (ubuntustudio-sounds)
<  * (ubuntustudio-wallpapers)
<  * lightdm-gtk-greeter
<  * plymouth-theme-ubuntustudio
<  * xserver-xorg-lts-wily
<  * libwayland-egl1-mesa-lts-wily
<  * xserver-xorg-video-all-lts-wily
<  * xserver-xorg-video-geode-lts-wily [i386]
Only in ubuntustudio.xenial/: desktop-core
Common subdirectories: ubuntustudio.trusty/doc and ubuntustudio.xenial/doc
Only in ubuntustudio.trusty/: dvd
Only in ubuntustudio.trusty/: ffmpeg-common
Only in ubuntustudio.trusty/: font-meta
Only in ubuntustudio.xenial/: fonts
diff -Zbw ubuntustudio.trusty/graphics ubuntustudio.xenial/graphics
21c21
<  * (ubuntustudio-font-meta)
---
>  * (ubuntustudio-fonts)
Only in ubuntustudio.xenial/: live
Only in ubuntustudio.xenial/: pre-seeds
diff -Zbw ubuntustudio.trusty/publishing ubuntustudio.xenial/publishing
20c20
<  * (ubuntustudio-font-meta)
---
>  * (ubuntustudio-fonts)
Only in ubuntustudio.trusty/: ship
diff -Zbw ubuntustudio.trusty/STRUCTURE ubuntustudio.xenial/STRUCTURE
1,13c1,14
< include platform.trusty
< desktop: ffmpeg-common desktop-common
< ffmpeg-common: desktop-common
< audio: desktop ffmpeg-common
< audio-plugins: ffmpeg-common
< font-meta: desktop-common
< graphics: desktop ffmpeg-common font-meta
< photography: desktop ffmpeg-common font-meta
< publishing: desktop ffmpeg-common font-meta
< video: desktop ffmpeg-common
< ship: boot desktop audio audio-plugins font-meta graphics photography publishing video d-i-requirements
< dvd-live: desktop audio audio-plugins font-meta graphics photography publishing video live-common
< dvd: boot dvd-live
---
> include platform.xenial
> desktop: desktop-common desktop-core pre-seeds
> desktop-core: desktop-common pre-seeds
> pre-seeds: desktop-common
> audio-core: pre-seeds desktop
> audio: pre-seeds desktop
> audio-plugins: pre-seeds
> fonts: desktop-common
> graphics: pre-seeds desktop fonts
> photography: pre-seeds desktop fonts
> publishing: pre-seeds desktop fonts
> video: pre-seeds desktop
> dvd-live: desktop audio-core audio audio-plugins fonts graphics photography publishing video live-common
> live: desktop-core audio-core live-common
15c16
< supported: ship dvd supported-common
---
> supported: supported-common
diff -Zbw ubuntustudio.trusty/video ubuntustudio.xenial/video
5c5
< Task-Seeds: ffmpeg-common
---
> Task-Seeds: pre-seeds
12c12
<  * (dvdstyler)
---
>  * (devede)
27c27
<  * (khelpcenter4) # required by kdenlive
---
>  * (khelpcenter) # required by kdenlive