Updated existing tasks and added junior-desktop

  * Update Recommends - freeciv in games-sim
    - Removed: freeciv-client-gtk | freeciv-client-sdl
    - Replaced by: freeciv | freeciv-client
    Closes: #1019187
  * gcompris has been renamed to gcompris-qt
  * Added new task: junior-desktop

debian-junior-tasks.desc

@@ -20,6 +20,14 @@ Description: Debian Jr. Art
 Key:
  junior-art
 
+Task: junior-desktop
+Parent: debian-junior
+Section: debian-junior
+Description: Debian Jr. Desktop Environment
+ This package is a Metapackage for Debian Jr. Desktop Environment.
+Key:
+ junior-desktop
+
 Task: junior-education
 Parent: debian-junior
 Section: debian-junior

debian/changelog

@@ -6,8 +6,10 @@ debian-junior (1.31) UNRELEASED; urgency=low
     - Removed: freeciv-client-gtk | freeciv-client-sdl
     - Replaced by: freeciv | freeciv-client
     Closes: #1019187
+  * gcompris has been renamed to gcompris-qt
+  * Added new task: junior-desktop
 
- -- Stefan Kropp <stefan.kropp@posteo.de>  Wed, 05 Oct 2022 21:19:57 +0200
+ -- Stefan Kropp <stefan.kropp@posteo.de>  Mon, 19 Jun 2023 21:57:10 +0200
 
 debian-junior (1.30) unstable; urgency=low
 

debian/control

@@ -39,6 +39,7 @@ Depends: ${misc:Depends},
          junior-tasks (= ${source:Version})
 Recommends: cheese,
             gamine,
+            gcompris-qt,
             gimp,
             inkscape,
             karbon,
@@ -50,11 +51,10 @@ Recommends: cheese,
             rgbpaint,
             simple-scan,
             tupi,
-            tuxpaint
-Suggests: gcompris,
-          gpaint,
-          pinta,
-          xpaint
+            tuxpaint,
+            xpaint
+Suggests: gpaint,
+          pinta
 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
@@ -66,6 +66,83 @@ Description: Debian Jr. Art
  number of new things as they explore, either with adults or other
  children with whom they share their computers, or on their own.
 
+Package: junior-desktop
+Section: metapackages
+Architecture: all
+Depends: ${misc:Depends},
+         junior-config (= ${source:Version}),
+         junior-tasks (= ${source:Version})
+Recommends: 2048-qt,
+            atomix,
+            biniax2,
+            blobby,
+            bloboats,
+            blockout2,
+            brainparty,
+            bumprace,
+            circuslinux,
+            dino-im,
+            eog,
+            epiphany-browser,
+            evolution,
+            frozen-bubble,
+            gamine,
+            gbrainy,
+            gcompris-qt,
+            gnome-calculator,
+            gnome-clocks,
+            gnome-dictionary,
+            gnome-mahjongg,
+            gnome-nibbles,
+            gnome-sudoku,
+            goldendict,
+            gpxviewer,
+            grun,
+            gtetrinet,
+            gtkpool,
+            hannah,
+            hexxagon,
+            icewm,
+            jumpnbump,
+            junior-doc,
+            junior-tasks,
+            ktuberling,
+            kturtle,
+            laby,
+            lbreakout2,
+            libreoffice,
+            lightdm,
+            littlewizard,
+            ltris,
+            mousepad,
+            numptyphysics,
+            opencity,
+            paprefs,
+            pavucontrol,
+            pavumeter,
+            pingus,
+            pulseaudio,
+            pysiogame,
+            ri-li,
+            scratch,
+            sgt-puzzles,
+            stellarium,
+            supertux,
+            supertuxkart,
+            thunar,
+            tuxmath,
+            tuxpaint,
+            tuxpuck,
+            tuxtype,
+            vlc,
+            xdg-utils,
+            xserver-xephyr,
+            xserver-xorg,
+            xterm,
+            zenity
+Description: Debian Jr. Desktop Environment
+ This package is a Metapackage for Debian Jr. Desktop Environment.
+
 Package: junior-education
 Section: metapackages
 Architecture: all
