Forráskód Böngészése

* Since blends-dev now permits "real" Depends it is safer to say
exactly what we mean - thus turning all "Depends" into "Recommends"
explicitly
* Bump versioned Build-Depends-Indep to: blends-dev (>= 0.7~)

Andreas Tille 8 éve
szülő
commit
3ca95dc9ec

+ 4 - 0
debian/changelog

@@ -1,6 +1,10 @@
 debian-junior (1.27) UNRELEASED; urgency=medium
 
   * Set Maintainer to debian-jr@lists.debian.org
+  * Since blends-dev now permits "real" Depends it is safer to say
+    exactly what we mean - thus turning all "Depends" into "Recommends"
+    explicitly
+  * Bump versioned Build-Depends-Indep to: blends-dev (>= 0.7~)
 
  -- Andreas Tille <tille@debian.org>  Thu, 06 Sep 2018 11:55:19 +0200
 

+ 1 - 1
debian/control

@@ -5,7 +5,7 @@ Priority: extra
 Maintainer: Debian Junior <debian-jr@lists.debian.org>
 Uploaders: Andreas Tille <tille@debian.org>,
            Per Andersson <avtobiff@debian.org>
-Build-Depends-Indep: debhelper, blends-dev (>= 0.6.92)
+Build-Depends-Indep: debhelper, blends-dev (>= 0.7~)
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/debianjr/debian-junior.git
 Vcs-Browser: https://anonscm.debian.org/cgit/debianjr/debian-junior.git/

+ 1 - 1
debian/control.stub

@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian Junior <debian-jr@lists.debian.org>
 Uploaders: Andreas Tille <tille@debian.org>,
            Per Andersson <avtobiff@debian.org>
-Build-Depends-Indep: debhelper, blends-dev (>= 0.6.92)
+Build-Depends-Indep: debhelper, blends-dev (>= 0.7~)
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/debianjr/debian-junior.git
 Vcs-Browser: https://anonscm.debian.org/cgit/debianjr/debian-junior.git/

+ 15 - 15
tasks/art

@@ -10,35 +10,35 @@ 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.
 
-Depends: cheese
+Recommends: cheese
 
-Depends: gimp, tuxpaint, xpaint
+Recommends: gimp, tuxpaint, xpaint
 
-Depends: inkscape, mypaint, mtpaint
+Recommends: inkscape, mypaint, mtpaint
 
-Depends: gamine
+Recommends: gamine
 
-Depends: gcompris
+Recommends: gcompris
 
-Depends: gpaint
+Recommends: gpaint
 
-Depends: karbon
+Recommends: karbon
 
-Depends: krita
+Recommends: krita
 
-Depends: pinta
+Recommends: pinta
 
-Depends: pencil2d
+Recommends: pencil2d
 
-Depends: pysiogame
+Recommends: pysiogame
 
-Depends: rgbpaint
+Recommends: rgbpaint
 
-Depends: simple-scan
+Recommends: simple-scan
 
-Depends: tupi
+Recommends: tupi
 
-Depends: tbo
+Recommends: tbo
 Homepage: https://github.com/danigm/TBO
 Responsible: Per Andersson <avtobiff@debian.org>
 License: GPL

+ 14 - 14
tasks/doudou-base

@@ -12,33 +12,33 @@ Description: DoudouLinux base
  inside DoudouLinux.  This is just a test for metapackage layout and does
  not yet create a real metapackage.
 
-Depends: doudoulinux-keyring, doudoulinux-activities, doudoulinux-dbus, doudoulinux-homepage, doudoulinux-tweaks-all, doudoulinux-utils, doudoulinux-sound, doudoulinux-audio
+Recommends: doudoulinux-keyring, doudoulinux-activities, doudoulinux-dbus, doudoulinux-homepage, doudoulinux-tweaks-all, doudoulinux-utils, doudoulinux-sound, doudoulinux-audio
 
-Depends: dash, bash-completion
+Recommends: dash, bash-completion
 
-Depends: less, tree, ntpdate
+Recommends: less, tree, ntpdate
 
-Depends: acpi-support-base, avahi-discover, avahi-autoipd, policykit-1, policykit-1-gnome
+Recommends: acpi-support-base, avahi-discover, avahi-autoipd, policykit-1, policykit-1-gnome
 
-Depends: xdg-user-dirs-gtk
+Recommends: xdg-user-dirs-gtk
 
-Depends: yelp, khelpcenter4, eject
+Recommends: yelp, khelpcenter4, eject
 
