debian-junior (1.30) unstable; urgency=low

 * Standards-Version: 4.6.0
 * firefox is not a replacement for iceweasel

debian/changelog

@@ -1,4 +1,4 @@
-debian-junior (1.30) experimental; urgency=low
+debian-junior (1.30) unstable; urgency=low
 
   * Team upload.
   * Added myself to Uploader.
@@ -29,10 +29,10 @@ debian-junior (1.30) experimental; urgency=low
       Recommends:  platinumarts-sandbox
    -junior-games-puzzle
     removed:
-      Recommends:  kartofel, stegavorto
+      Recommends:  stegavorto, kartofel
    -junior-internet
     added:
-      Recommends:  epiphany-browser | firefox-esr
+      Recommends:  epiphany-browser
     removed:
       Recommends:  epiphany-browser | iceweasel
    -junior-sound

debian/control

@@ -8,7 +8,7 @@ Uploaders: Per Andersson <avtobiff@debian.org>,
 	   Stefan Kropp <stefan.kropp@posteo.de>
 Build-Depends-Indep: debhelper (>= 11~),
                      blends-dev (>= 0.7~)
-Standards-Version: 4.3.0
+Standards-Version: 4.6.0
 Vcs-Browser: https://salsa.debian.org/blends-team/junior
 Vcs-Git: https://salsa.debian.org/blends-team/junior.git
 Homepage: http://blends.debian.org/junior/tasks/
@@ -40,21 +40,21 @@ Depends: ${misc:Depends},
 Recommends: cheese,
             gamine,
             gimp,
-            gpaint,
             inkscape,
             karbon,
             krita,
             mtpaint,
             mypaint,
             pencil2d,
-            pinta,
             pysiogame,
             rgbpaint,
             simple-scan,
             tupi,
-            tuxpaint,
-            xpaint
-Suggests: gcompris
+            tuxpaint
+Suggests: gcompris,
+          gpaint,
+          pinta,
+          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
@@ -74,7 +74,6 @@ Depends: ${misc:Depends},
          junior-tasks (= ${source:Version})
 Recommends: atomix,
             bambam,
-            childsplay,
             fracplanet,
             gbrainy,
             ktuberling,
@@ -83,7 +82,8 @@ Recommends: atomix,
             stellarium,
             xball,
             xmakemol | xmakemol-gl
-Suggests: gcompris,
+Suggests: childsplay,
+          gcompris,
           kstars,
           mathwar,
           pysycache
@@ -122,7 +122,6 @@ Recommends: 2048-qt,
             bouncy,
             bugsquish,
             bumprace,
-            childsplay,
             circuslinux,
             cuyo,
             funnyboat,
@@ -139,7 +138,8 @@ Recommends: 2048-qt,
             tuxpuck,
             vodovod,
             xsoldier
-Suggests: fretsonfire,
+Suggests: childsplay,
+          fretsonfire,
           gcompris
 Description: Debian Jr. arcade games
  This metapackage will install arcade games suitable, in the
@@ -157,12 +157,12 @@ Depends: ${misc:Depends},
          junior-config (= ${source:Version}),
          junior-tasks (= ${source:Version})
 Recommends: ace-of-penguins,
-            childsplay,
             kpat,
             pysiogame,
             sgt-puzzles,
             xsol
-Suggests: pairs,
+Suggests: childsplay,
+          pairs,
           spider
 Description: Debian Jr. Card Games
  A collection of card games, for the time being just solitaire, which
@@ -292,7 +292,7 @@ Architecture: all
 Depends: ${misc:Depends},
          junior-config (= ${source:Version}),
          junior-tasks (= ${source:Version})
-Recommends: epiphany-browser | firefox-esr,
+Recommends: epiphany-browser,
             pidgin
 Description: Debian Jr. Internet tools
  For children, a wide variety of Internet tools are not necessary to get
@@ -309,7 +309,6 @@ Depends: ${misc:Depends},
 Recommends: 2048-qt,
             bc,
             bsdgames,
-            childsplay,
             gbrainy,
             kig,
             numptyphysics,
@@ -317,7 +316,8 @@ Recommends: 2048-qt,
             tuxmath,
             x11-apps,
             xaos
-Suggests: gcompris
+Suggests: childsplay,
+          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
@@ -342,9 +342,9 @@ Recommends: arduino,
             puredata,
             scratch,
             sonic-pi,
-            squeak-plugins-scratch,
             squeak-vm
-Suggests: gvrng
+Suggests: gvrng,
+          squeak-plugins-scratch
 Description: Debian Jr. programming
  The emphasis for this sampling of programming packages for children
  is first on simple interpreted languages.  Also important for using
@@ -461,13 +461,13 @@ Depends: ${misc:Depends},
          junior-config (= ${source:Version}),
          junior-tasks (= ${source:Version})
 Recommends: bambam,
-            childsplay,
             gtypist,
             klavaro,
             ktouch,
             pysiogame,
             tuxtype
-Suggests: gcompris
+Suggests: childsplay,
+          gcompris
 Description: Debian Jr. typing
  This metapackage will install typing tutors and typing games for
  various skill levels.  This collection of packages was assembled

debian/control.stub

@@ -3,11 +3,11 @@ Section: misc
 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>
+	   Jonathan Carter <jcc@debian.org>,
+	   Stefan Kropp <stefan.kropp@posteo.de>
 Build-Depends-Indep: debhelper (>= 11~),
                      blends-dev (>= 0.7~)
-Standards-Version: 4.3.0
+Standards-Version: 4.6.0 
 Vcs-Browser: https://salsa.debian.org/blends-team/junior
 Vcs-Git: https://salsa.debian.org/blends-team/junior.git
 Homepage: http://blends.debian.org/junior/tasks/

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 | firefox-esr
+Recommends: epiphany-browser
 
 Recommends: pidgin