@@ -76,6 +153,7 @@ Recommends: atomix,
             bambam,
             fracplanet,
             gbrainy,
+            gcompris-qt,
             ktuberling,
             numptyphysics,
             pysiogame,
@@ -83,7 +161,6 @@ Recommends: atomix,
             xball,
             xmakemol | xmakemol-gl
 Suggests: childsplay,
-          gcompris,
           kstars,
           mathwar,
           pysycache
@@ -125,6 +202,7 @@ Recommends: 2048-qt,
             circuslinux,
             cuyo,
             funnyboat,
+            gcompris-qt,
             hannah,
             heroes-sdl,
             holotz-castle,
@@ -139,8 +217,7 @@ Recommends: 2048-qt,
             vodovod,
             xsoldier
 Suggests: childsplay,
-          fretsonfire,
-          gcompris
+          fretsonfire
 Description: Debian Jr. arcade games
  This metapackage will install arcade games suitable, in the
  opinion of the contributors to the Debian Jr. project, for children
@@ -202,7 +279,8 @@ Architecture: all
 Depends: ${misc:Depends},
          junior-config (= ${source:Version}),
          junior-tasks (= ${source:Version})
-Recommends: gtetrinet | tetrinet-client,
+Recommends: gcompris-qt,
+            gtetrinet | tetrinet-client,
             minetest,
             openttd,
             xblast-tnt,
@@ -210,7 +288,6 @@ Recommends: gtetrinet | tetrinet-client,
             xblast-tnt-musics,
             xblast-tnt-sounds
 Suggests: bubbros,
-          gcompris,
           xpilot-ng
 Description: Debian Jr. Network Games
  Network games bring people together from all over the world. Many times the
@@ -230,14 +307,14 @@ Recommends: 2048-qt,
             brainparty,
             frozen-bubble,
             gbrainy,
+            gcompris-qt,
             gtans,
             hex-a-hop,
             lmemory,
             monsterz,
             pysiogame,
-            ri-li,
-            xjig
-Suggests: gcompris
+            ri-li
+Suggests: xjig
 Description: Debian Jr. Puzzle games
  Some puzzle-type games, from the more arcade-like and frozen-bubble to xjig (a
  jigsaw puzzle program), to lmemory (based on the classic "memory" card game).
@@ -251,7 +328,7 @@ Depends: ${misc:Depends},
          junior-config (= ${source:Version}),
          junior-tasks (= ${source:Version})
 Recommends: 0ad,
-            freeciv-client-gtk | freeciv-client-sdl,
+            freeciv | freeciv-client,
             freecol,
             lincity-ng | lincity,
             megaglest,
@@ -310,14 +387,14 @@ Recommends: 2048-qt,
             bc,
             bsdgames,
             gbrainy,
+            gcompris-qt,
             kig,
             numptyphysics,
             pysiogame,
             tuxmath,
             x11-apps,
             xaos
-Suggests: childsplay,
-          gcompris
+Suggests: childsplay
 Description: Debian Jr. educational math
  This metapackage will install educational math programs suitable for
  children.  Some of the packages use mathematics that is well beyond
@@ -375,6 +452,7 @@ Depends: ${misc:Depends},
 Recommends: audacious,
             bplay,
             cdtool,
+            gcompris-qt,
             gtkguitune,
             hydrogen,
             milkytracker,
@@ -383,8 +461,7 @@ Recommends: audacious,
             sonic-pi,
             tuxguitar,
             vorbis-tools
-Suggests: gcompris,
-          gespeaker
+Suggests: gespeaker
 Description: Debian Jr. sound
  This metapackage will install a sampling of sound packages for
  a system that is used by children.  While not all of these will
@@ -461,13 +538,13 @@ Depends: ${misc:Depends},
          junior-config (= ${source:Version}),
          junior-tasks (= ${source:Version})
 Recommends: bambam,
+            gcompris-qt,
             gtypist,
             klavaro,
             ktouch,
             pysiogame,
             tuxtype
-Suggests: childsplay,
-          gcompris
+Suggests: childsplay
 Description: Debian Jr. typing
  This metapackage will install typing tutors and typing games for
  various skill levels.  This collection of packages was assembled
