Merge branch 'version1.30' into 'master'

debian-junior (1.30) experimental; urgency=low

See merge request blends-team/junior!3

AUTHORS

@@ -2,3 +2,4 @@ Ben Armstrong <synrg@sanctuary.nslug.ns.ca>
 Andreas Tille <tille@debian.org>
 Per Andersson <avtobiff@debian.org>
 Hedvig Kamp <hedvig.ka@gmail.com>
+Stefan Kropp <stefan@debxwoody.de>

debian/changelog

@@ -1,3 +1,46 @@
+debian-junior (1.30) experimental; urgency=low
+
+  * Team upload.
+  * Added myself to Uploader.
+  * Changed iceweasel to firefox-esr
+  * Downgraded 13 missing packages to Suggests
+    - bubbros
+    - fretsonfire
+    - gcompris
+    - gespeaker
+    - gvrng
+    - moon-buggy-esd
+    - nethack-lisp
+    - pairs
+    - pysycache
+    - spider
+    - writetype
+    - xpilot-ng
+    - zivot
+  * Changes in metapackage dependencies
+   -junior-art
+    removed:
+      Recommends:  tbo
+   -junior-games-arcade
+    removed:
+      Recommends:  anagramarama
+   -junior-games-gl
+    removed:
+      Recommends:  platinumarts-sandbox
+   -junior-games-puzzle
+    removed:
+      Recommends:  kartofel, stegavorto
+   -junior-internet
+    added:
+      Recommends:  epiphany-browser | firefox-esr
+    removed:
+      Recommends:  epiphany-browser | iceweasel
+   -junior-sound
+    removed:
+      Recommends:  bloopsaphone
+
+ -- Stefan Kropp <stefan@debxwoody.de>  Sat, 11 Dec 2021 13:58:13 +0100
+
 debian-junior (1.29) unstable; urgency=medium
 
   * Team upload.

debian/control

@@ -5,6 +5,7 @@ Priority: optional
 Maintainer: Debian Junior <debian-jr@lists.debian.org>
 Uploaders: Per Andersson <avtobiff@debian.org>,
 	   Jonathan Carter <jcc@debian.org>
+	   Stefan Kropp <stefan@debxwoody.de>
 Build-Depends-Indep: debhelper (>= 11~),
                      blends-dev (>= 0.7~)
 Standards-Version: 4.3.0
@@ -38,7 +39,6 @@ Depends: ${misc:Depends},
          junior-tasks (= ${source:Version})
 Recommends: cheese,
             gamine,
-            gcompris,
             gimp,
             gpaint,
             inkscape,
@@ -47,14 +47,14 @@ Recommends: cheese,
             mtpaint,
             mypaint,
             pencil2d,
+            pinta,
             pysiogame,
             rgbpaint,
             simple-scan,
+            tupi,
             tuxpaint,
             xpaint
-Suggests: pinta,
-          tbo,
-          tupi
+Suggests: gcompris
 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
@@ -77,16 +77,16 @@ Recommends: atomix,
             childsplay,
             fracplanet,
             gbrainy,
-            gcompris,
             ktuberling,
             numptyphysics,
             pysiogame,
-            pysycache,
             stellarium,
             xball,
             xmakemol | xmakemol-gl
-Suggests: kstars,
-          mathwar
+Suggests: gcompris,
+          kstars,
+          mathwar,
+          pysycache
 Description: Debian Jr. education applications
  This package includes a collection of educational programs
  for children. These applications suit children from 2 to 12.
@@ -103,7 +103,8 @@ Recommends: beneath-a-steel-sky,
             drascula,
             flight-of-the-amazon-queen,
             lure-of-the-temptress,
-            nethack-console | nethack-x11 | nethack-lisp
+            nethack-console | nethack-x11
+Suggests: nethack-lisp
 Description: Debian Jr. Adventure Games
  Adventure games are interactive stories driven by exploration and puzzle
  solving, and can be quite challenging. Recommended for older children, maybe
@@ -123,9 +124,8 @@ Recommends: 2048-qt,
             bumprace,
             childsplay,
             circuslinux,
-            fretsonfire,
+            cuyo,
             funnyboat,
-            gcompris,
             hannah,
             heroes-sdl,
             holotz-castle,
@@ -139,8 +139,8 @@ Recommends: 2048-qt,
             tuxpuck,
             vodovod,
             xsoldier
-Suggests: anagramarama,
-          cuyo
+Suggests: fretsonfire,
+          gcompris
 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
@@ -186,7 +186,6 @@ Recommends: armagetronad,
             torcs,
             trackballs,
             tuxfootball
