Ubuntu Seeds

Merge lp:~unit193/ubuntu-seeds/xubuntu.utopic into lp:~xubuntu-dev/ubuntu-seeds/xubuntu.utopic

  1. xubuntu.utopic
  2. Merge into xubuntu.utopic
Proposed by Unit 193
Status: Merged
Merged at revision: 964
Proposed branch: lp:~unit193/ubuntu-seeds/xubuntu.utopic
Merge into: lp:~xubuntu-dev/ubuntu-seeds/xubuntu.utopic
Diff against target: 336 lines (+59/-38)
5 files modified
core (+17/-12)
desktop (+25/-20)
live (+5/-0)
ship (+9/-6)
ship-live (+3/-0)
To merge this branch: bzr merge lp:~unit193/ubuntu-seeds/xubuntu.utopic
Reviewer Review Type Date Requested Status
Sean Davis Approve
Simon Steinbeiß Approve
Review via email: mp+225246@code.launchpad.net

Description of the change

asciidoc compatible files.

To post a comment you must log in.
Revision history for this message
Simon Steinbeiß (ochosi) wrote :

I suppose there is no drawback here, so I don't see any reason why not to make the seed file asciidoc-compatible.

review: Approve
Revision history for this message
Sean Davis (bluesabre) wrote :

I can see a benefit from this.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'core'
2--- core 2014-05-27 23:28:08 +0000
3+++ core 2014-07-02 01:55:15 +0000
4@@ -1,3 +1,7 @@
5+Xubuntu core seed
6+=================
7+
8+----------------------
9 Task-Per-Derivative: 1
10 Task-Section: user
11 Task-Description: Xubuntu minimal installation
12@@ -5,24 +9,25 @@
13 Task-Key: xubuntu-core
14 Task-Name: xubuntu-core
15 Task-Seeds: desktop-common
16+----------------------
17
18 ## If you are using tasksel, you should get packages in parenthesis. If following instructions with apt-get, you will not.
19
20-= Network Services =
21+== Network Services ==
22
23 Basic network services and Windows integration.
24
25 * (avahi-autoipd) # IPv4 link-local interface configuration support
26 * network-manager-gnome # see NetworkRoaming spec
27
28-= GUI infrastructure =
29+== GUI infrastructure ==
30
31 * xterm # Provide a backup terminal and complete X env.
32 * libnotify-bin # various scripts need notify-send (such as .bashrc's "alert")
33
34-= Desktop Xfce Apps =
35+== Desktop Xfce Apps ==
36
37-Common with Ubuntu:
38+=== Common with Ubuntu ===
39 * lightdm # Proposed GDM replacement for Oneiric, see https://blueprints.launchpad.net/ubuntu/+spec/desktop-o-lightdm
40 * (libpam-gnome-keyring)
41 * (gucharmap) # SebastienBacher
42@@ -32,7 +37,7 @@
43 * xdg-user-dirs-gtk
44 * pm-utils # needed for sane power management
45
46-Xfce core:
47+=== Xfce core ===
48 * xfwm4
49 * xfdesktop4
50 * xfce4-panel
51@@ -42,7 +47,7 @@
52 * xfce4-appfinder
53 * thunar-volman
54
55-Xfce goodies:
56+=== Xfce goodies ===
57 * (xfce4-screenshooter)
58 * (xfce4-whiskermenu-plugin)
59 * (xfce4-volumed)
60@@ -50,7 +55,7 @@
61 * (xfce4-power-manager)
62 * xfce4-notifyd
63
64-Indicator/Ayatana stuff:
65+=== Indicator/Ayatana stuff ===
66 * (xfce4-indicator-plugin)
67 * (indicator-application)
68 * (indicator-sound)
69@@ -58,7 +63,7 @@
70 Other Desktop GUI Apps:
71 * (pavucontrol)
72
73-Themes:
74+=== Themes ===
75 * gtk2-engines-pixbuf # Required by some themes the user might install
76 * dmz-cursor-theme
77 * plymouth-theme-xubuntu-logo
78@@ -66,15 +71,15 @@
79 * xubuntu-wallpapers
80 * xubuntu-icon-theme
81
82-The gstreamer0.10 packages we want to install:
83+=== The gstreamer0.10 packages we want to install ===
84 * libasound2-plugins
85
86-= Documentation =
87+== Documentation ==
88
89 * doc-base # integrates with scrollkeeper
90 * xubuntu-docs
91
92-= Development =
93+== Development ==
94
95 Here we provide a minimal development environment sufficient to build kernel
96 drivers, so that this is possible on the live CD and in scenarios where
97@@ -84,7 +89,7 @@
98 * gcc
99 * make
100
101-= Other =
102+== Other ==
103
104 * xubuntu-core # metapackage for everything here
105 * xubuntu-default-settings
106
107=== modified file 'desktop'
108--- desktop 2014-07-01 11:07:04 +0000
109+++ desktop 2014-07-02 01:55:15 +0000
110@@ -1,3 +1,7 @@
111+Xubuntu desktop seed
112+====================
113+
114+----------------------
115 Task-Per-Derivative: 1
116 Task-Section: user
117 Task-Description: Xubuntu desktop
118@@ -5,8 +9,9 @@
119 Task-Key: xubuntu-desktop
120 Task-Name: xubuntu-desktop
121 Task-Seeds: desktop-common
122+----------------------
123
124-= Network Services =
125+== Network Services ==
126
127 Basic network services and Windows integration.
128
129@@ -15,25 +20,25 @@
130 * (network-manager-pptp)
131 * (network-manager-pptp-gnome)
132
133-= GUI infrastructure =
134+== GUI infrastructure ==
135
136 * xterm # Provide a backup terminal and complete X env.
137 * (libnotify-bin) # various scripts need notify-send (such as .bashrc's "alert")
138
139-Extra fonts (should be common, but not so for space reasons):
140+== Extra fonts (should be common, but not so for space reasons) ==
141
142 * (fonts-droid)
143 * (fonts-nanum)
144 * (fonts-opensymbol)
145 * (fonts-liberation)
146
147-Input methods:
148+== Input methods ==
149
150 * (im-config)
151
152-= Desktop Xfce Apps =
153+== Desktop Xfce Apps ==
154
155-Common with Ubuntu:
156+=== Common with Ubuntu ===
157 * (apport-gtk)
158 * (whoopsie) # http://wiki.ubuntu.com/ErrorTracker
159 * (desktop-file-utils)
160@@ -61,7 +66,7 @@
161 * (gvfs-backends) # otherwise no network tab
162 * pm-utils # needed for sane power management
163
164-Xfce core:
165+=== Xfce core ===
166 * xfwm4
167 * xfdesktop4
168 * xfce4-panel
169@@ -73,7 +78,7 @@
170 * thunar-volman
171 * (libxfce4ui-utils) # for xfce4-about
172
173-Xfce goodies:
174+=== Xfce goodies ===
175 * (xfce4-xkb-plugin)
176 * (xfce4-mailwatch-plugin)
177 * (xfce4-verve-plugin)
178@@ -100,30 +105,30 @@
179 * (parole)
180 * xfce4-notifyd
181
182-Indicator/Ayatana stuff:
183+=== Indicator/Ayatana stuff ===
184 * (xfce4-indicator-plugin)
185 * (indicator-application)
186 * (indicator-sound)
187 * (indicator-messages)
188 * (indicator-power)
189
190-Games: We only ship a few by default.
191-# * (aisleriot) [!powerpc]
192-# * (gnome-mahjongg) [!powerpc]
193+=== Games: We only ship a few by default ===
194+// * (aisleriot) [!powerpc]
195+// * (gnome-mahjongg) [!powerpc]
196 * (gnomine) [!powerpc]
197 * (gnome-sudoku) [!powerpc]
198
199-Themes:
200+=== Themes ===
201 * gtk2-engines-pixbuf # Required by some themes the user might install
202 * dmz-cursor-theme
203
204-The gstreamer0.10 packages we want to install:
205+== The gstreamer0.10 packages we want to install ==
206
207 * (gstreamer0.10-pulseaudio)
208 * (gstreamer0.10-plugins-base-apps)
209 * libasound2-plugins
210
211-Accessibility tools:
212+== Accessibility tools ==
213
214 * (gnome-accessibility-themes)
215 * (onboard)
216@@ -133,7 +138,7 @@
217 * (espeak)
218 * (speech-dispatcher)
219
220-= Other Desktop GUI Apps =
221+== Other Desktop GUI Apps ==
222
223 * (simple-scan)
224 * (gimp)
225@@ -147,7 +152,7 @@
226 * (gmusicbrowser)
227 * (thunderbird)
228 * (pidgin)
229-# * (pidgin-microblog) Mostly broken LP: #1190406
230+// * (pidgin-microblog) Mostly broken LP: #1190406
231 * (pidgin-otr)
232 * (xchat)
233 * (mousepad)
234@@ -158,12 +163,12 @@
235 * (pavucontrol) # mixer
236 * (gtk-theme-config)
237
238-= Documentation =
239+== Documentation ==
240
241 * doc-base # integrates with scrollkeeper
242 * (xubuntu-docs)
243
244-= Development =
245+== Development ==
246
247 Here we provide a minimal development environment sufficient to build kernel
248 drivers, so that this is possible on the live CD and in scenarios where
249@@ -173,7 +178,7 @@
250 * (gcc)
251 * (make)
252
253-= Other =
254+== Other ==
255
256 * xubuntu-desktop # metapackage for everything here
257 * xubuntu-default-settings
258
259=== modified file 'live'
260--- live 2014-06-24 03:11:33 +0000
261+++ live 2014-07-02 01:55:15 +0000
262@@ -1,3 +1,7 @@
263+Xubuntu live seed
264+=================
265+
266+----------------------
267 Task-Per-Derivative: 1
268 Task-Section: user
269 Task-Description: Xubuntu live CD
270@@ -6,6 +10,7 @@
271 Task-Key: ubiquity-frontend-gtk
272 Task-Test-new-install: skip show
273 Task-Seeds: live-common
274+----------------------
275
276 * Languages: en
277 * language-pack-${Languages}
278
279=== modified file 'ship'
280--- ship 2012-11-08 17:23:59 +0000
281+++ ship 2014-07-02 01:55:15 +0000
282@@ -1,3 +1,6 @@
283+Xubuntu ship
284+============
285+
286 == Kernel ==
287
288 * linux [amd64] # not i386 because top-level 'linux' is -generic-pae now
289@@ -19,7 +22,7 @@
290 == Common UNIX stuff ==
291
292 * nfs-common # allows people to access NFS filesystems
293- # * vim # vim-tiny is in minimal; vim includes syntax highlighting, help files, etc.
294+// * vim # vim-tiny is in minimal; vim includes syntax highlighting, help files, etc.
295
296 == Hardware & Network Access ==
297
298@@ -33,12 +36,12 @@
299
300 == Common language packs ==
301
302- # must have
303+// must have
304 * Languages: en es xh pt
305 * language-pack-${Languages}
306 * language-pack-gnome-${Languages}
307
308-# subset of English language support which we want by default:
309+// subset of English language support which we want by default:
310 * firefox-locale-en
311 * hunspell-en-us
312 * wamerican
313@@ -48,9 +51,9 @@
314 * language-pack-${Languages} [!powerpc]
315 * language-pack-gnome-${Languages} [!powerpc]
316
317-# * Languages: ar ru ja
318-# * language-pack-${Languages} [i386]
319-# * language-pack-gnome-${Languages} [i386]
320+// * Languages: ar ru ja
321+// * language-pack-${Languages} [i386]
322+// * language-pack-gnome-${Languages} [i386]
323
324 == Installer ==
325
326
327=== modified file 'ship-live'
328--- ship-live 2014-03-05 00:11:46 +0000
329+++ ship-live 2014-07-02 01:55:15 +0000
330@@ -1,3 +1,6 @@
331+Xubuntu ship live
332+=================
333+
334 The ship-live seed will be added to the live CD as an ordinary package
335 archive. Here belongs anything that somebody might need to install after
336 installing the contents of the live CD in order to get online and fetch more

Subscribers

People subscribed via source and target branches

to all changes: