Merge lp:~rohangarg/ubuntu-seeds/kubuntu.raring into lp:~kubuntu-dev/ubuntu-seeds/kubuntu.raring

[Rohan Garg]

Merge active seeds into desktop so that the other active seed can be dropped and everything is generated from kubuntu-meta

[Colin Watson (cjwatson)]

On Thu, Dec 13, 2012 at 02:25:22PM -0000, Rohan Garg wrote:
> --- STRUCTURE 2012-10-18 17:27:39 +0000
> +++ STRUCTURE 2012-12-13 14:24:22 +0000
> @@ -10,5 +10,13 @@
> dvd: ship development supported-common dvd-langsupport
> full: dvd desktop
> supported-desktop-extra: dvd dvd-live
> +
> +# Active
> +active: standard
> +active-ship: ship
> +active-live: active
> +active-ship-live: ship-live
> +
> # make sure supported remains the last entry
> -supported: dvd-live ship-live full supported-desktop-extra
> +supported: dvd-live ship-live full supported-desktop-extra active-ship-live supported-common
> +

Nothing appears to inherit from the active-ship or active-live seeds.
This will cause problems. I suggest adding them to supported along with
active-ship-live.

> --- active 1970-01-01 00:00:00 +0000
> +++ active 2012-12-13 14:24:22 +0000
[...]
> +Task-Metapackage: kubuntu-active
[...]
> --- desktop 2012-11-27 14:00:14 +0000
> +++ desktop 2012-12-13 14:24:22 +0000
[...]
> +Task-Metapackage: kubuntu-desktop
[...]
> --- full 2011-09-01 11:10:10 +0000
> +++ full 2012-12-13 14:24:22 +0000
[...]
> +Task-Metapackage: kubuntu-full

You can delete all these Task-Metapackage lines; they're redundant since
the default construction of SEEDCOLLECTION-SEEDNAME already produces the
right results here.

[lp:~rohangarg/ubuntu-seeds/kubuntu.raring]

1195. By Rohan Garg on 2012-12-14

* Add active-live and active-ship to supported
* Drop Task-Metapackage key's , not required

[Rohan Garg (rohangarg)]

Thanks Colin! I've updated the files as per your review.

[Rohan Garg (rohangarg)]

Bump?

[Jonathan Riddell (jr)]

What are the changes in the active seeds compared to the current kubuntu-active seed collection?

[Rohan Garg (rohangarg)]

I've copied over the seeds from the Kubuntu Active seed, so no changes to the seed as such ( except adjusting STRUCTURE )

[Jonathan Riddell (jr)]

groovy, ship it

review: Approve

=== modified file 'STRUCTURE'
--- STRUCTURE	2012-10-18 17:27:39 +0000
+++ STRUCTURE	2012-12-14 12:34:19 +0000
@@ -10,5 +10,13 @@
 dvd: ship development supported-common dvd-langsupport
 full: dvd desktop
 supported-desktop-extra: dvd dvd-live
+
+# Active
+active: standard
+active-ship: ship
+active-live: active
+active-ship-live: ship-live
+
 # make sure supported remains the last entry
-supported: dvd-live ship-live full supported-desktop-extra
+supported: dvd-live ship-live full supported-desktop-extra active-ship-live active-ship active-live supported-common
+
 
