Преглед изворни кода

Prepare for release to unstable

Per Andersson пре 10 година
родитељ
комит
7998a5f98c
3 измењених фајлова са 175 додато и 149 уклоњено
  1. 125 111
      debian-junior-tasks.desc
  2. 1 1
      debian/changelog
  3. 49 37
      debian/control

+ 125 - 111
debian-junior-tasks.desc

@@ -15,21 +15,20 @@ Key:
  junior-art
  junior-art
 Packages: list
 Packages: list
  cheese
  cheese
- gimp
- tuxpaint
- xpaint
- inkscape
- mypaint
- mtpaint
  gamine
  gamine
  gcompris
  gcompris
+ gimp
  gpaint
  gpaint
- karbon
- krita
+ inkscape
+ mypaint
+ pencil2d
  pinta
  pinta
  pysiogame
  pysiogame
  rgbpaint
  rgbpaint
  simple-scan
  simple-scan
+ tupi
+ tuxpaint
+ xpaint
 
 
 Task: junior-doudou-base
 Task: junior-doudou-base
 Section: debian-junior
 Section: debian-junior
@@ -46,43 +45,44 @@ Description: DoudouLinux base
  not yet create a real metapackage.
  not yet create a real metapackage.
 Relevance: 10
 Relevance: 10
 Packages: list
 Packages: list
- dash
- bash-completion
- less
- tree
- ntpdate
  acpi-support-base
  acpi-support-base
- avahi-discover
+ alsa-base
+ alsa-utils
  avahi-autoipd
  avahi-autoipd
- policykit-1
- policykit-1-gnome
- xdg-user-dirs-gtk
- yelp
- khelpcenter4
+ avahi-discover
+ bash-completion
+ cups-bsd
+ cups-pdf
+ dash
+ dnsmasq-base
  eject
  eject
- xserver-xorg-core
- xkb-data
- x11-xkb-utils
- xfonts-base
- x11-utils
- oxygencursors
+ gnome-keyring
  gtk2-engines
  gtk2-engines
+ khelpcenter4
+ less
+ libgl1-mesa-dri
+ libgl1-mesa-glx
+ libpam-gnome-keyring
  lxappearance
  lxappearance
- lxterminal
  lxrandr
  lxrandr
+ lxterminal
  network-manager-gnome
  network-manager-gnome
- gnome-keyring
- libpam-gnome-keyring
- dnsmasq-base
- alsa-base
- alsa-utils
- gstreamer0.10-alsa
+ ntpdate
  oss-compat
  oss-compat
+ oxygencursors
+ policykit-1
+ policykit-1-gnome
+ smbclient
  system-config-printer
  system-config-printer
  system-config-printer-udev
  system-config-printer-udev
- cups-bsd
- smbclient
- cups-pdf
+ tree
+ x11-utils
+ x11-xkb-utils
+ xdg-user-dirs-gtk
+ xfonts-base
+ xkb-data
+ xserver-xorg-core
+ yelp
 
 
 Task: junior-doudou-dev-artists
 Task: junior-doudou-dev-artists
 Section: debian-junior
 Section: debian-junior
@@ -118,35 +118,35 @@ Description: DoudouLinux Games
  not yet create a real metapackage.
  not yet create a real metapackage.
 Relevance: 10
 Relevance: 10
 Packages: list
 Packages: list
- kolf
- pingus
- frozen-bubble
- hannah
- circuslinux
+ abe
+ biniax2
  burgerspace
  burgerspace
- monsterz
+ ceferino
+ circuslinux
+ foobillard
+ freealchemist
+ frozen-bubble
+ gmchess
  gnome-games
  gnome-games
  gnome-mastermind
  gnome-mastermind
- gweled
- tanglet
- gmchess
- gtans
- kigo
  gnugo
  gnugo
- freealchemist
+ gtans
+ gweled
+ hannah
  hex-a-hop
  hex-a-hop
- numptyphysics
- toppler
- abe
- supertux
- nikwi
- ceferino
+ kigo
+ kolf
  lbreakout2
  lbreakout2
  magicor
  magicor
- biniax2
- tworld
- foobillard
+ monsterz
+ nikwi
+ numptyphysics
+ pingus
+ supertux
  supertuxkart
  supertuxkart
