[debian-edu-commits] [Git][debian-edu/debian-edu][master] 9 commits: modified primary school

WolfgangSchweer gitlab at salsa.debian.org
Fri Nov 9 19:50:28 GMT 2018


WolfgangSchweer pushed to branch master at Debian Edu / debian-edu


Commits:
dab1558d by Deepanshu at 2018-11-09T17:36:08Z
modified primary school

- - - - -
2e653335 by Deepanshu at 2018-11-09T17:38:10Z
added prschool

- - - - -
38f45249 by Deepanshu at 2018-11-09T17:38:42Z
added secondary school

- - - - -
b5f01195 by Deepanshu at 2018-11-09T17:39:48Z
added highschool

- - - - -
ea0905ad by Wolfgang Schweer at 2018-11-09T17:53:20Z
Adjust task files modified/added by Deepanshu.

- - - - -
5c93522c by Wolfgang Schweer at 2018-11-09T18:08:36Z
Add changelog entry for Deepanshu Gajbhiye and my task file adjustments.

- - - - -
3ec2a30f by Wolfgang Schweer at 2018-11-09T19:42:44Z
debian/copyright: Add entries for tasks/{preschool,secondaryschool,highschool}.

- - - - -
a95048aa by Wolfgang Schweer at 2018-11-09T19:48:46Z
debian/control: Updated after running 'make dist'.

- - - - -
1ab449e4 by Wolfgang Schweer at 2018-11-09T19:49:13Z
Add changelog entries for last commits.

- - - - -


7 changed files:

- debian/changelog
- debian/control
- debian/copyright
- + tasks/highschool
- + tasks/preschool
- tasks/primaryschool
- + tasks/secondaryschool


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,19 @@
 debian-edu (2.10.42) UNRELEASED; urgency=medium
 
+  [ Holger Levsen ]
   * Use the new debhelper-compat(=11) notation and drop d/compat.
   * debian/control: Updated after running 'make dist'.
 