=== added file 'active'
--- active	1970-01-01 00:00:00 +0000
+++ active	2012-12-14 12:34:19 +0000
@@ -0,0 +1,242 @@
+Task-Per-Derivative: 1
+Task-Section: user
+Task-Description: Kubuntu Active
+Task-Extended-Description: This task provides the Kubuntu flavour optimised for mobile devices.
+Task-Key: kubuntu-active
+Task-Name: kubuntu-active
+Task-Seeds: standard
+
+# This seed needs to have the selection of packages we want for
+# tablet/mobile devices from platform/desktop-common and
+# kubuntu/desktop and add the Plasma Active ones
+
+= Hardware and Architecture Support =
+
+== Architecture-independent ==
+
+ * alsa-base # needed for proper hardware detection (hotplug/blacklist.d, modprobe.d)
+ * alsa-utils           # basic audio support and mixer level handling
+
+Bluetooth:
+TODO not for Xubuntu
+
+ * (bluez) # base for bluetooth support
+ * (bluez-alsa)
+ * (bluez-cups)  # allow connecting to bluetooth printers from CUPS
+
+== armel ==
+
+ * apmd [armel]
+
+= Network Services =
+
+Basic network services and Windows integration.
+
+ * wireless-tools
+ * rfkill              # No longer using the copy from wireless-tools (LP: #715309)
+ * wpasupplicant  # ScottJamesRemnant
+ * (libnss-mdns)       # IPv4 link-local DNS support
+ * ca-certificates     # common SSL certificates
+
+These packages help with system integration
+
+ * (avahi-daemon)      # some people do not like it, and it is not essential
+
+= Printing =
+
+Printing and printer configuration is a real weak spot in Debian, and in Linux in general. We will need to stay at the front of the curve here.
+
+ * (cups)                     # our preferred printer management infrastructure
+ * (cups-bsd)                 # gives us lpc, lpq, lpr, lprm
+ * (cups-client)              # gives us cancel, cupstestppd, lp, lpoptions, lppasswd, lpstat, cupsaddsmb, accept, lpadmin, lpinfo, lpmove
+ * foomatic-db-compressed-ppds  # the foomatic printer driver database
+ * foomatic-filters             # converter from postscript to printer-specific formats
+ * openprinting-ppds            # Most common drivers we want in desktop; less common are in o-p-extra
+ * pnm2ppa                      # several ppds require this
+ * ghostscript-x
+ * (hplip)     			# support for HP all-in-one printers
+ * (min12xxw)			# support for KonicaMinolta PagePro 1200W, 1300W printers
+ * (foo2zjs)			# support for printing to ZjStream-based printers
+ * (splix)			# support for Samsung lasers
+ * (pxljr)			# support for HP Color lasers
+ * (c2esp)                      # support for Kodak injket printers
+ * (ptouch-driver)              # support for Brother P-touch printers
+ * (rastertosag-gdi)            # support for Rico Aficio SPxxxx printers
+
+= GUI infrastructure =
+
+Packages used for X preconfiguration are just Recommends; removing them after initial installation should be relatively safe.
+
+ * xorg                          # this includes xserver-xorg->xserver-xorg-{input|video}-* (no need to add specific drivers manually)
+ * !linux-image-*                # xorg transitively depends on this, but this would pull in grub-pc; we handle that separately
+ * xkb-data                      # XKB data now lives here
+
+Fonts:
+
+ * ttf-dejavu-core
+ * ttf-freefont
+ * (fonts-kacst-one)
+ * (fonts-takao-pgothic)
+ * (fonts-khmeros-core)
+ * (ttf-indic-fonts-core)
+ * (ttf-punjabi-fonts)
+ * (ttf-thai-tlwg)
+ * (fonts-lao)
+ * (ttf-ubuntu-font-family)
+
+= Other =
+
+ * (policykit-desktop-privileges) # passwordless disk/CPU speed/time operations for admins
+ * ubuntu-extras-keyring # archive signing key for extras.ubuntu.com
+
+=====INSERT
+Bluetooth:
+
+ * (bluedevil)
+ * (pulseaudio-module-bluetooth) # Bluetooth audio devices by default
+
+= Network Services =
+
+Basic network services and Windows integration.
+
+ * (avahi-autoipd)     # IPv4 link-local interface configuration support
+ * (plasma-widget-networkmanagement)
+ * (mobile-broadband-provider-info)
+
+= GUI infrastructure =
+
+Extra fonts (should be common, but not so for space reasons):
+
+ * (ttf-wqy-microhei)
+ * (fonts-nanum)
+ * (fonts-liberation)
+
+== Core ==
+
+ * plasma-active
+ * plasma-active-default-settings
+ * plasma-widgets-active
+ * plasma-widgets-workspace
+ * plasma-active-settings
+ * contour
+ * kde-artwork-active
+ * kubuntu-active-default-settings
+
+ * plasma-active-imageviewer
+ * plasma-active-webbrowser
+ * plasma-active-keyboardcontainer
+
+== kde-runtime ==
+
+ * phonon-backend-gstreamer
+
+== kdebase ==
+
+ * kdepasswd
+ * konsole
+
+== kde-workspace ==
+
+ * kde-workspace-bin # Plasma, ksplash and more
+ * kde-window-manager-active-gles
+ * klipper
+# * ksysguard  #not useful on tablet?
+# * systemsettings  #not useful on tablet?
+
+== kdeadmin ==
+
+# * (system-config-printer-kde)  #not usable on tablet UI?
+
+== kdemultimedia ==
+
+ * kmix
+
+== kdenetwork ==
+
+ * kde-zeroconf
+ * (kde-telepathy) #testing if this is good enough to replace unmaintained kopete jr 2012-02-15
+
+== kdeutils ==
+
+ * (printer-applet)
+
+== everything else KDE ==
+
+ * (muon-installer)
+ * (muon-notifier)
+ * (polkit-kde-1) # needed by muon but is an option compared to gtk polkit for gnome users
+ * (gstreamer0.10-qapt)
+ * (gtk2-engines-oxygen)
+ * (gtk3-engines-oxygen)
+ * (kdesudo) # simpler and more reliable than kdesu
+ * xdg-user-dirs
+ * (upower) # Recommends so people can keep hal if they want it
+ * (udisks) # Recommends so people can keep hal if they want it
+ * language-selector-kde
+ * software-properties-kde
+ * (apport-kde)
+ * (xdg-utils)         # useful utilities
+ * (jockey-kde) # installer for drivers
+ * (plasma-widgets-addons)
+ * (kubuntu-notification-helper)
+ * (qapt-deb-installer)
+ * (oxygen-cursor-theme)
+ * (oxygen-icon-theme)
+ * (libqca2-plugin-ossl)
+ * (kde-config-gtk) #GTK setup
+ * (xsettings-kde)
+# * (plasma-widget-message-indicator) #not yet useful with telepathy-kde
+ * (apturl-kde)
+ * (pulseaudio)
+ * (python-qt4-dbus) # So python-dbus doesn't pull in python-gi
+
+= Other =
+
+ * (plymouth-theme-kubuntu-text)
+ * (plymouth-theme-kubuntu-logo)
+ * (cryptsetup) #needed for encrypted devices, also in d-i-requirements seed but might be needed for 3rd party drives
+
+== kdebase ==
+
+ * lightdm-kde-greeter
+
+== kdepim ==
+
+ * kontact-mobile
+
+== kdegames with suitably touch friendly UIs ==
+
+ * kpat
+# * kmajong #not sure of package name
+ * katomic
+ * knetwalk
+
+== kdegraphics ==
+
+# TODO Add okular active bits here
+
+== kdemultimedia ==
+
+# TODO Add active video player here
+ * (dragonplayer)
+
+== kdenetwork ==
+
+ * (kppp)
+ * (kdenetwork-filesharing)
+
+== calligra ==
+
+ * calligraactive
+
+== everything else KDE ==
+
+ * (bangarang)
+ * (kubuntu-web-shortcuts)
+ * (kde-config-touchpad)
+# * (plasma-widget-menubar) #not useful for active?
+# * (appmenu-gtk)
+# * (appmenu-gtk3)
+
+= Other =
+ * kubuntu-active # the metapackage itself
 