+ tanglet
+ toppler
+ tworld
 
 
 Task: junior-education
 Task: junior-education
 Section: debian-junior
 Section: debian-junior
@@ -160,14 +160,14 @@ Key:
  junior-education
  junior-education
 Packages: list
 Packages: list
  atomix
  atomix
- childsplay
- gcompris
- ktuberling
  bambam
  bambam
+ fracplanet
  gbrainy
  gbrainy
+ gcompris
+ ktuberling
  numptyphysics
  numptyphysics
- pysycache
  pysiogame
  pysiogame
+ pysycache
  stellarium
  stellarium
  xball
  xball
  xmakemol
  xmakemol
@@ -182,7 +182,6 @@ Relevance: 10
 Key: 
 Key: 
  junior-games-adventure
  junior-games-adventure
 Packages: list
 Packages: list
- balazar3
  beneath-a-steel-sky
  beneath-a-steel-sky
  drascula
  drascula
  flight-of-the-amazon-queen
  flight-of-the-amazon-queen
@@ -205,28 +204,28 @@ Key:
 Packages: list
 Packages: list
  2048-qt
  2048-qt
  bambam
  bambam
- bouncy
  biniax2
  biniax2
- childsplay
+ bouncy
  bugsquish
  bugsquish
  bumprace
  bumprace
  circuslinux
  circuslinux
  cuyo
  cuyo
- holotz-castle
- koules
  fretsonfire
  fretsonfire
+ funnyboat
+ gcompris
  hannah
  hannah
  heroes-sdl
  heroes-sdl
+ holotz-castle
+ jumpnbump
+ koules
  lbreakout2
  lbreakout2
  madbomber
  madbomber
+ monsterz
  supertux
  supertux
  tuxmath
  tuxmath
- xsoldier
- funnyboat
- vodovod
- jumpnbump
- monsterz
  tuxpuck
  tuxpuck
+ vodovod
+ xsoldier
 
 
 Task: junior-games-card
 Task: junior-games-card
 Section: debian-junior
 Section: debian-junior
@@ -240,12 +239,11 @@ Key:
  junior-games-card
  junior-games-card
 Packages: list
 Packages: list
  ace-of-penguins
  ace-of-penguins
- childsplay
+ kpat
  pairs
  pairs
  pysiogame
  pysiogame
- xsol
  sgt-puzzles
  sgt-puzzles
- kpat
+ xsol
 
 
 Task: junior-games-gl
 Task: junior-games-gl
 Section: debian-junior
 Section: debian-junior
@@ -263,13 +261,14 @@ Key:
  junior-games-gl
  junior-games-gl
 Packages: list
 Packages: list
  armagetronad
  armagetronad
+ bouncy
  bzflag
  bzflag
+ extremetuxracer
  gltron
  gltron
- bouncy
  neverball
  neverball
  supertuxkart
  supertuxkart
- extremetuxracer
  torcs
  torcs
+ trackballs
  tuxfootball
  tuxfootball
 
 
 Task: junior-games-net
 Task: junior-games-net
@@ -287,11 +286,11 @@ Packages: list
  gtetrinet
  gtetrinet
  minetest
  minetest
  openttd
  openttd
- xpilot-ng
  xblast-tnt
  xblast-tnt
  xblast-tnt-levels
  xblast-tnt-levels
- xblast-tnt-sounds
  xblast-tnt-musics
  xblast-tnt-musics
+ xblast-tnt-sounds
+ xpilot-ng
 
 
 Task: junior-games-puzzle
 Task: junior-games-puzzle
 Section: debian-junior
 Section: debian-junior
@@ -306,19 +305,19 @@ Key:
 Packages: list
 Packages: list
  2048-qt
  2048-qt
  amoebax
  amoebax
- biniax2
  berusky2
  berusky2
+ biniax2
  brainparty
  brainparty
  frozen-bubble
  frozen-bubble
- gtans
- lmemory
- xjig
  gbrainy
  gbrainy
  gcompris
  gcompris
+ gtans
  hex-a-hop
  hex-a-hop
+ lmemory
  monsterz
  monsterz
  pysiogame
  pysiogame
  ri-li
  ri-li
