Explorar el Código

Prepare for release to unstable

Per Andersson hace 10 años
padre
commit
7998a5f98c
Se han modificado 3 ficheros con 175 adiciones y 149 borrados
  1. 125 111
      debian-junior-tasks.desc
  2. 1 1
      debian/changelog
  3. 49 37
      debian/control

+ 125 - 111
debian-junior-tasks.desc

@@ -15,21 +15,20 @@ Key:
  junior-art
 Packages: list
  cheese
- gimp
- tuxpaint
- xpaint
- inkscape
- mypaint
- mtpaint
  gamine
  gcompris
+ gimp
  gpaint
- karbon
- krita
+ inkscape
+ mypaint
+ pencil2d
  pinta
  pysiogame
  rgbpaint
  simple-scan
+ tupi
+ tuxpaint
+ xpaint
 
 Task: junior-doudou-base
 Section: debian-junior
@@ -46,43 +45,44 @@ Description: DoudouLinux base
  not yet create a real metapackage.
 Relevance: 10
 Packages: list
- dash
- bash-completion
- less
- tree
- ntpdate
  acpi-support-base
- avahi-discover
+ alsa-base
+ alsa-utils
  avahi-autoipd
- policykit-1
- policykit-1-gnome
- xdg-user-dirs-gtk
- yelp
- khelpcenter4
+ avahi-discover
+ bash-completion
+ cups-bsd
+ cups-pdf
+ dash
+ dnsmasq-base
  eject
- xserver-xorg-core
- xkb-data
- x11-xkb-utils
- xfonts-base
- x11-utils
- oxygencursors
+ gnome-keyring
  gtk2-engines
+ khelpcenter4
+ less
+ libgl1-mesa-dri
+ libgl1-mesa-glx
+ libpam-gnome-keyring
  lxappearance
- lxterminal
  lxrandr
+ lxterminal
  network-manager-gnome
- gnome-keyring
- libpam-gnome-keyring
- dnsmasq-base
- alsa-base
- alsa-utils
- gstreamer0.10-alsa
+ ntpdate
  oss-compat
+ oxygencursors
+ policykit-1
+ policykit-1-gnome
+ smbclient
  system-config-printer
  system-config-printer-udev
- cups-bsd
- smbclient
- cups-pdf
+ tree
+ x11-utils
+ x11-xkb-utils
+ xdg-user-dirs-gtk
+ xfonts-base
+ xkb-data
+ xserver-xorg-core
+ yelp
 
 Task: junior-doudou-dev-artists
 Section: debian-junior
@@ -118,35 +118,35 @@ Description: DoudouLinux Games
  not yet create a real metapackage.
 Relevance: 10
 Packages: list
- kolf
- pingus
- frozen-bubble
- hannah
- circuslinux
+ abe
+ biniax2
  burgerspace
- monsterz
+ ceferino
+ circuslinux
+ foobillard
+ freealchemist
+ frozen-bubble
+ gmchess
  gnome-games
  gnome-mastermind
- gweled
- tanglet
- gmchess
- gtans
- kigo
  gnugo
- freealchemist
+ gtans
+ gweled
+ hannah
  hex-a-hop
- numptyphysics
- toppler
- abe
- supertux
- nikwi
- ceferino
+ kigo
+ kolf
  lbreakout2
  magicor
- biniax2
- tworld
- foobillard
+ monsterz
+ nikwi
+ numptyphysics
+ pingus
+ supertux
  supertuxkart
+ tanglet
+ toppler
+ tworld
 
 Task: junior-education
 Section: debian-junior
@@ -160,14 +160,14 @@ Key:
  junior-education
 Packages: list
  atomix
- childsplay
- gcompris
- ktuberling
  bambam
+ fracplanet
  gbrainy
+ gcompris
+ ktuberling
  numptyphysics
- pysycache
  pysiogame
+ pysycache
  stellarium
  xball
  xmakemol
@@ -182,7 +182,6 @@ Relevance: 10
 Key: 
  junior-games-adventure
 Packages: list
- balazar3
  beneath-a-steel-sky
  drascula
  flight-of-the-amazon-queen
@@ -205,28 +204,28 @@ Key:
 Packages: list
  2048-qt
  bambam
- bouncy
  biniax2
- childsplay
+ bouncy
  bugsquish
  bumprace
  circuslinux
  cuyo
- holotz-castle
- koules
  fretsonfire
+ funnyboat
+ gcompris
  hannah
  heroes-sdl
+ holotz-castle
+ jumpnbump
+ koules
  lbreakout2
  madbomber
