Updated to current content of junior-* meta packages, not tested yet

AUTHORS

@@ -1 +1,2 @@
 Ben Armstrong <synrg@sanctuary.nslug.ns.ca>
+Andreas Tille <tille@debian.org>

VERSION

@@ -1 +0,0 @@
-1.9

common/control → config/control

@@ -1,6 +1,6 @@
-Package: junior-common
+Package: junior-config
 Architecture: all
-Depends: adduser, debconf (>= 1.2), menu, cdd-common (>= 0.3.9)
+Depends: adduser, ${misc:Depends}, menu, cdd-common (>= 0.5.0)
 Description: Debian Jr. Project common package
  This package builds the basic infra structure of all junior-* packages.
  .

debian/changelog

@@ -1,11 +1,15 @@
-debian-junior (1.9) unstable; urgency=medium
+debian-junior (1.12) unstable; urgency=medium
 
   * Changes done by Andreas Tille <tille@debian.org>
     - Took over cdd-dev method to build metapackages from one
       common source.
       The changelogs of the previous single meta package sources
       can be found in the source package under debian/oldchangelogs.
-    - junior-gnome: moved drgenius to Suggests because it has an RC bug
-      Hint: remove it completely.
+  * tasks/games-sim:
+    - Added lincity-ng, freecol as "Ignore" to set some marker
+      at least, I'd rather prefer "Suggest"
+  * Maintainer: Debian Junior <debian-jr@lists.debian.org>
+  * DM-Upload-Allowed: yes
+  * Added myself as Uploader
 
- -- Andreas Tille <tille@debian.org>  Mon, 22 Mar 2004 19:21:55 +0100
+ -- Andreas Tille <tille@debian.org>  Wed, 04 Jun 2008 11:51:44 +0200

debian/control

@@ -1 +0,0 @@
-control.stub

debian/control.stub

@@ -1,9 +1,12 @@
 Source: debian-junior
 Section: misc
 Priority: extra
-Maintainer: Andreas Tille <tille@debian.org>
-Build-Depends-Indep: debhelper (>= 4), cdd-dev (>= 0.3.9)
-Standards-Version: 3.6.1
+Maintainer: Debian Junior <debian-jr@lists.debian.org>
+DM-Upload-Allowed: yes
+Uploaders: Ben Armstrong <synrg@sanctuary.nslug.ns.ca>,
+ Andreas Tille <tille@debian.org>
+Build-Depends-Indep: debhelper, cdd-dev (>= 0.5.1)
+Standards-Version: 3.7.3
 
 Package: junior
 Architecture: all

debian/oldchangelogs/arcade

@@ -1,3 +1,24 @@
+junior-arcade (1.12) unstable; urgency=low
+
+  * Removed some games that are too hard for many children: toppler, thrust,
+    xscavenger.
+  * Generate md5sums.
+
+ -- Ben Armstrong <synrg@sanctuary.nslug.ns.ca>  Sat, 06 Oct 2007 17:38:48 -0300
+
+junior-arcade (1.11) unstable; urgency=low
+
+  * Removed zblast as it is uninstallable due to #429155.
+
+ -- Ben Armstrong <synrg@sanctuary.nslug.ns.ca>  Sat, 16 Jun 2007 10:34:36 -0300
+
+junior-arcade (1.10) unstable; urgency=low
+
+  * Added tuxmath, holotz-castle, supertux.
+  * Removed wing, as xsoldier is similar and superior.
+
+ -- Ben Armstrong <synrg@sanctuary.nslug.ns.ca>  Sat, 11 Feb 2006 17:18:09 -0400
+
 junior-arcade (1.9) unstable; urgency=low
 
   * Removed zblast-svgalib as alternate dependency.  We can 

debian/oldchangelogs/games-gl