+ xjig
 
 
 Task: junior-games-sim
 Task: junior-games-sim
 Section: debian-junior
 Section: debian-junior
@@ -330,9 +329,11 @@ Relevance: 10
 Key: 
 Key: 
  junior-games-sim
  junior-games-sim
 Packages: list
 Packages: list
+ 0ad
  freeciv-client-gtk
  freeciv-client-gtk
- lincity-ng
  freecol
  freecol
+ lincity-ng
+ megaglest
  micropolis
  micropolis
  opencity
  opencity
  openttd
  openttd
@@ -351,13 +352,13 @@ Relevance: 10
 Key: 
 Key: 
  junior-games-text
  junior-games-text
 Packages: list
 Packages: list
+ animals
  bsdgames
  bsdgames
+ cowsay
  moon-buggy
  moon-buggy
  nettoe
  nettoe
- zivot
- animals
- cowsay
  sl
  sl
+ zivot
 
 
 Task: junior-internet
 Task: junior-internet
 Section: debian-junior
 Section: debian-junior
@@ -392,15 +393,14 @@ Packages: list
  2048-qt
  2048-qt
  bc
  bc
  bsdgames
  bsdgames
- xaos
- x11-apps
- kig
- childsplay
  gbrainy
  gbrainy
  gcompris
  gcompris
+ kig
  numptyphysics
  numptyphysics
  pysiogame
  pysiogame
  tuxmath
  tuxmath
+ x11-apps
+ xaos
 
 
 Task: junior-programming
 Task: junior-programming
 Section: debian-junior
 Section: debian-junior
@@ -410,7 +410,7 @@ Description: Debian Jr. programming
  languages with children are good documentation, and some ability to
  languages with children are good documentation, and some ability to
  produce visual programs without too much effort.  It is by no means
  produce visual programs without too much effort.  It is by no means
  a complete list, and you are encouraged to explore other languages
  a complete list, and you are encouraged to explore other languages
- with children as well, even those 
+ with children as well; even those that are not specifically aimed for
  children.
  children.
  .
  .
  The Logo language is specifically designed for children, with a strong
  The Logo language is specifically designed for children, with a strong
@@ -431,9 +431,11 @@ Packages: list
  arduino
  arduino
  gvrng
  gvrng
  kturtle
  kturtle
- littlewizard
  laby
  laby
+ littlewizard
+ puredata
  scratch
  scratch
+ sonic-pi
  squeak-plugins-scratch
  squeak-plugins-scratch
  squeak-vm
  squeak-vm
 
 
@@ -452,10 +454,15 @@ Packages: list
  audacious
  audacious
  bplay
  bplay
  cdtool
  cdtool
- pianobooster
- vorbis-tools
  gcompris
  gcompris
+ gespeaker
  hydrogen
  hydrogen
+ milkytracker
+ pianobooster
+ puredata
+ sonic-pi
+ tuxguitar
+ vorbis-tools
 
 
 Task: junior-system
 Task: junior-system
 Section: debian-junior
 Section: debian-junior
@@ -474,17 +481,24 @@ Description: Debian Jr. System tools
  an example of how to invoke programs from the shell, specify switches,
  an example of how to invoke programs from the shell, specify switches,
  use the man page, and so on.
  use the man page, and so on.
  .
  .
- Finally, lavaps not only provides a very pleasing way to visualize
- running processes and the resources they use, but can also make
- discovering and killing errant processes an easy thing to do for
- children who lack the ability yet to easily manage "ps" and "kill"
- from the command line.
+ Baobab, the GNOME disk usage analyzer, enables the user to take a
+ visual trip into the hard drive contents. It can be a mesmerizing first
+ step, dvelving into the inner parts of the computer system. It serves
+ both as an educational tool about file systems and file contents/size
+ as well as a tool for analyzing what files are big if disk space is
+ scarce.
+ .
+ Bubblefishymon is a computer load monitor dockapp which shows network
+ traffic as fishes, CPU usage as bubbles, and a duck representing a
+ duck.
 Relevance: 10
 Relevance: 10
 Key: 
 Key: 
  junior-system
  junior-system
 Packages: list
 Packages: list
- mc
+ baobab
+ bubblefishymon
  hello
  hello