+ monsterz
  supertux
  tuxmath
- xsoldier
- funnyboat
- vodovod
- jumpnbump
- monsterz
  tuxpuck
+ vodovod
+ xsoldier
 
 Task: junior-games-card
 Section: debian-junior
@@ -240,12 +239,11 @@ Key:
  junior-games-card
 Packages: list
  ace-of-penguins
- childsplay
+ kpat
  pairs
  pysiogame
- xsol
  sgt-puzzles
- kpat
+ xsol
 
 Task: junior-games-gl
 Section: debian-junior
@@ -263,13 +261,14 @@ Key:
  junior-games-gl
 Packages: list
  armagetronad
+ bouncy
  bzflag
+ extremetuxracer
  gltron
- bouncy
  neverball
  supertuxkart
- extremetuxracer
  torcs
+ trackballs
  tuxfootball
 
 Task: junior-games-net
@@ -287,11 +286,11 @@ Packages: list
  gtetrinet
  minetest
  openttd
- xpilot-ng
  xblast-tnt
  xblast-tnt-levels
- xblast-tnt-sounds
  xblast-tnt-musics
+ xblast-tnt-sounds
+ xpilot-ng
 
 Task: junior-games-puzzle
 Section: debian-junior
@@ -306,19 +305,19 @@ Key:
 Packages: list
  2048-qt
  amoebax
- biniax2
  berusky2
+ biniax2
  brainparty
  frozen-bubble
- gtans
- lmemory
- xjig
  gbrainy
  gcompris
+ gtans
  hex-a-hop
+ lmemory
  monsterz
  pysiogame
  ri-li
+ xjig
 
 Task: junior-games-sim
 Section: debian-junior
@@ -330,9 +329,11 @@ Relevance: 10
 Key: 
  junior-games-sim
 Packages: list
+ 0ad
  freeciv-client-gtk
- lincity-ng
  freecol
+ lincity-ng
+ megaglest
  micropolis
  opencity
  openttd
@@ -351,13 +352,13 @@ Relevance: 10
 Key: 
  junior-games-text
 Packages: list
+ animals
  bsdgames
+ cowsay
  moon-buggy
  nettoe
- zivot
- animals
- cowsay
  sl
+ zivot
 
 Task: junior-internet
 Section: debian-junior
@@ -392,15 +393,14 @@ Packages: list
  2048-qt
  bc
  bsdgames
- xaos
- x11-apps
- kig
- childsplay
  gbrainy
  gcompris
+ kig
  numptyphysics
  pysiogame
  tuxmath
+ x11-apps
+ xaos
 
 Task: junior-programming
 Section: debian-junior
@@ -410,7 +410,7 @@ Description: Debian Jr. programming
  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 you are encouraged to explore other languages
- with children as well, even those 
+ with children as well; even those that are not specifically aimed for
  children.
  .
  The Logo language is specifically designed for children, with a strong
@@ -431,9 +431,11 @@ Packages: list
  arduino
  gvrng
  kturtle
- littlewizard
  laby
+ littlewizard
+ puredata
  scratch
+ sonic-pi
  squeak-plugins-scratch
  squeak-vm
 
@@ -452,10 +454,15 @@ Packages: list
  audacious
  bplay
  cdtool
- pianobooster
- vorbis-tools
  gcompris
+ gespeaker
  hydrogen
+ milkytracker
+ pianobooster
+ puredata
+ sonic-pi
+ tuxguitar
+ vorbis-tools
 
 Task: junior-system
 Section: debian-junior
@@ -474,17 +481,24 @@ Description: Debian Jr. System tools
  an example of how to invoke programs from the shell, specify switches,
  use the man page, and so on.
  .
- 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.
+ Baobab, the GNOME disk usage analyzer, enables the user to take a
+ visual trip into the hard drive contents. It can be a mesmerizing first
+ step, dvelving into the inner parts of the computer system. It serves
+ both as an educational tool about file systems and file contents/size
+ as well as a tool for analyzing what files are big if disk space is
+ scarce.
+ .
+ Bubblefishymon is a computer load monitor dockapp which shows network
+ traffic as fishes, CPU usage as bubbles, and a duck representing a
+ duck.
 Relevance: 10
 Key: 
  junior-system
 Packages: list
- mc
+ baobab
+ bubblefishymon
  hello
+ mc
 
 Task: junior-toys
 Section: debian-junior
@@ -496,18 +510,20 @@ Relevance: 10
 Key: 
  junior-toys
 Packages: list
+ bambam
+ bubblefishymon
  cheese
  dasher