@@ -497,10 +574,10 @@ Recommends: abiword,
             aspell,
             dasher,
             dict,
+            gcompris-qt,
             nano,
             pysiogame
-Suggests: gcompris,
-          writetype
+Suggests: writetype
 Description: Debian Jr. writing
  This metapackage will install tools for your budding young
  writer. It includes a text editor, spell-checker, dictionary client,

tasks/art

@@ -18,7 +18,7 @@ Recommends: inkscape, mypaint, mtpaint
 
 Recommends: gamine
 
-Recommends: gcompris
+Recommends: gcompris-qt
 
 Recommends: gpaint
 

tasks/desktop

@@ -0,0 +1,30 @@
+Task: desktop
+Section: metapackage
+Description: Debian Jr. Desktop Environment
+ This package is a Metapackage for Debian Jr. Desktop Environment.
+
+Recommends: icewm, dino-im, eog, epiphany-browser, evolution 
+
+Recommends: gnome-calculator, gnome-clocks, gnome-dictionary
+
+Recommends: goldendict, gpxviewer, grun, junior-doc, junior-tasks
+
+Recommends: libreoffice, lightdm, mousepad, paprefs, pavucontrol
+
+Recommends: pavumeter, pulseaudio, thunar, vlc
+
+Recommends: xdg-utils, xserver-xephyr, xserver-xorg, xterm, zenity
+
+Recommends: 2048-qt, atomix, biniax2, blobby, bloboats, blockout2
+
+Recommends: brainparty, bumprace, circuslinux, frozen-bubble, gamine, gbrainy
+
+Recommends: gcompris-qt, gnome-mahjongg, gnome-nibbles, gnome-sudoku, gtetrinet
+
+Recommends: gtkpool, hannah, hexxagon, jumpnbump, ktuberling, kturtle, laby
+
+Recommends: lbreakout2, littlewizard, ltris, numptyphysics, opencity, pingus
+
+Recommends: pysiogame, ri-li, scratch, scratch, sgt-puzzles, stellarium, supertux
+
+Recommends: supertuxkart, tuxmath, tuxpaint, tuxpuck, tuxtype

tasks/education

@@ -10,7 +10,7 @@ Recommends: atomix
 
 Recommends: childsplay
 
-Recommends: gcompris, ktuberling
+Recommends: gcompris-qt, ktuberling
 
 Recommends: bambam
 

tasks/games-arcade

@@ -36,4 +36,4 @@ Recommends: monsterz
 
 Recommends: tuxpuck
 
-Recommends: gcompris
+Recommends: gcompris-qt

tasks/games-net

@@ -6,7 +6,7 @@ Description: Debian Jr. Network Games
 
 Recommends: bubbros
 
-Recommends: gcompris
+Recommends: gcompris-qt
 
 Recommends: gtetrinet | tetrinet-client
 

tasks/games-puzzle

@@ -19,7 +19,7 @@ Recommends: frozen-bubble, gtans, lmemory, xjig
 
 Recommends: gbrainy
 
-Recommends: gcompris
+Recommends: gcompris-qt
 
 Recommends: hex-a-hop
 

tasks/math

@@ -18,7 +18,7 @@ Recommends: childsplay
 
 Recommends: gbrainy
 
-Recommends: gcompris
+Recommends: gcompris-qt
 
 Recommends: numptyphysics
 

tasks/sound

@@ -8,7 +8,7 @@ Description: Debian Jr. sound
 
 Recommends: audacious, bplay, cdtool, pianobooster, vorbis-tools
 
-Recommends: gcompris
+Recommends: gcompris-qt
 
 Recommends: gespeaker
 

tasks/typing

@@ -13,6 +13,6 @@ Recommends: tuxtype, gtypist
 
 Recommends: ktouch, klavaro
 
-Recommends: gcompris
+Recommends: gcompris-qt
 
 Recommends: pysiogame

tasks/writing

@@ -8,7 +8,7 @@ Recommends: nano, dict, aspell, abiword
 
 Recommends: dasher
 
-Recommends: gcompris
+Recommends: gcompris-qt
 
 Recommends: pysiogame