-Depends: xserver-xorg-core, xkb-data, x11-xkb-utils, xfonts-base, x11-utils
+Recommends: xserver-xorg-core, xkb-data, x11-xkb-utils, xfonts-base, x11-utils
 
-Depends: libgl1-mesa-glx, libgl1-mesa-dri
+Recommends: libgl1-mesa-glx, libgl1-mesa-dri
 
-Depends: oxygencursors, gtk2-engines
+Recommends: oxygencursors, gtk2-engines
 
-Depends: lxappearance, lxterminal, lxrandr, unique-launch
+Recommends: lxappearance, lxterminal, lxrandr, unique-launch
 
-Depends: network-manager-gnome, gnome-keyring, libpam-gnome-keyring, dnsmasq-base, system-tools-all
+Recommends: network-manager-gnome, gnome-keyring, libpam-gnome-keyring, dnsmasq-base, system-tools-all
 
-Depends: alsa-base, alsa-utils, libsdl1.2debian-alsa, gstreamer0.10-alsa, oss-compat
+Recommends: alsa-base, alsa-utils, libsdl1.2debian-alsa, gstreamer0.10-alsa, oss-compat
 
-Depends: system-config-printer, system-config-printer-udev, cups-bsd, smbclient, cups-pdf
+Recommends: system-config-printer, system-config-printer-udev, cups-bsd, smbclient, cups-pdf
 
-Depends: dansguardian-noclamav, dansguardian-squid, dansguardian-nospying, computer-use
+Recommends: dansguardian-noclamav, dansguardian-squid, dansguardian-nospying, computer-use
 
 Suggests: doudoulinux-x86, doudoulinux-live-base, doudoulinux-live-drivers
 

+ 2 - 2
tasks/doudou-dev-artists

@@ -12,9 +12,9 @@ Description: DoudouLinux Art development
  inside DoudouLinux.  This is just a test for metapackage layout and does
  not yet create a real metapackage.
 
-Depends: gimp, inkscape, rezound
+Recommends: gimp, inkscape, rezound
 
-Depends: ttf-bitstream-vera,
+Recommends: ttf-bitstream-vera,
          ttf-dejavu,
          ttf-dustin,
          ttf-ecolier-court,

+ 1 - 1
tasks/doudou-games

@@ -12,5 +12,5 @@ Description: DoudouLinux Games
  inside DoudouLinux.  This is just a test for metapackage layout and does
  not yet create a real metapackage.
 
-Depends: kolf, pingus, frozen-bubble, hannah, circuslinux, burgerspace, monsterz, gnome-games, gnome-mastermind, gweled, tanglet, gmchess, gtans, kigo, gnugo, freealchemist, hex-a-hop, numptyphysics,        toppler, abe, supertux, nikwi, ceferino, lbreakout2, magicor, biniax2, tworld, foobillard, supertuxkart
+Recommends: kolf, pingus, frozen-bubble, hannah, circuslinux, burgerspace, monsterz, gnome-games, gnome-mastermind, gweled, tanglet, gmchess, gtans, kigo, gnugo, freealchemist, hex-a-hop, numptyphysics,        toppler, abe, supertux, nikwi, ceferino, lbreakout2, magicor, biniax2, tworld, foobillard, supertuxkart
 

+ 12 - 12
tasks/education

@@ -6,28 +6,28 @@ Description: Debian Jr. education applications
  They will learn the computer mouse and keyboard as
  well as various skills (numbers, letters, logic, etc.).
 
-Depends: atomix
+Recommends: atomix
 
-Depends: childsplay
+Recommends: childsplay
 
-Depends: gcompris, ktuberling
+Recommends: gcompris, ktuberling
 
-Depends: bambam
+Recommends: bambam
 
 Suggests: mathwar, kstars
 
-Depends: gbrainy
+Recommends: gbrainy
 
-Depends: fracplanet
+Recommends: fracplanet
 
-Depends: numptyphysics
+Recommends: numptyphysics
 
-Depends: pysycache
+Recommends: pysycache
 
-Depends: pysiogame
+Recommends: pysiogame
 
-Depends: stellarium
+Recommends: stellarium
 
-Depends: xball
+Recommends: xball
 
-Depends: xmakemol | xmakemol-gl
+Recommends: xmakemol | xmakemol-gl

+ 5 - 5
tasks/games-adventure

@@ -4,12 +4,12 @@ Description: Debian Jr. Adventure Games
  solving, and can be quite challenging. Recommended for older children, maybe
  even requiring help from someone older.
 