+ gamine
+ gespeaker
+ gworldclock
  oneko
  xfireworks
  xfishtank
  xpenguins
- xteddy
  xplanet
  xplanet-images
- gamine
- gworldclock
- bambam
+ xteddy
 
 Task: junior-typing
 Section: debian-junior
@@ -521,13 +537,12 @@ Key:
  junior-typing
 Packages: list
  bambam
- childsplay
- tuxtype
+ gcompris
  gtypist
- ktouch
  klavaro
- gcompris
+ ktouch
  pysiogame
+ tuxtype
 
 Task: junior-video
 Section: debian-junior
@@ -538,7 +553,6 @@ Key:
  junior-video
 Packages: list
  cheese
- kaffeine
  vlc
 
 Task: junior-writing
@@ -551,12 +565,12 @@ Relevance: 10
 Key: 
  junior-writing
 Packages: list
- nano
- dict
- aspell
  abiword
+ aspell
  dasher
+ dict
  gcompris
+ nano
  pysiogame
  writetype
 

+ 1 - 1
debian/changelog

@@ -1,4 +1,4 @@
-debian-junior (1.25) UNRELEASED; urgency=medium
+debian-junior (1.25) unstable; urgency=medium
 
   * tasks/programming: Fix description. (Closes: 788483)
   * Bump Standards-Version to 3.9.7, no changes needed

+ 49 - 37
debian/control

@@ -7,9 +7,9 @@ Uploaders: Ben Armstrong <synrg@sanctuary.nslug.ns.ca>,
            Andreas Tille <tille@debian.org>,
            Per Andersson <avtobiff@debian.org>
 Build-Depends-Indep: debhelper, blends-dev (>= 0.6.92)
-Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/debianjr/debian-junior.git
-Vcs-Browser: http://anonscm.debian.org/cgit/debianjr/debian-junior.git/
+Standards-Version: 3.9.7
+Vcs-Git: https://anonscm.debian.org/git/debianjr/debian-junior.git
+Vcs-Browser: https://anonscm.debian.org/cgit/debianjr/debian-junior.git/
 Homepage: http://blends.debian.org/junior/tasks/
 
 Package: junior-tasks
@@ -41,17 +41,18 @@ Recommends: cheese,
  gimp,
  gpaint,
  inkscape,
- karbon,
- krita,
- mtpaint,
  mypaint,
+ pencil2d,
  pinta,
  pysiogame,
  rgbpaint,
  simple-scan,
+ tupi,
  tuxpaint,
  xpaint
-Suggests: pencil2d,
+Suggests: karbon,
+ krita,
+ mtpaint,
  tbo
 Description: Debian Jr. Art
  Tools for children to produce artwork.  The simplest of these is
@@ -70,7 +71,7 @@ Architecture: all
 Depends: junior-tasks (= ${binary:Version}), junior-config (= ${binary:Version})
 Recommends: atomix,
  bambam,
- childsplay,
+ fracplanet,
  gbrainy,
  gcompris,
  ktuberling,
@@ -80,7 +81,8 @@ Recommends: atomix,
  stellarium,
  xball,
  xmakemol | xmakemol-gl
-Suggests: kstars,
+Suggests: childsplay,
+ kstars,
  mathwar
 Description: Debian Jr. education applications
  This package includes a collection of educational programs
@@ -92,8 +94,7 @@ Package: junior-games-adventure
 Section: metapackages
 Architecture: all
 Depends: junior-tasks (= ${binary:Version}), junior-config (= ${binary:Version})
-Recommends: balazar3,
- beneath-a-steel-sky,
+Recommends: beneath-a-steel-sky,
  drascula,
  flight-of-the-amazon-queen,
  lure-of-the-temptress,
@@ -113,11 +114,11 @@ Recommends: 2048-qt,
  bouncy,
  bugsquish,
  bumprace,
- childsplay,
  circuslinux,
  cuyo,
  fretsonfire,
  funnyboat,
+ gcompris,
  hannah,
  heroes-sdl,
  holotz-castle,
@@ -132,7 +133,7 @@ Recommends: 2048-qt,
  vodovod,
  xsoldier
 Suggests: anagramarama,
- heroes-ggi
+ childsplay
 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
@@ -147,13 +148,13 @@ Section: metapackages
 Architecture: all
 Depends: junior-tasks (= ${binary:Version}), junior-config (= ${binary:Version})
 Recommends: ace-of-penguins,
- childsplay,
  kpat,
  pairs,
  pysiogame,
  sgt-puzzles,
  xsol
-Suggests: spider
+Suggests: childsplay,
+ spider
 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