-Suggests: platinumarts-sandbox
 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.
@@ -203,17 +202,16 @@ Architecture: all
 Depends: ${misc:Depends},
          junior-config (= ${source:Version}),
          junior-tasks (= ${source:Version})
-Recommends: bubbros,
-            gcompris,
+Recommends: gtetrinet | tetrinet-client,
             minetest,
             openttd,
-            tetrinet-client,
             xblast-tnt,
             xblast-tnt-levels,
             xblast-tnt-musics,
-            xblast-tnt-sounds,
-            xpilot-ng
-Suggests: gtetrinet
+            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
  game and chat is a place where people learn languages, how to communicate, and
@@ -232,7 +230,6 @@ Recommends: 2048-qt,
             brainparty,
             frozen-bubble,
             gbrainy,
-            gcompris,
             gtans,
             hex-a-hop,
             lmemory,
@@ -240,8 +237,7 @@ Recommends: 2048-qt,
             pysiogame,
             ri-li,
             xjig
-Suggests: kartofel,
-          stegavorto
+Suggests: gcompris
 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).
@@ -282,9 +278,9 @@ Recommends: animals,
             cowsay,
             moon-buggy,
             nettoe,
-            sl,
-            zivot
-Suggests: moon-buggy-esd
+            sl
+Suggests: moon-buggy-esd,
+          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
@@ -296,9 +292,8 @@ Architecture: all
 Depends: ${misc:Depends},
          junior-config (= ${source:Version}),
          junior-tasks (= ${source:Version})
-Recommends: epiphany-browser,
+Recommends: epiphany-browser | firefox-esr,
             pidgin
-Suggests: iceweasel
 Description: Debian Jr. Internet tools
  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.
@@ -316,13 +311,13 @@ Recommends: 2048-qt,
             bsdgames,
             childsplay,
             gbrainy,
-            gcompris,
             kig,
             numptyphysics,
             pysiogame,
             tuxmath,
             x11-apps,
             xaos
+Suggests: gcompris
 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
@@ -347,9 +342,9 @@ Recommends: arduino,
             puredata,
             scratch,
             sonic-pi,
+            squeak-plugins-scratch,
             squeak-vm
-Suggests: gvrng,
-          squeak-plugins-scratch
+Suggests: gvrng
 Description: Debian Jr. programming
  The emphasis for this sampling of programming packages for children
  is first on simple interpreted languages.  Also important for using
@@ -380,8 +375,6 @@ Depends: ${misc:Depends},
 Recommends: audacious,
             bplay,
             cdtool,
-            gcompris,
-            gespeaker,
             gtkguitune,
             hydrogen,
             milkytracker,
@@ -390,7 +383,8 @@ Recommends: audacious,
             sonic-pi,
             tuxguitar,
             vorbis-tools
-Suggests: bloopsaphone
+Suggests: gcompris,
+          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
@@ -445,7 +439,6 @@ Recommends: bambam,
             cheese,
             dasher,
             gamine,
-            gespeaker,
             gtkguitune,
             gworldclock,
             oneko,
@@ -455,6 +448,7 @@ Recommends: bambam,
             xplanet,
             xplanet-images,
             xteddy
+Suggests: gespeaker
 Description: Debian Jr. desktop toys
  This metapackage will install desktop toys suitable for children.  The
  collection contains some packages which might enjoy children and make
@@ -468,12 +462,12 @@ Depends: ${misc:Depends},
          junior-tasks (= ${source:Version})
 Recommends: bambam,
             childsplay,
-            gcompris,
             gtypist,
             klavaro,
             ktouch,
             pysiogame,
             tuxtype
+Suggests: gcompris
 Description: Debian Jr. typing
  This metapackage will install typing tutors and typing games for
  various skill levels.  This collection of packages was assembled
@@ -503,10 +497,10 @@ Recommends: abiword,
             aspell,
             dasher,
             dict,
-            gcompris,
             nano,
-            pysiogame,
-            writetype
+            pysiogame
+Suggests: gcompris,
+          writetype
 Description: Debian Jr. writing
  This metapackage will install tools for your budding young
  writer. It includes a text editor, spell-checker, dictionary client,

debian/control.stub

@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: Debian Junior <debian-jr@lists.debian.org>
 Uploaders: Per Andersson <avtobiff@debian.org>,
 	   Jonathan Carter <jcc@debian.org>
+	   Stefan Kropp <stefan@debxwoody.de>
 Build-Depends-Indep: debhelper (>= 11~),
                      blends-dev (>= 0.7~)
 Standards-Version: 4.3.0