+ mc
 
 
 Task: junior-toys
 Task: junior-toys
 Section: debian-junior
 Section: debian-junior
@@ -496,18 +510,20 @@ Relevance: 10
 Key: 
 Key: 
  junior-toys
  junior-toys
 Packages: list
 Packages: list
+ bambam
+ bubblefishymon
  cheese
  cheese
  dasher
  dasher
+ gamine
+ gespeaker
+ gworldclock
  oneko
  oneko
  xfireworks
  xfireworks
  xfishtank
  xfishtank
  xpenguins
  xpenguins
- xteddy
  xplanet
  xplanet
  xplanet-images
  xplanet-images
- gamine
- gworldclock
- bambam
+ xteddy
 
 
 Task: junior-typing
 Task: junior-typing
 Section: debian-junior
 Section: debian-junior
@@ -521,13 +537,12 @@ Key:
  junior-typing
  junior-typing
 Packages: list
 Packages: list
  bambam
  bambam
- childsplay
- tuxtype
+ gcompris
  gtypist
  gtypist
- ktouch
  klavaro
  klavaro
- gcompris
+ ktouch
  pysiogame
  pysiogame
+ tuxtype
 
 
 Task: junior-video
 Task: junior-video
 Section: debian-junior
 Section: debian-junior
@@ -538,7 +553,6 @@ Key:
  junior-video
  junior-video
 Packages: list
 Packages: list
  cheese
  cheese
- kaffeine
  vlc
  vlc
 
 
 Task: junior-writing
 Task: junior-writing
@@ -551,12 +565,12 @@ Relevance: 10
 Key: 
 Key: 
  junior-writing
  junior-writing
 Packages: list
 Packages: list
- nano
- dict
- aspell
  abiword
  abiword
+ aspell
  dasher
  dasher
+ dict
  gcompris
  gcompris
+ nano
  pysiogame
  pysiogame
  writetype
  writetype
 
 

+ 1 - 1
debian/changelog

@@ -1,4 +1,4 @@
-debian-junior (1.25) UNRELEASED; urgency=medium
+debian-junior (1.25) unstable; urgency=medium
 
 
   * tasks/programming: Fix description. (Closes: 788483)
   * tasks/programming: Fix description. (Closes: 788483)
   * Bump Standards-Version to 3.9.7, no changes needed
   * Bump Standards-Version to 3.9.7, no changes needed

+ 49 - 37
debian/control

@@ -7,9 +7,9 @@ Uploaders: Ben Armstrong <synrg@sanctuary.nslug.ns.ca>,
            Andreas Tille <tille@debian.org>,
            Andreas Tille <tille@debian.org>,
            Per Andersson <avtobiff@debian.org>
            Per Andersson <avtobiff@debian.org>
 Build-Depends-Indep: debhelper, blends-dev (>= 0.6.92)
 Build-Depends-Indep: debhelper, blends-dev (>= 0.6.92)
-Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/debianjr/debian-junior.git
-Vcs-Browser: http://anonscm.debian.org/cgit/debianjr/debian-junior.git/
+Standards-Version: 3.9.7
+Vcs-Git: https://anonscm.debian.org/git/debianjr/debian-junior.git
+Vcs-Browser: https://anonscm.debian.org/cgit/debianjr/debian-junior.git/
 Homepage: http://blends.debian.org/junior/tasks/
 Homepage: http://blends.debian.org/junior/tasks/
 
 
 Package: junior-tasks
 Package: junior-tasks
@@ -41,17 +41,18 @@ Recommends: cheese,
  gimp,
  gimp,
  gpaint,
  gpaint,
  inkscape,
  inkscape,
- karbon,
- krita,
- mtpaint,
  mypaint,
  mypaint,
+ pencil2d,
  pinta,
  pinta,
  pysiogame,
  pysiogame,
  rgbpaint,
  rgbpaint,
  simple-scan,
  simple-scan,
+ tupi,
  tuxpaint,
  tuxpaint,
  xpaint
  xpaint
-Suggests: pencil2d,
+Suggests: karbon,
+ krita,
+ mtpaint,
  tbo
  tbo
 Description: Debian Jr. Art
 Description: Debian Jr. Art
  Tools for children to produce artwork.  The simplest of these is
  Tools for children to produce artwork.  The simplest of these is