@@ -172,9 +173,9 @@ Recommends: armagetronad,
  neverball,
  supertuxkart,
  torcs,
+ trackballs,
  tuxfootball
-Suggests: platinumarts-sandbox,
- trackballs
+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.
@@ -199,7 +200,6 @@ Recommends: bubbros,
  xblast-tnt-musics,
  xblast-tnt-sounds,
  xpilot-ng
-Suggests: pengupop
 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
@@ -236,9 +236,11 @@ Package: junior-games-sim
 Section: metapackages
 Architecture: all
 Depends: junior-tasks (= ${binary:Version}), junior-config (= ${binary:Version})
-Recommends: freeciv-client-gtk | freeciv-client-sdl,
+Recommends: 0ad,
+ freeciv-client-gtk | freeciv-client-sdl,
  freecol,
  lincity-ng | lincity,
+ megaglest,
  micropolis,
  opencity,
  openttd,
@@ -286,7 +288,6 @@ Depends: junior-tasks (= ${binary:Version}), junior-config (= ${binary:Version})
 Recommends: 2048-qt,
  bc,
  bsdgames,
- childsplay,
  gbrainy,
  gcompris,
  kig,
@@ -295,6 +296,7 @@ Recommends: 2048-qt,
  tuxmath,
  x11-apps,
  xaos
+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
@@ -315,7 +317,9 @@ Recommends: arduino,
  kturtle,
  laby,
  littlewizard,
+ puredata,
  scratch,
+ sonic-pi,
  squeak-plugins-scratch,
  squeak-vm
 Suggests: shoes,
@@ -326,7 +330,7 @@ Description: Debian Jr. programming
  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 you are encouraged to explore other languages
- with children as well, even those 
+ with children as well; even those that are not specifically aimed for
  children.
  .
  The Logo language is specifically designed for children, with a strong
@@ -349,13 +353,15 @@ Recommends: audacious,
  bplay,
  cdtool,
  gcompris,
+ gespeaker,
  hydrogen,
+ milkytracker,
  pianobooster,
+ puredata,
+ sonic-pi,
+ tuxguitar,
  vorbis-tools
-Suggests: bloopsaphone,
- espeak-gui,
- jokosher,
- rezound
+Suggests: bloopsaphone
 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
@@ -367,9 +373,10 @@ Package: junior-system
 Section: metapackages
 Architecture: all
 Depends: junior-tasks (= ${binary:Version}), junior-config (= ${binary:Version})
-Recommends: hello,
+Recommends: baobab,
+ bubblefishymon,
+ hello,
  mc
-Suggests: lavaps
 Description: Debian Jr. System tools
  This package includes a few tools for helping children learn about and
  use their system.
@@ -385,20 +392,27 @@ Description: Debian Jr. System tools
  an example of how to invoke programs from the shell, specify switches,
  use the man page, and so on.
  .
- 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.
+ Baobab, the GNOME disk usage analyzer, enables the user to take a
+ visual trip into the hard drive contents. It can be a mesmerizing first
+ step, dvelving into the inner parts of the computer system. It serves
+ both as an educational tool about file systems and file contents/size
+ as well as a tool for analyzing what files are big if disk space is
+ scarce.
+ .
+ Bubblefishymon is a computer load monitor dockapp which shows network
+ traffic as fishes, CPU usage as bubbles, and a duck representing a
+ duck.
 
 Package: junior-toys
 Section: games
 Architecture: all
 Depends: junior-tasks (= ${binary:Version}), junior-config (= ${binary:Version})
 Recommends: bambam,
+ bubblefishymon,
  cheese,
  dasher,
  gamine,
+ gespeaker,
  gworldclock,
  oneko,
  xfireworks,
@@ -407,8 +421,6 @@ Recommends: bambam,
  xplanet,
  xplanet-images,
  xteddy
-Suggests: espeak-gui,
- lletters
 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
@@ -419,13 +431,13 @@ Section: metapackages
 Architecture: all
 Depends: junior-tasks (= ${binary:Version}), junior-config (= ${binary:Version})
 Recommends: bambam,
- childsplay,
  gcompris,
  gtypist,
  klavaro,
  ktouch,
  pysiogame,
  tuxtype
+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
@@ -437,9 +449,9 @@ Section: metapackages
 Architecture: all
 Depends: junior-tasks (= ${binary:Version}), junior-config (= ${binary:Version})
 Recommends: cheese,
- kaffeine,
  vlc
-Suggests: maim
+Suggests: kaffeine,
+ maim
 Description: Debian Jr. Video
  Tools to watch video files, DVD, CD, network streams etc.