[debian-edu-commits] [Git][debian-edu/debian-edu][master] 14 commits: Adjust tasks/{preschool, primaryschool, misc} to better match categories.

[WolfgangSchweer]

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


Commits:
c814de5e by Wolfgang Schweer at 2018-12-06T13:11:34Z
Adjust tasks/{preschool,primaryschool,misc} to better match categories.

Add childsplay to tasks preschool and primaryschool.
Move pysycache from tasks/misc to tasks/preschool.
Drop Suggests on blinken from tasks/misc.
Drop gcompris from tasks/primaryschool as gcompris-qt is already recommended.

- - - - -
f4a61654 by Wolfgang Schweer at 2018-12-06T13:24:40Z
Drop obsolete menus/kde-applications.menu file.

- - - - -
ff979ac7 by Wolfgang Schweer at 2018-12-06T13:25:56Z
Drop obsolete menus/applications-merged/kde-essential.menu file

- - - - -
325184b0 by Wolfgang Schweer at 2018-12-06T13:27:33Z
Add menus/kf5-applications.menu file as replacement for kde-applications.menu

- - - - -
324b9613 by Wolfgang Schweer at 2018-12-06T14:11:03Z
Update menus/{gnome,mate}-applications.menu files.

- - - - -
e5633696 by Wolfgang Schweer at 2018-12-06T14:13:10Z
Add files menus/{lxde,lxqt,xfce}-applications.menu to improve menu integration.

- - - - -
bc8d43c6 by Wolfgang Schweer at 2018-12-06T14:16:36Z
Add new category files menus/applications-merged/{game,science,video}.menu

- - - - -
af46db9a by Wolfgang Schweer at 2018-12-06T14:22:29Z
Remove obsolete menu files (no related directory file).

Without a directory file (translations) the menu files are mostly useless.

- - - - -
ac08a8c3 by Wolfgang Schweer at 2018-12-06T14:27:30Z
Update all other files in the menus/applications-merged directory.

- - - - -
42d2a0e1 by Wolfgang Schweer at 2018-12-06T14:29:31Z
Use Edu namespace for directory files to avoid conflicts with existing ones.

Also update and adjust already existing and renamed files.

- - - - -
c5eddba9 by Wolfgang Schweer at 2018-12-06T14:32:36Z
Update copyright information to reflect the changes.

- - - - -
694584b3 by Wolfgang Schweer at 2018-12-06T14:34:00Z
Remove all directory files that have been renamed.

- - - - -
435b4863 by Wolfgang Schweer at 2018-12-06T17:29:58Z
Updated after running 'make dist'.

- - - - -
419763f3 by Wolfgang Schweer at 2018-12-06T17:30:35Z
Document last commits in debian/changelog

- - - - -


30 changed files:

- debian/changelog
- debian/control
- debian/copyright
- desktop-directories/DebianEdu.directory
- + desktop-directories/Edu-ArcadeGames.directory
- desktop-directories/Astronomy.directory → desktop-directories/Edu-Astronomy.directory
- + desktop-directories/Edu-BoardGames.directory
- + desktop-directories/Edu-CardGames.directory
- desktop-directories/Chemistry.directory → desktop-directories/Edu-Chemistry.directory
- desktop-directories/ComputerScience.directory → desktop-directories/Edu-ComputerScience.directory
- desktop-directories/Economy.directory → desktop-directories/Edu-Economy.directory
- desktop-directories/Electricity.directory → desktop-directories/Edu-Electricity.directory
- + desktop-directories/Edu-Game.directory
- desktop-directories/Geography.directory → desktop-directories/Edu-Geography.directory
- desktop-directories/Edu-Graphics.directory
- desktop-directories/Kids.directory → desktop-directories/Edu-Kids.directory
- + desktop-directories/Edu-KidsGames.directory
- desktop-directories/Languages.directory → desktop-directories/Edu-Languages.directory
- desktop-directories/Literature.directory → desktop-directories/Edu-Literature.directory
- + desktop-directories/Edu-LogicGames.directory
- desktop-directories/Mathematics.directory → desktop-directories/Edu-Mathematics.directory
- desktop-directories/Miscellaneous.directory → desktop-directories/Edu-Miscellaneous.directory
- desktop-directories/Music.directory → desktop-directories/Edu-Music.directory
- desktop-directories/Physics.directory → desktop-directories/Edu-Physics.directory
- + desktop-directories/Edu-Science.directory
- + desktop-directories/Edu-StrategyGames.directory
- + desktop-directories/Edu-Video.directory
- − desktop-directories/Sports.directory
- − menus/applications-merged/art.menu
- menus/applications-merged/astronomy.menu


The diff was not included because it is too large.


View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/d1fb559b966cf51bbf3e5f6d1e7418c5fc7836f9...419763f35d86abce1511dbf642b8785a4db89d24

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/d1fb559b966cf51bbf3e5f6d1e7418c5fc7836f9...419763f35d86abce1511dbf642b8785a4db89d24
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/20181206/9963b416/attachment.html>