-Depends: beneath-a-steel-sky
+Recommends: beneath-a-steel-sky
 
-Depends: drascula
+Recommends: drascula
 
-Depends: flight-of-the-amazon-queen
+Recommends: flight-of-the-amazon-queen
 
-Depends: lure-of-the-temptress
+Recommends: lure-of-the-temptress
 
-Depends: nethack-console | nethack-x11 | nethack-lisp
+Recommends: nethack-console | nethack-x11 | nethack-lisp

+ 16 - 16
tasks/games-arcade

@@ -8,37 +8,37 @@ Description: Debian Jr. arcade games
  older players, or just poking randomly at the controls, depending
  on the game.
 
-Depends: 2048-qt
+Recommends: 2048-qt
 
-Depends: bambam
+Recommends: bambam
 
-Depends: bouncy
+Recommends: bouncy
 
-Depends: biniax2
+Recommends: biniax2
 
-Depends: childsplay
+Recommends: childsplay
 
-Depends: bugsquish, bumprace, circuslinux, cuyo, holotz-castle, koules
+Recommends: bugsquish, bumprace, circuslinux, cuyo, holotz-castle, koules
 
-Depends: fretsonfire
+Recommends: fretsonfire
 
-Depends: hannah
+Recommends: hannah
 
-Depends: heroes-sdl
+Recommends: heroes-sdl
 
-Depends: lbreakout2, madbomber, supertux, tuxmath, xsoldier
+Recommends: lbreakout2, madbomber, supertux, tuxmath, xsoldier
 
-Depends: funnyboat, vodovod
+Recommends: funnyboat, vodovod
 
-Depends: jumpnbump
+Recommends: jumpnbump
 
-Depends: monsterz
+Recommends: monsterz
 
-Depends: tuxpuck
+Recommends: tuxpuck
 
-Depends: gcompris
+Recommends: gcompris
 
-Depends: anagramarama
+Recommends: anagramarama
 Homepage: http://www.coralquest.com/anagramarama/
 License: GPL
 Responsible: Javier Galicia <javiergaliciaacm@gmail.com>

+ 5 - 5
tasks/games-card

@@ -5,14 +5,14 @@ Description: Debian Jr. Card Games
  the "memory" type games in pysol may appeal to children just entering
  grade school.
 
-Depends: ace-of-penguins
+Recommends: ace-of-penguins
 
-Depends: childsplay
+Recommends: childsplay
 
-Depends: pairs
+Recommends: pairs
 
-Depends: pysiogame
+Recommends: pysiogame
 
-Depends: xsol, spider, sgt-puzzles, kpat
+Recommends: xsol, spider, sgt-puzzles, kpat
 Why: Formerly pysol was suggested but this was removed see #540565 and
      solitaire suggested as an alternative

+ 6 - 6
tasks/games-gl

@@ -9,18 +9,18 @@ Description: Debian Jr. 3D Games (hardware acceleration required)
  standard blood-and-guts fare in the 3D games universe, all of
  these games are suitable for children.
 
-Depends: armagetronad, bzflag, gltron
+Recommends: armagetronad, bzflag, gltron
 
-Depends: bouncy
+Recommends: bouncy
 
-Depends: neverball, trackballs, supertuxkart, extremetuxracer
+Recommends: neverball, trackballs, supertuxkart, extremetuxracer
 
-Depends: torcs
+Recommends: torcs
 Why: Replacement for slune, see #521175
 
-Depends: tuxfootball
+Recommends: tuxfootball
 
-Depends: platinumarts-sandbox
+Recommends: platinumarts-sandbox
 Homepage: http://kids.platinumarts.net/
 License: free
 Pkg-Description: standalone 3D Game Maker and 3D Game Design program

+ 7 - 7
tasks/games-net

@@ -4,16 +4,16 @@ Description: Debian Jr. Network Games
  game and chat is a place where people learn languages, how to communicate, and
  socializing skills.
 
-Depends: bubbros
+Recommends: bubbros
 
-Depends: gcompris
+Recommends: gcompris
 
-Depends: gtetrinet | tetrinet-client
+Recommends: gtetrinet | tetrinet-client
 
-Depends: minetest
+Recommends: minetest
 
-Depends: openttd
+Recommends: openttd
 
-Depends: xpilot-ng
+Recommends: xpilot-ng
 
-Depends: xblast-tnt, xblast-tnt-levels, xblast-tnt-sounds, xblast-tnt-musics
+Recommends: xblast-tnt, xblast-tnt-levels, xblast-tnt-sounds, xblast-tnt-musics