@@ -70,7 +71,7 @@ Architecture: all
 Depends: junior-tasks (= ${binary:Version}), junior-config (= ${binary:Version})
 Depends: junior-tasks (= ${binary:Version}), junior-config (= ${binary:Version})
 Recommends: atomix,
 Recommends: atomix,
  bambam,
  bambam,
- childsplay,
+ fracplanet,
  gbrainy,
  gbrainy,
  gcompris,
  gcompris,
  ktuberling,
  ktuberling,
@@ -80,7 +81,8 @@ Recommends: atomix,
  stellarium,
  stellarium,
  xball,
  xball,
  xmakemol | xmakemol-gl
  xmakemol | xmakemol-gl
-Suggests: kstars,
+Suggests: childsplay,
+ kstars,
  mathwar
  mathwar
 Description: Debian Jr. education applications
 Description: Debian Jr. education applications
  This package includes a collection of educational programs
  This package includes a collection of educational programs
@@ -92,8 +94,7 @@ Package: junior-games-adventure
 Section: metapackages
 Section: metapackages
 Architecture: all
 Architecture: all
 Depends: junior-tasks (= ${binary:Version}), junior-config (= ${binary:Version})
 Depends: junior-tasks (= ${binary:Version}), junior-config (= ${binary:Version})
-Recommends: balazar3,
- beneath-a-steel-sky,
+Recommends: beneath-a-steel-sky,
  drascula,
  drascula,
  flight-of-the-amazon-queen,
  flight-of-the-amazon-queen,
  lure-of-the-temptress,
  lure-of-the-temptress,
@@ -113,11 +114,11 @@ Recommends: 2048-qt,
  bouncy,
  bouncy,
  bugsquish,
  bugsquish,
  bumprace,
  bumprace,
- childsplay,
  circuslinux,
  circuslinux,
  cuyo,
  cuyo,
  fretsonfire,
  fretsonfire,
  funnyboat,
  funnyboat,
+ gcompris,
  hannah,
  hannah,
  heroes-sdl,
  heroes-sdl,
  holotz-castle,
  holotz-castle,
@@ -132,7 +133,7 @@ Recommends: 2048-qt,
  vodovod,
  vodovod,
  xsoldier
  xsoldier
 Suggests: anagramarama,
 Suggests: anagramarama,
- heroes-ggi
+ childsplay
 Description: Debian Jr. arcade games
 Description: Debian Jr. arcade games
  This metapackage will install arcade games suitable, in the
  This metapackage will install arcade games suitable, in the
  opinion of the contributors to the Debian Jr. project, for children
  opinion of the contributors to the Debian Jr. project, for children
@@ -147,13 +148,13 @@ Section: metapackages
 Architecture: all
 Architecture: all
 Depends: junior-tasks (= ${binary:Version}), junior-config (= ${binary:Version})
 Depends: junior-tasks (= ${binary:Version}), junior-config (= ${binary:Version})
 Recommends: ace-of-penguins,
 Recommends: ace-of-penguins,
- childsplay,
  kpat,
  kpat,
  pairs,
  pairs,
  pysiogame,
  pysiogame,
  sgt-puzzles,
  sgt-puzzles,
  xsol
  xsol
-Suggests: spider
+Suggests: childsplay,
+ spider
 Description: Debian Jr. Card Games
 Description: Debian Jr. Card Games
  A collection of card games, for the time being just solitaire, which
  A collection of card games, for the time being just solitaire, which
  are probably more suited to older children than young, although
  are probably more suited to older children than young, although
@@ -172,9 +173,9 @@ Recommends: armagetronad,
  neverball,
  neverball,
  supertuxkart,
  supertuxkart,
  torcs,
  torcs,
+ trackballs,
  tuxfootball
  tuxfootball
-Suggests: platinumarts-sandbox,
- trackballs
+Suggests: platinumarts-sandbox
 Description: Debian Jr. 3D Games (hardware acceleration required)
 Description: Debian Jr. 3D Games (hardware acceleration required)
  These games all use OpenGL libraries.  They will not work without
  These games all use OpenGL libraries.  They will not work without
  decent 3D graphics cards providing hardware-accelerated OpenGL.
  decent 3D graphics cards providing hardware-accelerated OpenGL.