+  [ Deepanshu Gajbhiye ]
+  * Added new tasks: preschool, secondaryschool, highschool
+  * task/primaryschool: Updated recommended list of packages. (Closes: #905006)
+
+  [ Wolfgang Schweer ]
+  * Adjust task files modified/added by Deepanshu Gajbhiye.
+  * debian/copyright:
+    - Add entries for tasks/{preschool,secondaryschool,highschool}.
+  * debian/control: Updated after running 'make dist'.
+
  -- Holger Levsen <holger at debian.org>  Sat, 13 Oct 2018 18:53:48 +0100
 
 debian-edu (2.10.41) unstable; urgency=medium


=====================================
debian/control
=====================================
@@ -778,6 +778,32 @@ Description: Debian Edu graphics related applications
  This metapackage depends on various applications that can be used to
  teach graphics and pictural art.
 
+Package: education-highschool
+Section: metapackages
+Architecture: any
+Depends: ${misc:Depends},
+         education-tasks (= ${binary:Version})
+Recommends: calibre,
+            cantor,
+            chemtool,
+            education-menus,
+            fritzing,
+            inkscape,
+            kalzium,
+            kmplot,
+            ktouch,
+            kturtle,
+            lightspeed,
+            marble,
+            melting,
+            pencil2d,
+            rocs,
+            step,
+            yorick
+Description: Debian Edu applications for high school level
+ This metapackage depends on various applications that are recommended
+ for teaching students at high school level.
+
 Package: education-lang-da
 Section: metapackages
 Architecture: any
@@ -1214,13 +1240,13 @@ Recommends: education-menus,
             laby,
             planner,
             pysycache,
-            scratch,
             thonny,
             tilp2,
             vym
 Suggests: blinken,
           freeplane,
-          jclic
+          jclic,
+          scratch
 Description: Debian Edu miscellaneous applications for education
  This metapackage depends on miscellaneous applications that can be useful
  for teaching purposes.
@@ -1331,16 +1357,53 @@ Description: Debian Edu physics related applications
  This metapackage depends on various applications that can be used to
  teach physics.
 
+Package: education-preschool
+Section: metapackages
+Architecture: any
+Depends: ${misc:Depends},
+         education-tasks (= ${binary:Version})
+Recommends: blinken,
+            education-menus,
+            gamine,
+            gcompris-qt,
+            kanagram,
+            khangman,
+            klettres,
+            ktuberling,
+            tuxpaint
+Description: Debian Edu applications for pre school level
+ This metapackage depends on various applications that are recommended
+ for teaching students at pre school level.
+
 Package: education-primaryschool
 Section: metapackages
 Architecture: any
 Depends: ${misc:Depends},
          education-tasks (= ${binary:Version})
 Recommends: education-menus,
+            gcompris,
             gcompris-qt,
+            kalgebra,
+            kalzium,
+            kanagram,
+            kbruch,
+            kgeography,
+            khangman,
+            kig,
+            klettres,
+            kmplot,
+            kstars,
+            ktouch,
             ktuberling,
+            kturtle,
+            kwordquiz,
+            marble,
+            parley,
+            ri-li,
+            step,
             tuxmath,
-            tuxpaint
+            tuxpaint,
+            tuxtype
 Description: Debian Edu applications for primary school level
  This metapackage depends on various applications that are recommended
  for teaching students at primary school level.
@@ -1365,6 +1428,39 @@ Description: Debian Edu roaming workstation packages
  networked workstation installations in the Debian Edu Blend where the
  client might go offine once in a while.
 
+Package: education-secondaryschool
+Section: metapackages
+Architecture: any
+Depends: ${misc:Depends},
+         education-tasks (= ${binary:Version})
+Recommends: calibre,
+            chemtool,
+            education-menus,
+            einstein,
+            fritzing,
+            inkscape,
+            kalgebra,
+            kalzium,
+            kbruch,
+            kgeography,
+            kig,
+            kmplot,
+            kstars,
+            ktouch,
+            ktuberling,
+            kturtle,
+            kwordquiz,
+            lightspeed,
+            marble,
+            melting,
+            parley,
+            pencil2d,
+            ri-li,
+            step
+Description: Debian Edu applications for Secondary school level
+ This metapackage depends on various applications that are recommended
+ for teaching students at Secondary school level.
+
 Package: education-standalone
 Section: metapackages
 Architecture: any


=====================================
debian/copyright
=====================================
@@ -90,7 +90,10 @@ Files: debian/*
  tasks/standalone
  tasks/lang-da
  tasks/misc
+ tasks/preschool
  tasks/primaryschool
+ tasks/secondaryschool
+ tasks/highschool
  tasks/desktop-other
  tasks/networked
  tasks/language


=====================================
tasks/highschool
=====================================
@@ -0,0 +1,30 @@
+Format: https://blends.debian.org/blends/1.1
+Task: High-School
+Section: metapackages
+Leaf: false
+Architecture: any
+Description: Debian Edu applications for high school level
+ This metapackage depends on various applications that are recommended
+ for teaching students at high school level.
+
+Recommends:
+ education-menus,
+
+Recommends:
+ calibre,
+ cantor,
+ chemtool,
+ fritzing,
+ inkscape,
+ kalzium,
+ kmplot,
+ ktouch,
+ kturtle,
+ lightspeed,
+ marble,
+ melting,
+ pencil2d,
+ rocs,
+ step,
+ yorick
+


=====================================
tasks/preschool
=====================================
@@ -0,0 +1,24 @@
+Format: https://blends.debian.org/blends/1.1
+Task: Pre-School
+Section: metapackages
+Leaf: false
+Architecture: any
+Description: Debian Edu applications for pre school level
+ This metapackage depends on various applications that are recommended
+ for teaching students at pre school level.
+
+Recommends:
+ education-menus,
+
+Recommends:
+ gcompris-qt,
+
+Recommends:
+ blinken,
+ gamine,
+ kanagram,
+ khangman,
+ klettres,
+ ktuberling,
+ tuxpaint
+


=====================================
tasks/primaryschool
=====================================
@@ -17,4 +17,22 @@ Recommends:
  tuxmath,
  tuxpaint,
  ktuberling,
-
+ gcompris,
+ kalgebra,
+ kalzium,
+ kanagram,
+ kbruch,
+ kgeography,
+ khangman,
+ kig,
+ klettres,
+ kmplot,
+ kstars,
+ ktouch,
+ kturtle,
+ kwordquiz,
+ marble,
+ parley,
+ ri-li,
+ step,
+ tuxtype


=====================================
tasks/secondaryschool
=====================================
@@ -0,0 +1,37 @@
+Format: https://blends.debian.org/blends/1.1
+Task: Secondary-School
+Section: metapackages
+Leaf: false
+Architecture: any
+Description: Debian Edu applications for Secondary school level
+ This metapackage depends on various applications that are recommended
+ for teaching students at Secondary school level.
+
+Recommends:
+ education-menus,
+
+Recommends:
+ calibre,
+ chemtool,
+ einstein,
+ fritzing,
+ inkscape,
+ kalgebra,
+ kalzium,
+ kbruch,
+ kgeography,
+ kig,
+ kmplot,
+ kstars,
+ ktouch,
+ ktuberling,
+ kturtle,
+ kwordquiz,
+ lightspeed,
+ marble,
+ melting,
+ parley,
+ pencil2d,
+ ri-li,
+ step
+



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/31d545a0d0922cdf127c940ab899c1119b93ab3f...1ab449e4f230793e1f1e559b737e13e30b89517b

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/31d545a0d0922cdf127c940ab899c1119b93ab3f...1ab449e4f230793e1f1e559b737e13e30b89517b
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20181109/d137ade2/attachment-0001.html>


More information about the debian-edu-commits mailing list