+ 14 - 14
tasks/games-puzzle

@@ -5,31 +5,31 @@ Description: Debian Jr. Puzzle games
  This sampling of packages was done in the hope that it will appeal to child
  and adult alike.
 
-Depends: 2048-qt
+Recommends: 2048-qt
 
-Depends: amoebax
+Recommends: amoebax
 
-Depends: biniax2
+Recommends: biniax2
 
-Depends: berusky2
+Recommends: berusky2
 
-Depends: brainparty
+Recommends: brainparty
 
-Depends: frozen-bubble, gtans, lmemory, xjig
+Recommends: frozen-bubble, gtans, lmemory, xjig
 
-Depends: gbrainy
+Recommends: gbrainy
 
-Depends: gcompris
+Recommends: gcompris
 
-Depends: hex-a-hop
+Recommends: hex-a-hop
 
-Depends: monsterz
+Recommends: monsterz
 
-Depends: pysiogame
+Recommends: pysiogame
 
-Depends: ri-li
+Recommends: ri-li
 
-Depends: stegavorto
+Recommends: stegavorto
 Homepage: http://james.hamsterrepublic.com/?p=130
 Responsible: Miriam Ruiz <little_miry@yahoo.es>
 License: GPL
@@ -39,7 +39,7 @@ Pkg-Description: click on letters to spell out secret words
  game is inspired in something that the author dreamed. In it you'll have
  to show your ability finding letters in big texts.
 
-Depends: kartofel
+Recommends: kartofel
 Homepage: http://kartofel.jfedor.org
 Responsible: Miriam Ruiz <little_miry@yahoo.es>
 License: GPL

+ 12 - 12
tasks/games-sim

@@ -4,26 +4,26 @@ Description: Debian Jr. Simulation Games
  for older children, and even then some help from someone older may be
  needed.
 
-Depends: 0ad
+Recommends: 0ad
 
-Depends: freeciv-client-gtk | freeciv-client-sdl
+Recommends: freeciv-client-gtk | freeciv-client-sdl
 
-Depends: lincity-ng | lincity
+Recommends: lincity-ng | lincity
 
-Depends: freecol
+Recommends: freecol
 
-Depends: megaglest
+Recommends: megaglest
 
-Depends: micropolis
+Recommends: micropolis
 
-Depends: opencity
+Recommends: opencity
 
-Depends: openttd
+Recommends: openttd
 
-Depends: pingus
+Recommends: pingus
 
-Depends: ri-li
+Recommends: ri-li
 
-Depends: simutrans
+Recommends: simutrans
 
-Depends: wesnoth
+Recommends: wesnoth

+ 4 - 4
tasks/games-text

@@ -4,10 +4,10 @@ Description: Debian Jr. Text Games
  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
+Recommends: bsdgames, moon-buggy | moon-buggy-esd, nettoe, zivot
 
-Depends: animals
+Recommends: animals
 
-Depends: cowsay
+Recommends: cowsay
 
-Depends: sl
+Recommends: sl

+ 2 - 2
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.
 
-Depends: epiphany-browser | iceweasel
+Recommends: epiphany-browser | iceweasel
 
-Depends: pidgin
+Recommends: pidgin

+ 8 - 8
tasks/math

@@ -10,18 +10,18 @@ Description: Debian Jr. educational math
  package, e.g. bsdgames includes "arithmetic" in addition to other
  non-math games, and x11-apps provides xcalc.
 
-Depends: 2048-qt
+Recommends: 2048-qt
 
-Depends: bc, bsdgames, xaos, x11-apps, kig
+Recommends: bc, bsdgames, xaos, x11-apps, kig
 
-Depends: childsplay
+Recommends: childsplay
 
-Depends: gbrainy
+Recommends: gbrainy
 
-Depends: gcompris
+Recommends: gcompris
 
-Depends: numptyphysics
+Recommends: numptyphysics
 
-Depends: pysiogame
+Recommends: pysiogame
 
-Depends: tuxmath
+Recommends: tuxmath

+ 9 - 9
tasks/programming

@@ -20,23 +20,23 @@ Description: Debian Jr. programming
  complex projects. It is necessary to connect a physical Arduino circuit board
  in order to experiment with arduino.
 
-Depends: arduino
+Recommends: arduino
 
-Depends: gvrng, kturtle, littlewizard
+Recommends: gvrng, kturtle, littlewizard
 