=== added file 'active-live'
--- active-live	1970-01-01 00:00:00 +0000
+++ active-live	2012-12-14 12:34:19 +0000
@@ -0,0 +1,35 @@
+Task-Per-Derivative: 1
+Task-Section: user
+Task-Description: Kubuntu Active Remix live CD
+Task-Extended-Description: This task provides the extra packages installed on the Kubuntu Active live image. It is neither useful nor recommended to install this task in other environments.
+Task-Relevance: 2
+Task-Key: ubiquity-frontend-kde
+Task-Name: kubuntu-active-live
+Task-Test-new-install: skip show
+
+ * Languages: en
+ * language-pack-${Languages}
+ * language-pack-kde-${Languages}
+
+# subset of English language support which we want by default:
+ * hunspell-en-us
+ * openoffice.org-hyphenation
+ * wamerican
+
+#by order of popcon (de fr es ru it pt zh pl ja nl cs sv el hu)
+ * Languages: de fr es ru it pt zh pl ja nl cs sv el hu
+ * language-pack-${Languages}
+ * language-pack-kde-${Languages}
+
+#fill up extra space
+# * Languages: es
+# * language-pack-${Languages} [i386]
+# * language-pack-kde-${Languages} [i386]
+
+== Ubiquity components ==
+
+These packages make up the Ubiquity live installer.
+
+ * ubiquity-frontend-kde
+ * ubiquity-ubuntu-artwork
+ * ubiquity-slideshow-kubuntu
 
=== added file 'active-ship'
--- active-ship	1970-01-01 00:00:00 +0000
+++ active-ship	2012-12-14 12:34:19 +0000
@@ -0,0 +1,20 @@
+== Common language packs ==
+
+ # must have
+ * Languages: en
+ * language-pack-${Languages}
+ * language-pack-kde-${Languages}
+
+# subset of English language support which we want by default:
+ * hunspell-en-us [!powerpc]
+ * wamerican [!powerpc]
+
+#by order of popcon (de fr es it ru pt zh pl ja nl cs sv el hu)
+# * Languages: de fr es
+# * language-pack-${Languages} [i386 amd64]
+# * language-pack-kde-${Languages} [i386 amd64]
+
+#fill up extra space
+# * Languages: it ru pl
+# * language-pack-${Languages} [i386]
+# * language-pack-kde-${Languages} [i386]
 
=== added file 'active-ship-live'