@@ -199,7 +200,6 @@ Recommends: bubbros,
  xblast-tnt-musics,
  xblast-tnt-musics,
  xblast-tnt-sounds,
  xblast-tnt-sounds,
  xpilot-ng
  xpilot-ng
-Suggests: pengupop
 Description: Debian Jr. Network Games
 Description: Debian Jr. Network Games
  Network games bring people together from all over the world. Many times the
  Network games bring people together from all over the world. Many times the
  game and chat is a place where people learn languages, how to communicate, and
  game and chat is a place where people learn languages, how to communicate, and
@@ -236,9 +236,11 @@ Package: junior-games-sim
 Section: metapackages
 Section: metapackages
 Architecture: all
 Architecture: all
 Depends: junior-tasks (= ${binary:Version}), junior-config (= ${binary:Version})
 Depends: junior-tasks (= ${binary:Version}), junior-config (= ${binary:Version})
-Recommends: freeciv-client-gtk | freeciv-client-sdl,
+Recommends: 0ad,
+ freeciv-client-gtk | freeciv-client-sdl,
  freecol,
  freecol,
  lincity-ng | lincity,
  lincity-ng | lincity,
+ megaglest,
  micropolis,
  micropolis,
  opencity,
  opencity,
  openttd,
  openttd,
@@ -286,7 +288,6 @@ Depends: junior-tasks (= ${binary:Version}), junior-config (= ${binary:Version})
 Recommends: 2048-qt,
 Recommends: 2048-qt,
  bc,
  bc,
  bsdgames,
  bsdgames,
- childsplay,
  gbrainy,
  gbrainy,
  gcompris,
  gcompris,
  kig,
  kig,
@@ -295,6 +296,7 @@ Recommends: 2048-qt,
  tuxmath,
  tuxmath,
  x11-apps,
  x11-apps,
  xaos
  xaos
+Suggests: childsplay
 Description: Debian Jr. educational math
 Description: Debian Jr. educational math
  This metapackage will install educational math programs suitable for
  This metapackage will install educational math programs suitable for
  children.  Some of the packages use mathematics that is well beyond
  children.  Some of the packages use mathematics that is well beyond
@@ -315,7 +317,9 @@ Recommends: arduino,
  kturtle,
  kturtle,
  laby,
  laby,
  littlewizard,
  littlewizard,
+ puredata,
  scratch,
  scratch,
+ sonic-pi,
  squeak-plugins-scratch,
  squeak-plugins-scratch,
  squeak-vm
  squeak-vm
 Suggests: shoes,
 Suggests: shoes,
@@ -326,7 +330,7 @@ Description: Debian Jr. programming
  languages with children are good documentation, and some ability to
  languages with children are good documentation, and some ability to
  produce visual programs without too much effort.  It is by no means
  produce visual programs without too much effort.  It is by no means
  a complete list, and you are encouraged to explore other languages
  a complete list, and you are encouraged to explore other languages
- with children as well, even those 
+ with children as well; even those that are not specifically aimed for
  children.
  children.
  .
  .
  The Logo language is specifically designed for children, with a strong
  The Logo language is specifically designed for children, with a strong
@@ -349,13 +353,15 @@ Recommends: audacious,
  bplay,
  bplay,
  cdtool,
  cdtool,
  gcompris,
  gcompris,
+ gespeaker,
  hydrogen,
  hydrogen,
+ milkytracker,
  pianobooster,
  pianobooster,
+ puredata,
+ sonic-pi,
+ tuxguitar,
  vorbis-tools
  vorbis-tools
-Suggests: bloopsaphone,
- espeak-gui,
- jokosher,
- rezound
+Suggests: bloopsaphone
 Description: Debian Jr. sound
 Description: Debian Jr. sound
  This metapackage will install a sampling of sound packages for
  This metapackage will install a sampling of sound packages for
  a system that is used by children.  While not all of these will
  a system that is used by children.  While not all of these will