-Depends: laby
+Recommends: laby
 
-Depends: puredata
+Recommends: puredata
 
-Depends: scratch
+Recommends: scratch
 
-Depends: sonic-pi
+Recommends: sonic-pi
 
-Depends: squeak-plugins-scratch
+Recommends: squeak-plugins-scratch
 
-Depends: squeak-vm
+Recommends: squeak-vm
 
-Depends: shoes | shoes4
+Recommends: shoes | shoes4
 Why: This package has existed in Debian but was removed due to lack of interest.
 Homepage: http://shoesrb.com/
 License: Expat

+ 9 - 9
tasks/sound

@@ -6,23 +6,23 @@ Description: Debian Jr. sound
  administrator can make use of them to ensure that the child
  gets the most out of their system.
 
-Depends: audacious, bplay, cdtool, pianobooster, vorbis-tools
+Recommends: audacious, bplay, cdtool, pianobooster, vorbis-tools
 
-Depends: gcompris
+Recommends: gcompris
 
-Depends: gespeaker
+Recommends: gespeaker
 
-Depends: hydrogen
+Recommends: hydrogen
 
-Depends: milkytracker
+Recommends: milkytracker
 
-Depends: puredata
+Recommends: puredata
 
-Depends: sonic-pi
+Recommends: sonic-pi
 
-Depends: tuxguitar
+Recommends: tuxguitar
 
-Depends: bloopsaphone
+Recommends: bloopsaphone
 Why: This should also go into programming
 Homepage: https://github.com/mental/bloopsaphone
 License: Expat

+ 4 - 4
tasks/system

@@ -25,10 +25,10 @@ Description: Debian Jr. System tools
  traffic as fishes, CPU usage as bubbles, and a duck representing a
  duck.
 
-Depends: bubblefishymon
+Recommends: bubblefishymon
 
-Depends: baobab
+Recommends: baobab
 
-Depends: hello
+Recommends: hello
 
-Depends: mc
+Recommends: mc

+ 9 - 9
tasks/toys

@@ -5,20 +5,20 @@ Description: Debian Jr. desktop toys
  collection contains some packages which might enjoy children and make
  them love their computer.
 
-Depends: cheese
+Recommends: cheese
 
-Depends: dasher
+Recommends: dasher
 
-Depends: gespeaker
+Recommends: gespeaker
 
-Depends: oneko, xfireworks, xfishtank, xpenguins, xteddy
+Recommends: oneko, xfireworks, xfishtank, xpenguins, xteddy
 
-Depends: xplanet, xplanet-images
+Recommends: xplanet, xplanet-images
 
-Depends: gamine
+Recommends: gamine
 
-Depends: gworldclock
+Recommends: gworldclock
 
-Depends: bambam
+Recommends: bambam
 
-Depends: bubblefishymon
+Recommends: bubblefishymon

+ 6 - 6
tasks/typing

@@ -5,14 +5,14 @@ Description: Debian Jr. typing
  in the hope that children become comfortable with the keyboard
  quickly while having fun learning it.
 
-Depends: bambam
+Recommends: bambam
 
-Depends: childsplay
+Recommends: childsplay
 
-Depends: tuxtype, gtypist
+Recommends: tuxtype, gtypist
 
-Depends: ktouch, klavaro
+Recommends: ktouch, klavaro
 
-Depends: gcompris
+Recommends: gcompris
 
-Depends: pysiogame
+Recommends: pysiogame

+ 4 - 4
tasks/video

@@ -2,13 +2,13 @@ Task: video
 Description: Debian Jr. Video
  Tools to watch video files, DVD, CD, network streams etc.
 
-Depends: cheese
+Recommends: cheese
 
-Depends: kaffeine
+Recommends: kaffeine
 
-Depends: vlc
+Recommends: vlc
 
-Depends: maim
+Recommends: maim
 Why: A screenshot program
 Homepage: https://github.com/naelstrof/maim
 License: GPL-3+

+ 5 - 5
tasks/writing

@@ -4,12 +4,12 @@ Description: Debian Jr. writing
  writer. It includes a text editor, spell-checker, dictionary client,
  word processor, and educational writing software.
 
-Depends: nano, dict, aspell, abiword
+Recommends: nano, dict, aspell, abiword
 
-Depends: dasher
+Recommends: dasher
 
-Depends: gcompris
+Recommends: gcompris
 
-Depends: pysiogame
+Recommends: pysiogame
 
-Depends: writetype
+Recommends: writetype