tasks/art

@@ -37,10 +37,3 @@ Recommends: rgbpaint
 Recommends: simple-scan
 
 Recommends: tupi
-
-Recommends: tbo
-Homepage: https://github.com/danigm/TBO
-Responsible: Per Andersson <avtobiff@debian.org>
-License: GPL
-Pkg-Description: Intuitive GNOME comic creator
- TBO is a simple and easy drag and drop comic creator.

tasks/games-arcade

@@ -37,14 +37,3 @@ Recommends: monsterz
 Recommends: tuxpuck
 
 Recommends: gcompris
-
-Recommends: anagramarama
-Homepage: http://www.coralquest.com/anagramarama/
-License: GPL
-Responsible: Javier Galicia <javiergaliciaacm@gmail.com>
-WNPP: 289392
-Pkg-URL: http://packages.ubuntu.com/feisty/games/anagramarama
-Pkg-Description: fast paced anagram puzzle game using SDL
- Simple SDL game where you guess possible permutations
- of a scrambled word within a time limit.  Simple, arcade
- style of play.

tasks/games-gl

@@ -19,26 +19,3 @@ Recommends: torcs
 Why: Replacement for slune, see #521175
 
 Recommends: tuxfootball
-
-Recommends: platinumarts-sandbox
-Homepage: http://kids.platinumarts.net/
-License: free
-Pkg-Description: standalone 3D Game Maker and 3D Game Design program
- Platinum Arts Sandbox is an open source easy to use standalone 3D Game
- Maker and 3D Game Design program currently being used in many schools
- throughout the world that allows kids and adults to create their own video
- games, worlds, levels, adventures and quests, even cooperatively! The goal
- is to make it accessible to kids but also powerful enough for full game
- projects. With a simple click and roll of a mouse wheel users can modify
- the world however they want. In the words of Margaret, a nine year old
- Sandbox whiz I babysit for, “Press Edit and go fulfill your dreams!”. Now
- features new game modes such as sidescroller, machinima, kartmode, RPG,
- and more!
- .
- Platinum Arts Sandbox  Main Features:
-  * Kid Friendly, Free and Open Source.
-  * Editing is done in game, including cooperatively over the Internet or LAN.
-  * Easy enough for kids to use but powerful enough for full game projects.
-  * Several different modes, including cart, sidescroller, movie (machinima) and RPG
-  * Several custom maps that feature saving a princess, mazes, houses, quests, etc
-  * The pursuit of making it as easy as possible to add map features and content.

tasks/games-puzzle

@@ -28,22 +28,3 @@ Recommends: monsterz
 Recommends: pysiogame
 
 Recommends: ri-li
-
-Recommends: stegavorto
-Homepage: http://james.hamsterrepublic.com/?p=130
-Responsible: Miriam Ruiz <little_miry@yahoo.es>
-License: GPL
-Pkg-URL: http://ppa.launchpad.net/miry/ubuntu/pool/main/s/stegavorto/
-Pkg-Description: click on letters to spell out secret words
- Discover secret messages embedded in the works of great authors. This
- game is inspired in something that the author dreamed. In it you'll have
- to show your ability finding letters in big texts.
-
-Recommends: kartofel
-Homepage: http://kartofel.jfedor.org
-Responsible: Miriam Ruiz <little_miry@yahoo.es>
-License: GPL
-Pkg-URL: http://users.alioth.debian.org/~miriam/
-Pkg-Description: connect the dots in order without crossing over yourself
- Kartofel is a game of skill and logic. The objective is to connect the
- numbered dots in order, without crossing over yourself.

tasks/internet

@@ -6,6 +6,6 @@ Description: Debian Jr. Internet tools
  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.
 
-Recommends: epiphany-browser | iceweasel
+Recommends: epiphany-browser | firefox-esr
 
 Recommends: pidgin

tasks/sound

@@ -23,17 +23,3 @@ Recommends: puredata
 Recommends: sonic-pi
 
 Recommends: tuxguitar
-
-Recommends: bloopsaphone
-Why: This should also go into programming
-Homepage: https://github.com/mental/bloopsaphone
-License: Expat
-Pkg-Description: library for writing chiptune-style songs in C or Ruby
- This is a small c library for sending chiptunes through PortAudio.
- .
- The ideals of bloopsaphone are:
-  * Asynchronous, plays in background and raises an event upon finish
-  * Small, a small toy library
-  * Custom notation, a slight variation of RTTTL
-  * Serialize sounds, including a file format for easy passing of instruments
-    between Ruby and C.