@@ -367,9 +373,10 @@ Package: junior-system
 Section: metapackages
 Section: metapackages
 Architecture: all
 Architecture: all
 Depends: junior-tasks (= ${binary:Version}), junior-config (= ${binary:Version})
 Depends: junior-tasks (= ${binary:Version}), junior-config (= ${binary:Version})
-Recommends: hello,
+Recommends: baobab,
+ bubblefishymon,
+ hello,
  mc
  mc
-Suggests: lavaps
 Description: Debian Jr. System tools
 Description: Debian Jr. System tools
  This package includes a few tools for helping children learn about and
  This package includes a few tools for helping children learn about and
  use their system.
  use their system.
@@ -385,20 +392,27 @@ Description: Debian Jr. System tools
  an example of how to invoke programs from the shell, specify switches,
  an example of how to invoke programs from the shell, specify switches,
  use the man page, and so on.
  use the man page, and so on.
  .
  .
- Finally, lavaps not only provides a very pleasing way to visualize
- running processes and the resources they use, but can also make
- discovering and killing errant processes an easy thing to do for
- children who lack the ability yet to easily manage "ps" and "kill"
- from the command line.
+ Baobab, the GNOME disk usage analyzer, enables the user to take a
+ visual trip into the hard drive contents. It can be a mesmerizing first
+ step, dvelving into the inner parts of the computer system. It serves
+ both as an educational tool about file systems and file contents/size
+ as well as a tool for analyzing what files are big if disk space is
+ scarce.
+ .
+ Bubblefishymon is a computer load monitor dockapp which shows network
+ traffic as fishes, CPU usage as bubbles, and a duck representing a
+ duck.
 
 
 Package: junior-toys
 Package: junior-toys
 Section: games
 Section: games
 Architecture: all
 Architecture: all
 Depends: junior-tasks (= ${binary:Version}), junior-config (= ${binary:Version})
 Depends: junior-tasks (= ${binary:Version}), junior-config (= ${binary:Version})
 Recommends: bambam,
 Recommends: bambam,
+ bubblefishymon,
  cheese,
  cheese,
  dasher,
  dasher,
  gamine,
  gamine,
+ gespeaker,
  gworldclock,
  gworldclock,
  oneko,
  oneko,
  xfireworks,
  xfireworks,
@@ -407,8 +421,6 @@ Recommends: bambam,
  xplanet,
  xplanet,
  xplanet-images,
  xplanet-images,
  xteddy
  xteddy
-Suggests: espeak-gui,
- lletters
 Description: Debian Jr. desktop toys
 Description: Debian Jr. desktop toys
  This metapackage will install desktop toys suitable for children.  The
  This metapackage will install desktop toys suitable for children.  The
  collection contains some packages which might enjoy children and make
  collection contains some packages which might enjoy children and make
@@ -419,13 +431,13 @@ Section: metapackages
 Architecture: all
 Architecture: all
 Depends: junior-tasks (= ${binary:Version}), junior-config (= ${binary:Version})
 Depends: junior-tasks (= ${binary:Version}), junior-config (= ${binary:Version})
 Recommends: bambam,
 Recommends: bambam,
- childsplay,
  gcompris,
  gcompris,
  gtypist,
  gtypist,
  klavaro,
  klavaro,
  ktouch,
  ktouch,
  pysiogame,
  pysiogame,
  tuxtype
  tuxtype
+Suggests: childsplay
 Description: Debian Jr. typing
 Description: Debian Jr. typing
  This metapackage will install typing tutors and typing games for
  This metapackage will install typing tutors and typing games for
  various skill levels.  This collection of packages was assembled
  various skill levels.  This collection of packages was assembled
@@ -437,9 +449,9 @@ Section: metapackages
 Architecture: all
 Architecture: all
 Depends: junior-tasks (= ${binary:Version}), junior-config (= ${binary:Version})
 Depends: junior-tasks (= ${binary:Version}), junior-config (= ${binary:Version})
 Recommends: cheese,
 Recommends: cheese,
- kaffeine,
  vlc
  vlc
-Suggests: maim
+Suggests: kaffeine,
+ maim
 Description: Debian Jr. Video
 Description: Debian Jr. Video
  Tools to watch video files, DVD, CD, network streams etc.
  Tools to watch video files, DVD, CD, network streams etc.