@@ -1,3 +1,29 @@
+junior-games-gl (1.10) unstable; urgency=low
+
+  * Re-added bzflag.
+  * Replaced tuxkart with supertuxkart.
+  * Generate md5sums.
+
+ -- Ben Armstrong <synrg@sanctuary.nslug.ns.ca>  Sat, 20 Oct 2007 07:48:27 -0300
+
+junior-games-gl (1.9) unstable; urgency=low
+
+  * Removed bzflag, as bzflag has been removed from testing.
+
+ -- Ben Armstrong <synrg@fountain.nslug.ns.ca>  Sat, 13 May 2006 15:39:20 -0300
+
+junior-games-gl (1.8) unstable; urgency=low
+
+  * Added slune, trackballs, neverball.
+
+ -- Ben Armstrong <synrg@sanctuary.nslug.ns.ca>  Sun, 19 Feb 2006 14:35:17 -0400
+
+junior-games-gl (1.7) unstable; urgency=low
+
+  * Depend on ppracer instead of tuxracer. (Closes: #340078)
+
+ -- Ben Armstrong <synrg@sanctuary.nslug.ns.ca>  Fri,  9 Dec 2005 10:57:43 -0400
+
 junior-games-gl (1.6) unstable; urgency=low
 
   * Removed tux-aqfh.  (Closes: #230694)

debian/oldchangelogs/games-net

@@ -1,3 +1,16 @@
+junior-games-net (1.4) unstable; urgency=low
+
+  * Replace xblast with xblast-tnt.
+
+ -- Ben Armstrong <synrg@sanctuary.nslug.ns.ca>  Thu, 12 Jul 2007 06:06:01 -0300
+
+junior-games-net (1.3) unstable; urgency=low
+
+  * Depend on xpilot-ng instead of xpilot, which is now a transitional package.
+    (Closes: #403868)
+
+ -- Ben Armstrong <synrg@sanctuary.nslug.ns.ca>  Sun,  4 Feb 2007 16:37:30 -0400
+
 junior-games-net (1.2) unstable; urgency=low
 
   * Lowered priority to extra.

debian/oldchangelogs/gnome

@@ -1,3 +1,18 @@
+junior-gnome (1.5) unstable; urgency=low
+
+  * Removed gbatnav, which is removed from testing.
+
+ -- Ben Armstrong <synrg@sanctuary.nslug.ns.ca>  Sun, 20 Jan 2008 12:04:03 -0400
+
+junior-gnome (1.4) unstable; urgency=low
+
+  * Removed drgenius, which is removed from testing.  In a later release it
+    will be replaced with drgeo when there are no longer RC bugs against it.
+    (Closes: #273414).
+  * Re-added gcompris.
+
+ -- Ben Armstrong <synrg@sanctuary.nslug.ns.ca>  Sat,  2 Oct 2004 15:57:26 -0300
+
 junior-gnome (1.3) unstable; urgency=low
 
   * Priority dropped to extra.

debian/oldchangelogs/internet

@@ -1,3 +1,26 @@
+junior-internet (1.9) unstable; urgency=low
+
+  * Fix description to refer to iceweasel instead of firefox.
+
+ -- Ben Armstrong <synrg@sanctuary.nslug.ns.ca>  Sun,  4 Feb 2007 16:44:53 -0400
+
+junior-internet (1.8) unstable; urgency=low
+
+  * Depend on iceweasel instead of firefox, which is now only a transitional
+    package for iceweasel.  (Closes: #402274)
+
+ -- Ben Armstrong <synrg@sanctuary.nslug.ns.ca>  Sun,  4 Feb 2007 16:30:47 -0400
+
+junior-internet (1.7) unstable; urgency=low
+
+  * Depend on firefox instead of mozilla, both resolving the issue of
+    depending on a transitional package, and also eliminating extra clients
+    we have found children tend not to use. (Closes: #335243)
+  * Dropped dillo, as the low end of systems typically in use for children
+    has moved up since the Jr. project first started.
+
+ -- Ben Armstrong <synrg@sanctuary.nslug.ns.ca>  Sun,  5 Feb 2006 20:00:48 -0400
+
 junior-internet (1.6) unstable; urgency=low
 
   * Improved description.  (Closes: #17861)

debian/oldchangelogs/programming

@@ -1,3 +1,18 @@
+junior-programming (1.11) unstable; urgency=low
+
+  * Added gvrng.
+
+ -- Ben Armstrong <synrg@sanctuary.nslug.ns.ca>  Sun, 18 Jun 2006 09:03:44 -0300
+
+junior-programming (1.10) unstable; urgency=low
+
+  * Refocus on packages specifically designed with children in mind,
+    - removed python, idle, drscheme (which is no longer in Testing anyway)
+    - replaced ucblogo with kturtle
+    - added littlewizard
+
+ -- Ben Armstrong <synrg@sanctuary.nslug.ns.ca>  Wed,  7 Jun 2006 14:58:42 -0300
+
 junior-programming (1.9) unstable; urgency=low
 
   * Fixed python-mode dependency. (Closes: #237354)

debian/oldchangelogs/sound

@@ -1,3 +1,9 @@
+junior-sound (1.3) unstable; urgency=low
+
+  * Replaced xmms with audacious, as xmms has been removed.
+
+ -- Ben Armstrong <synrg@sanctuary.nslug.ns.ca>  Sat, 26 Jan 2008 09:00:57 -0400
+
 junior-sound (1.2) unstable; urgency=low
 
   * Priority dropped to extra.

debian/oldchangelogs/toys

@@ -1,3 +1,10 @@
+junior-toys (1.7) unstable; urgency=low
+
+  * Removed xscreensaver, as screensavers are now standard desktop components.
+  * 
+
+ -- Ben Armstrong <synrg@sanctuary.nslug.ns.ca>  Sun, 15 Apr 2007 09:30:33 -0300
+
 junior-toys (1.6) unstable; urgency=low
 
   * Removed penguineyes, as it has been removed from unstable.

debian/oldchangelogs/typing

@@ -1,3 +1,17 @@
+junior-typing (1.4) unstable; urgency=low
+
+  * Re-added tuxtype.
+  * Removed tipptrainer, xletters, typespeed: considered redundant.
+  * Added md5sums.
+
+ -- Ben Armstrong <synrg@sanctuary.nslug.ns.ca>  Sat, 06 Oct 2007 17:32:39 -0300
+
+junior-typing (1.3) unstable; urgency=low
+
+  * Removed tuxtype until copyright problem resolved (Closes: #321534)
+
+ -- Ben Armstrong <synrg@sanctuary.nslug.ns.ca>  Sat,  6 Aug 2005 09:29:30 -0300
+
 junior-typing (1.2) unstable; urgency=low
 
   * Lowered priority to extra.

debian/oldchangelogs/writing

@@ -1,3 +1,16 @@
+junior-writing (1.6) unstable; urgency=low
+
+  * Removed vim, emacs, nedit, considered redundant.
+  * Generate md5sums.
+
+ -- Ben Armstrong <synrg@sanctuary.nslug.ns.ca>  Sat, 06 Oct 2007 17:16:46 -0300
+
+junior-writing (1.5) unstable; urgency=low
+
+  * Added abiword-gnome alternative for abiword. (Closes: #287077)
+
+ -- Ben Armstrong <synrg@sanctuary.nslug.ns.ca>  Sun, 26 Dec 2004 23:30:27 -0400
+
 junior-writing (1.4) unstable; urgency=low
 
   * Lowered priority to extra.

tasks/arcade

@@ -1,5 +1,4 @@
 Task: arcade
-Depends: bugsquish, bumprace, circuslinux, cuyo, heroes, koules, lbreakout2, madbomber, thrust, toppler, wing, xscavenger, xsoldier, zblast-x11
 Description: Debian Jr. arcade games
  This meta package will install arcade games suitable, in the
  opinion of the contributors to the Debian Jr. project, for children
@@ -8,3 +7,7 @@ Description: Debian Jr. arcade games
  (around ages 5 to 8).  But the youngest children may enjoy watching
  older players, or just poking randomly at the controls, depending
  on the game.
+
+Depends: bugsquish, bumprace, circuslinux, cuyo, heroes, holotz-castle, koules
+
+Depends: lbreakout2, madbomber, supertux, tuxmath, xsoldier

tasks/art

@@ -1,5 +1,4 @@
 Task: art
-Depends: gimp, tuxpaint, xpaint
 Description: Debian Jr. Art
  Tools for children to produce artwork.  The simplest of these is
  tuxpaint, which is designed for small children.  It features sounds
@@ -10,3 +9,5 @@ Description: Debian Jr. Art
  subset of the functions of these tools eventually pick up quite a
  number of new things as they explore, either with adults or other
  children with whom they share their computers, or on their own.
+
+Depends: gimp, tuxpaint, xpaint

tasks/games-card

@@ -1,7 +1,8 @@
 Task: games-card
-Depends: ace-of-penguins, pysol
 Description: Debian Jr. Card Games
  A collection of card games, for the time being just solitaire, which
  are probably more suited to older children than young, although
  the "memory" type games in pysol may appeal to children just entering
  grade school.
+
+Depends: ace-of-penguins, pysol

tasks/games-gl

@@ -1,5 +1,4 @@
 Task: games-gl
-Depends: armagetron, bzflag, gltron, tuxkart, tuxracer
 Description: Debian Jr. 3D Games (hardware acceleration required)
  These games all use OpenGL libraries.  They will not work without
  decent 3D graphics cards providing hardware-accelerated OpenGL.
@@ -9,3 +8,7 @@ Description: Debian Jr. 3D Games (hardware acceleration required)
  is an all-original made-for-Linux 3D racing game.  Unlike the
  standard blood-and-guts fare in the 3D games universe, all of
  these games are suitable for children.
+
+Depends: armagetron, bzflag, gltron
+
+Depends: neverball, slune, trackballs, supertuxkart, planetpenguin-racer

tasks/games-net

@@ -1,7 +1,10 @@
 Task: games-net
-Depends: xpilot, xblast
 Description: Debian Jr. Network Games
  While XPilot has a broad international community of players (mostly
  on high-bandwidth connections) it can be enjoyed on a home network
  as well.  XBlast, on the other hand, achieves networking using the X
  protocol, so it is best suited to a local network.
+
+Depends: xpilot-ng
+
+Depends: xblast-tnt, xblast-tnt-levels, xblast-tnt-sounds, xblast-tnt-musics

tasks/games-sim

@@ -1,6 +1,12 @@
 Task: games-sim
-Depends: freeciv, lincity
 Description: Debian Jr. Simulation Games
  Simulation games tend to be rather complex, so we recommend them for
  older children, and even then some help from someone older may be
  needed.
+
+Depends: freeciv, lincity
+
+Ignore: lincity-ng, freecol
+Comment: Andreas Tille thinks these packages should be Recommended but
+ want's to leave the decision to the Debian Junior team, so it is just
+ set to "Ignore" which means "under oberservation".

tasks/games-text

@@ -1,6 +1,7 @@
 Task: games-text
-Depends: bsdgames, moon-buggy | moon-buggy-esd, nettoe, zivot
 Description: Debian Jr. Text Games
  The principal virtue of these games is their simplicity.  They will run
  on any hardware, and some of them are simple enough to control so that
  very young children can enjoy them (e.g. snake)
+
+Depends: bsdgames, moon-buggy | moon-buggy-esd, nettoe, zivot

tasks/gnome

@@ -1,5 +1,4 @@
 Task: gnome
-Depends: gbatnav, mathwar
 Description: Debian Jr. for Gnome
  This package includes a collection of programs for children
  which are built for Gnome.  A Gnome desktop is not required
@@ -13,5 +12,4 @@ Description: Debian Jr. for Gnome
  refining the package into categories the way the rest of Debian
  Jr. packages are now organized.
 
-Suggests: drgenius
-Why: Just a remainder from old junior-gnome package. Should be removed (at)
+Depends: gcompris, mathwar

tasks/internet

@@ -1,17 +1,8 @@
 Task: internet
-Depends: mozilla, dillo
 Description: Debian Jr. Internet tools
- For children, a wide variety of Internet tools are not necessary to
- get started.  Most users will find Mozilla covers their needs, as it
- is a "swiss army knife" of web browsers.  It will suffice for
- quite a number of services and protocols, including Usenet and E-mail.
- As children's familiarity and sophistication of use of the Internet
- develops, you will probably want to add more Internet clients to the
- child's system.
- .
- For those with very lightweight systems (e.g. 486 or classic pentium
- system with smallish amount of memory) we also include dillo,
- a good, fast, low memory footprint browser for plain HTML browsing.
- Although it lacks functionality expected in most modern browsers:
- Javascript, Java, and support for plugins, we consider it the best
- compromise for this class of system.
+ For children, a wide variety of Internet tools are not necessary to get
+ started.  Most users will find the Iceweasel web browser covers their needs.
+ As children's familiarity and sophistication of use of the Internet develops,
+ you will probably want to add more Internet clients to the child's system.
+
+Depends: iceweasel

tasks/programming

@@ -1,15 +1,15 @@
 Task: programming
-Depends: ucblogo, python2.3, python2.3-doc, python-tk, python-mode, idle, drscheme
 Description: Debian Jr. programming
  The emphasis for this sampling of programming packages for children
  is first on simple interpreted languages.  Also important for using
  languages with children are good documentation, and some ability to
  produce visual programs without too much effort.  It is by no means
- a complete list, and your are encouraged to explore other languages
- with children as well.
+ a complete list, and you are encouraged to explore other languages
+ with children as well, even those 
+ children.
  .
  The Logo language is specifically designed for children, with a strong
- emphasis on the visual and concrete, while Python is recognized as
- a good language to teach programming with, has very good docs, and
- a number of different gui bindings, Tk being the most common so that
- is what is included here.
+ emphasis on the visual and concrete.  Littlewizard is an icon-based
+ graphical programming language also designed for children.
+
+Depends: gvrng, kturtle, littlewizard

tasks/sound

@@ -1,8 +1,9 @@
 Task: sound
-Depends: bplay, cdtool, grip, vorbis-tools, xmms
 Description: Debian Jr. sound
  This meta package will install a sampling of sound packages for
  a system that is used by children.  While not all of these will
  be things that children will use directly, a child's system
  administrator can make use of them to ensure that the child
  gets the most out of their system.
+
+Depends: audacious, bplay, cdtool, grip, vorbis-tools

tasks/system

@@ -1,5 +1,4 @@
 Task: system
-Depends: mc, hello, lavaps, xcruise
 Description: Debian Jr. System tools
  This package includes a few tools for helping children learn about and
  use their system.
@@ -15,12 +14,10 @@ Description: Debian Jr. System tools
  an example of how to invoke programs from the shell, specify switches,
  use the man page, and so on.
  .
- A fun way to visualize filesystems is by using xcruise to zoom about
- from node to node through "galaxies" of files, directories, and
- symbolic links.
- .
  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.
+
+Depends: mc, hello, lavaps

tasks/toys

@@ -1,4 +1,7 @@
 Task: toys
-Depends: lletters, oneko, xfireworks, xfishtank, xhangglider, xpenguins, xplanet, xplanet-images, xscreensaver, xteddy
 Description: Debian Jr. desktop toys
  This meta package will install desktop toys suitable for children.
+
+Depends: lletters, oneko, xfireworks, xfishtank, xhangglider, xpenguins, xteddy
+
+Depends: xplanet, xplanet-images

tasks/typing

@@ -1,6 +1,6 @@
 Task: typing
-Depends: tipptrainer, tuxtype, typespeed, gtypist, xletters
 Description: Debian Jr. typing
  This meta package will install typing tutors and typing games for
- various skill levels.  From tuxtype for the young (and young at
- heart) to gtypist for a "serious" typing tutor program.
+ various skill levels.
+
+Depends: tuxtype, gtypist

tasks/writing

@@ -1,9 +1,7 @@
 Task: writing
-Depends: emacs21 | emacsen, vim, nedit, nano, dict, aspell, abiword
 Description: Debian Jr. writing
  This meta package will install tools for your budding young
- writers.  Since there are a wide variety of opinions as to
- what constitutes the "best" text editor, a number are provided
- to choose from.  A spell-checker and dictionary client are
- provided as well.  Finally, abiword is included as our choice
- for a word processor.
+ writer.  A text editor, spell-checker, dictionary client and
+ word processor are provided.
+
+Depends: nano, dict, aspell, abiword | abiword-gnome