Merge lp:~tom-gall/linaro-seeds/linaro.natty into lp:linaro-seeds/natty

Proposed by Tom Gall
Status: Merged
Merged at revision: 52
Proposed branch: lp:~tom-gall/linaro-seeds/linaro.natty
Merge into: lp:linaro-seeds/natty
Diff against target: 259 lines (+1/-235)
3 files modified
STRUCTURE (+1/-3)
linaro-handset-plasma (+0/-32)
linaro-handset-plasma-base (+0/-200)
To merge this branch: bzr merge lp:~tom-gall/linaro-seeds/linaro.natty
Reviewer Review Type Date Requested Status
Linaro Maintainers Pending
Review via email: mp+48067@code.launchpad.net

Description of the change

Remove little used linaro-handset-plasma and linaro-handset-plasma-base seeds

To STRUCTURE, change include platform.maverick to include platform.natty

To post a comment you must log in.
52. By Steve Langasek

merge from Tom

Revision history for this message
Steve Langasek (vorlon) wrote :

merged. In the future, please use one commit per logical change (i.e., the structure change should have been a separate commit from the dropping of plasma).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'STRUCTURE'
2--- STRUCTURE 2010-11-24 22:00:10 +0000
3+++ STRUCTURE 2011-01-31 22:16:13 +0000
4@@ -1,4 +1,4 @@
5-include platform.maverick
6+include platform.natty
7 linaro-headless: minimal
8 linaro-development: linaro-headless
9 linaro-x11-base: linaro-headless
10@@ -6,7 +6,5 @@
11 linaro-xfce-base: linaro-x11-base
12 linaro-xfce: linaro-xfce-base
13 linaro-alip: linaro-xfce-base
14-linaro-handset-plasma-base: linaro-x11-base
15-linaro-handset-plasma: linaro-handset-plasma-base
16 linaro-graphical-engineering: linaro-development
17 linaro-multimedia-engineering: linaro-development
18
19=== removed file 'linaro-handset-plasma'
20--- linaro-handset-plasma 2010-09-08 10:39:29 +0000
21+++ linaro-handset-plasma 1970-01-01 00:00:00 +0000
22@@ -1,32 +0,0 @@
23-Task-Per-Derivative: 1
24-Task-Section: user
25-Task-Description: Linaro handset plasma
26-Task-Extended-Description: This task provides the Linaro handset plasma based on the Kubuntu desktop environment optimized for mobile devices.
27-Task-Key: linaro-handset-plasma
28-Task-Name: linaro-handset-plasma
29-Task-Metapackage: linaro-handset-plasma
30-Task-Seeds: minimal linaro-headless linaro-x11-base linaro-handset-plasma-base
31-
32-This file is a fork of bzr branch lp:~ubuntu-core-dev/ubuntu-seeds/kubuntu.maverick mobile
33-
34-= On top of kubuntu-common (change to mobile stuff when we have it) =
35- * plasma-mobile
36- * kubuntu-mobile-default-settings
37-
38-= Some games (because we can and so the catagory won't be empty)
39- * (kdiamond)
40- * (kmahjongg)
41- * (kmines)
42- * (kreversi)
43- * (ksudoku)
44- * (lskat)
45- * (kpat)
46-
47-= Some EDU stuff (same reason)
48- * (parley)
49- * (ktouch)
50- * (kanagram)
51-
52-= Because mobile devices are for the net
53- * (blogilo) # blogging client
54-
55
56=== removed file 'linaro-handset-plasma-base'
57--- linaro-handset-plasma-base 2010-09-08 10:39:29 +0000
58+++ linaro-handset-plasma-base 1970-01-01 00:00:00 +0000
59@@ -1,200 +0,0 @@
60-Task-Per-Derivative: 1
61-Task-Section: user
62-Task-Description: Base Linaro Handset Plasma
63-Task-Extended-Description: This task provides the Linaro base handset plasma environment.
64-Task-Key: linaro-handset-plasma-base
65-Task-Name: linaro-handset-plasma-base
66-Task-Seeds: minimal linaro-headless linaro-x11-base
67-Task-Metapackage: linaro-handset-plasma-base
68-
69-This file is a fork of bzr branch lp:~ubuntu-core-dev/ubuntu-seeds/kubuntu.maverick kubuntu-common
70-as of revision 970
71-
72-Packages installed on both Kubuntu Desktop and Kubuntu Netbook
73-
74-= Hardware and Architecture Support =
75-
76-== Architecture-independent ==
77-
78-Bluetooth:
79-
80- * (bluedevil)
81-
82-= Network Services =
83-
84-Basic network services and Windows integration.
85-
86- * (avahi-autoipd) # IPv4 link-local interface configuration support
87- * (plasma-widget-networkmanagement)
88-
89-= GUI infrastructure =
90-
91-Extra fonts (should be common, but not so for space reasons):
92-
93- * (ttf-wqy-microhei)
94- * (ttf-unfonts-core)
95- * (ttf-liberation)
96-
97-Input methods:
98-
99- * (im-switch)
100- * (ibus-qt4) # ibus support
101- * (plasma-widget-kimpanel)
102-
103-= Desktop KDE Apps =
104-
105-We've chosen KDE as our desktop user interface of choice
106-
107-== kdebase-runtime ==
108-
109- * khelpcenter4
110- * phonon-backend-xine # gstreamer video doesn't work with compositing.
111-
112-== kdebase ==
113-
114- * kdepasswd
115- * (rekonq)
116- * konsole
117- * dolphin
118- * (plasma-widget-folderview)
119-
120-== kdebase-workspace ==
121-
122- * kdebase-workspace-bin # Plasma, ksplash and more
123- * kde-window-manager
124- * kdm
125- * klipper
126- * ksysguard
127- * systemsettings
128-
129-== kdeadmin ==
130-
131- * (ksystemlog) [!powerpc] #powerpc oversized
132- * (system-config-printer-kde)
133-
134-== kdegraphics ==
135-
136- * (kamera) [!powerpc] # powerpc oversized
137- * (gwenview)
138- * (kdegraphics-strigi-plugins)
139- * ksnapshot
140- * okular
141- * (okular-extra-backends) [!powerpc] # powerpc oversized
142-
143-== kdemultimedia ==
144-
145- * (dragonplayer)
146- * kdemultimedia-kio-plugins
147- * kmix
148-
149-== kdenetwork ==
150-
151- * kde-zeroconf
152- * (kopete)
153- * (kppp) [!powerpc] # PowerPC oversized
154- * (krdc) [i386]
155- * (krfb) [i386]
156-
157-== kdepim ==
158-
159- * (akregator)
160- * (kaddressbook)
161- * (kdepim-kresources)
162- * (kdepim-strigi-plugins)
163- * (kdepim-wizards)
164- * (kdepim-runtime)
165-# * (kleopatra) # Also does general gpg key management stuff [needs dirmngr MIR]
166- * (kmail)
167- * (knotes)
168- * (kontact)
169- * (korganizer)
170- * (ktimetracker) [i386]
171-
172-== kdesdk ==
173-
174- * (kate)
175-
176-== kdeutils ==
177-
178- * ark
179- * (printer-applet)
180- * (kwalletmanager)
181- * (kcalc)
182-
183-== koffice ==
184-
185-# * (krita)
186-# * (kexi) # instead of openoffice-base
187-
188-== everything else KDE ==
189-
190- * (quassel) # replacement for konversation for IRC
191- * (amarok) # audio multimediaplayer
192- * (userconfig) # In place of kuser (which is on the dvd)
193- * (kpackagekit)
194- * (kubuntu-konqueror-shortcuts) [!powerpc] # PowerPC oversized
195- * (gtk2-engines-qtcurve)
196- * (ktorrent)
197- * (cdrdao)
198-# * (digikam) needs kdebase-kio-plugins
199- * (pinentry-qt4) # for SMIME e-mail support
200- * (gnupg-agent) # for SMIME e-mail support
201- * (kdesudo) # simpler and more reliable than kdesu
202- * (rdesktop) [i386] # for krdc
203- * xdg-user-dirs
204- * hal
205- * language-selector-qt
206- * software-properties-kde
207- * (apport-kde)
208- * (xdg-utils) # useful utilities
209- * (jockey-kde) # installer for drivers
210- * (kubuntu-default-settings)
211- * (plymouth-theme-kubuntu-logo)
212- * (plasma-widgets-addons)
213- * (plasma-widget-quickaccess)
214- * (kubuntu-notification-helper)
215- * (gdebi-kde) # Necessary until KPK-aptcc or QApt can do .deb installs
216- * (oxygen-cursor-theme)
217- * (oxygen-icon-theme)
218- * (oxygen-icon-theme-complete) [i386]
219- * (libqca2-plugin-ossl) [!powerpc] # PowerPC oversized
220- * (kde-config-gtk) #GTK setup
221- * (plasma-widget-message-indicator)
222- * (plasma-widget-facebook) # more social from the start
223-# * (plasma-widget-googlecalendar) # more social from the start (easily reproducible runtime crash)
224- * (plasma-widget-kubuntu-feedback) # more social from the start
225- * (kubuntu-firefox-installer)
226- * (apturl-kde)
227-# * (kipi-plugins)
228- * (kde-config-touchpad)
229- * (pulseaudio)
230- * (plasma-widget-menubar)
231-
232-Accessibility tools:
233-
234- * (kmag)
235-# * (kde-icons-mono) [i386]
236-# * (kbstate) # perhaps replace with plasma-widget-kbstate for 10.10?
237- * (kmousetool)
238- * (kvkbd)
239- * (xcursor-themes)
240- * (brltty)
241-
242-= Other Desktop GUI Apps =
243-
244- * (openoffice.org-style-oxygen) [i386 amd64 powerpc armel] # to avoid openoffice.org-style-human
245- * (openoffice.org-kde) [i386 amd64 armel] #powerpc oversized
246- * (openoffice.org-writer) [i386 amd64 armel] #powerpc oversized
247- * (openoffice.org-calc) [i386 amd64 armel] #powerpc oversized
248- * (openoffice.org-impress) [i386 amd64 armel] # powerpc oversized
249- * (hpijs-ppds)
250- * (ijsgutenprint)
251- * (foomatic-db-gutenprint)
252-
253-Documentation:
254-
255- * (kubuntu-docs)
256-
257-= Other =
258-
259- * (usb-creator-kde) [i386 amd64 lpia]

Subscribers

People subscribed via source and target branches

to all changes: