<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
<title>
GitLab
</title>
<style>img {
max-width: 100%; height: auto;
}
</style>
</head>
<body>
<div class="content">
<h3>
WolfgangSchweer pushed to branch master
at <a href="https://salsa.debian.org/debian-edu/debian-edu">Debian Edu / debian-edu</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://salsa.debian.org/debian-edu/debian-edu/commit/c814de5e7116332a727d041e7edc7e994ef6ab69">c814de5e</a></strong>
<div>
<span>by Wolfgang Schweer</span>
<i>at 2018-12-06T13:11:34Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">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.
</pre>
</li>
<li>
<strong><a href="https://salsa.debian.org/debian-edu/debian-edu/commit/f4a6165423fb84d5f47cb632d3f3969db0282083">f4a61654</a></strong>
<div>
<span>by Wolfgang Schweer</span>
<i>at 2018-12-06T13:24:40Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Drop obsolete menus/kde-applications.menu file.
</pre>
</li>
<li>
<strong><a href="https://salsa.debian.org/debian-edu/debian-edu/commit/ff979ac7f634510c111b84f77e6e57ebd5505aa0">ff979ac7</a></strong>
<div>
<span>by Wolfgang Schweer</span>
<i>at 2018-12-06T13:25:56Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Drop obsolete menus/applications-merged/kde-essential.menu file
</pre>
</li>
<li>
<strong><a href="https://salsa.debian.org/debian-edu/debian-edu/commit/325184b07ddbf909af72902c1e774a62f4c03665">325184b0</a></strong>
<div>
<span>by Wolfgang Schweer</span>
<i>at 2018-12-06T13:27:33Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Add menus/kf5-applications.menu file as replacement for kde-applications.menu
</pre>
</li>
<li>
<strong><a href="https://salsa.debian.org/debian-edu/debian-edu/commit/324b96130ea698872be8d910bff8d5fd2865e0a5">324b9613</a></strong>
<div>
<span>by Wolfgang Schweer</span>
<i>at 2018-12-06T14:11:03Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Update menus/{gnome,mate}-applications.menu files.
</pre>
</li>
<li>
<strong><a href="https://salsa.debian.org/debian-edu/debian-edu/commit/e5633696b61a040f26c3ae8aca4ead4e00fd943e">e5633696</a></strong>
<div>
<span>by Wolfgang Schweer</span>
<i>at 2018-12-06T14:13:10Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Add files menus/{lxde,lxqt,xfce}-applications.menu to improve menu integration.
</pre>
</li>
<li>
<strong><a href="https://salsa.debian.org/debian-edu/debian-edu/commit/bc8d43c6e4d0fc74cc5fa494967b5520fd98eab2">bc8d43c6</a></strong>
<div>
<span>by Wolfgang Schweer</span>
<i>at 2018-12-06T14:16:36Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Add new category files menus/applications-merged/{game,science,video}.menu
</pre>
</li>
<li>
<strong><a href="https://salsa.debian.org/debian-edu/debian-edu/commit/af46db9a797157a462c88d95c08230a753a6a6c0">af46db9a</a></strong>
<div>
<span>by Wolfgang Schweer</span>
<i>at 2018-12-06T14:22:29Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Remove obsolete menu files (no related directory file).
Without a directory file (translations) the menu files are mostly useless.
</pre>
</li>
<li>
<strong><a href="https://salsa.debian.org/debian-edu/debian-edu/commit/ac08a8c373a4fea9c528c90bdbadbc43aea545f2">ac08a8c3</a></strong>
<div>
<span>by Wolfgang Schweer</span>
<i>at 2018-12-06T14:27:30Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Update all other files in the menus/applications-merged directory.
</pre>
</li>
<li>
<strong><a href="https://salsa.debian.org/debian-edu/debian-edu/commit/42d2a0e1f496edcdca132b609feff0ff2775628e">42d2a0e1</a></strong>
<div>
<span>by Wolfgang Schweer</span>
<i>at 2018-12-06T14:29:31Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Use Edu namespace for directory files to avoid conflicts with existing ones.
Also update and adjust already existing and renamed files.
</pre>
</li>
<li>
<strong><a href="https://salsa.debian.org/debian-edu/debian-edu/commit/c5eddba9dadf74d7e20ee794df55fd1fa4dc72cf">c5eddba9</a></strong>
<div>
<span>by Wolfgang Schweer</span>
<i>at 2018-12-06T14:32:36Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Update copyright information to reflect the changes.
</pre>
</li>
<li>
<strong><a href="https://salsa.debian.org/debian-edu/debian-edu/commit/694584b3eb63d841923abd09e1c00106f9d0716e">694584b3</a></strong>
<div>
<span>by Wolfgang Schweer</span>
<i>at 2018-12-06T14:34:00Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Remove all directory files that have been renamed.
</pre>
</li>
<li>
<strong><a href="https://salsa.debian.org/debian-edu/debian-edu/commit/435b4863fdc647d754a167ddc3041e7938caa4eb">435b4863</a></strong>
<div>
<span>by Wolfgang Schweer</span>
<i>at 2018-12-06T17:29:58Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Updated after running 'make dist'.
</pre>
</li>
<li>
<strong><a href="https://salsa.debian.org/debian-edu/debian-edu/commit/419763f35d86abce1511dbf642b8785a4db89d24">419763f3</a></strong>
<div>
<span>by Wolfgang Schweer</span>
<i>at 2018-12-06T17:30:35Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Document last commits in debian/changelog
</pre>
</li>
</ul>
<h4>30 changed files:</h4>
<ul>
<li class="file-stats">
<a href="#9c96da0e9f91d7d8937b69b524702c106258f0d1">
debian/changelog
</a>
</li>
<li class="file-stats">
<a href="#58ef006ab62b83b4bec5d81fe5b32c3b4c2d1cc2">
debian/control
</a>
</li>
<li class="file-stats">
<a href="#adb7f75f79e3bb85eb62912a2904c5d24af878fb">
debian/copyright
</a>
</li>
<li class="file-stats">
<a href="#36cdbe944d7dcb3f44f65152f0a97e95b84c62f7">
desktop-directories/DebianEdu.directory
</a>
</li>
<li class="file-stats">
<a href="#dc60c3b762dd4b7eb97b587c6cceec347f8cbaa2">
<span class="new-file">
+
desktop-directories/Edu-ArcadeGames.directory
</span>
</a>
</li>
<li class="file-stats">
<a href="#1098fad3ee5074787a20af5ab190916155a40454">
desktop-directories/Astronomy.directory
→
desktop-directories/Edu-Astronomy.directory
</a>
</li>
<li class="file-stats">
<a href="#265a71ed92d4ab285e8bf41676c6b2d8b5fc9662">
<span class="new-file">
+
desktop-directories/Edu-BoardGames.directory
</span>
</a>
</li>
<li class="file-stats">
<a href="#5991d2542246db9b659b32be0bc3d54b88ddd46d">
<span class="new-file">
+
desktop-directories/Edu-CardGames.directory
</span>
</a>
</li>
<li class="file-stats">
<a href="#f63bd4cc4b52aac0e405220354c242f0e98c778c">
desktop-directories/Chemistry.directory
→
desktop-directories/Edu-Chemistry.directory
</a>
</li>
<li class="file-stats">
<a href="#466ca5e7fa767b8f53e3647254247bf1bc1e72dd">
desktop-directories/ComputerScience.directory
→
desktop-directories/Edu-ComputerScience.directory
</a>
</li>
<li class="file-stats">
<a href="#6521a610df9af15a9adf1a43fbbaef833feac00c">
desktop-directories/Economy.directory
→
desktop-directories/Edu-Economy.directory
</a>
</li>
<li class="file-stats">
<a href="#c3f7ab37410eed8fe4ee37afe92aa6b42fba5d57">
desktop-directories/Electricity.directory
→
desktop-directories/Edu-Electricity.directory
</a>
</li>
<li class="file-stats">
<a href="#8ff0f8258c61b81768d78b3bc9a3742f53982aa2">
<span class="new-file">
+
desktop-directories/Edu-Game.directory
</span>
</a>
</li>
<li class="file-stats">
<a href="#669097ba6eb3001736b297a0fe4e7772ad839b14">
desktop-directories/Geography.directory
→
desktop-directories/Edu-Geography.directory
</a>
</li>
<li class="file-stats">
<a href="#73736b4537949b6f621fb164b2cac9670d3e3c20">
desktop-directories/Edu-Graphics.directory
</a>
</li>
<li class="file-stats">
<a href="#e6eeebdbdfb4f7ecc3d1e3c42a858673b8f64bd3">
desktop-directories/Kids.directory
→
desktop-directories/Edu-Kids.directory
</a>
</li>
<li class="file-stats">
<a href="#d38b3070c4b78e324096ff36a1c32825183f1621">
<span class="new-file">
+
desktop-directories/Edu-KidsGames.directory
</span>
</a>
</li>
<li class="file-stats">
<a href="#129bd61505b244a1735f05ce9c0f4edd33a02af4">
desktop-directories/Languages.directory
→
desktop-directories/Edu-Languages.directory
</a>
</li>
<li class="file-stats">
<a href="#19872c64924665196bec36f28a42d8dec598cbd2">
desktop-directories/Literature.directory
→
desktop-directories/Edu-Literature.directory
</a>
</li>
<li class="file-stats">
<a href="#9ae5499454f1798cea52a3d760f9e8a3ee5c8b7b">
<span class="new-file">
+
desktop-directories/Edu-LogicGames.directory
</span>
</a>
</li>
<li class="file-stats">
<a href="#ed406fbb477339625bd4cb1cd782c9fbc0baaca8">
desktop-directories/Mathematics.directory
→
desktop-directories/Edu-Mathematics.directory
</a>
</li>
<li class="file-stats">
<a href="#f677f45dd71f28e42564a581fd68e91610d84f9b">
desktop-directories/Miscellaneous.directory
→
desktop-directories/Edu-Miscellaneous.directory
</a>
</li>
<li class="file-stats">
<a href="#217c9fb25166a40bb5a05f3d2d6f71f8d08a968f">
desktop-directories/Music.directory
→
desktop-directories/Edu-Music.directory
</a>
</li>
<li class="file-stats">
<a href="#deef3e772f60fda8a3c12a29e3f8ee8b8c33f557">
desktop-directories/Physics.directory
→
desktop-directories/Edu-Physics.directory
</a>
</li>
<li class="file-stats">
<a href="#97918dae37b19eef4e7f5fe5e8ecbaabfe64d01d">
<span class="new-file">
+
desktop-directories/Edu-Science.directory
</span>
</a>
</li>
<li class="file-stats">
<a href="#0fb25de7693032990383e474538f39c1ee5eec8a">
<span class="new-file">
+
desktop-directories/Edu-StrategyGames.directory
</span>
</a>
</li>
<li class="file-stats">
<a href="#08e8357afab6c41d043b5a0643ec35f959eaedfb">
<span class="new-file">
+
desktop-directories/Edu-Video.directory
</span>
</a>
</li>
<li class="file-stats">
<a href="#a4332b356997f90011dba590d35565013c4a4b04">
<span class="deleted-file">
−
desktop-directories/Sports.directory
</span>
</a>
</li>
<li class="file-stats">
<a href="#1a134457b903c378b0a69767a77fd8add0c295fe">
<span class="deleted-file">
−
menus/applications-merged/art.menu
</span>
</a>
</li>
<li class="file-stats">
<a href="#32f93b67c24ed8083023e46925217a9d3de184e2">
menus/applications-merged/astronomy.menu
</a>
</li>
</ul>
<h5>The diff was not included because it is too large.</h5>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #777777;">
—
<br>
<a href="https://salsa.debian.org/debian-edu/debian-edu/compare/d1fb559b966cf51bbf3e5f6d1e7418c5fc7836f9...419763f35d86abce1511dbf642b8785a4db89d24">View it on GitLab</a>.
<br>
You're receiving this email because of your account on salsa.debian.org.
If you'd like to receive fewer emails, you can
adjust your notification settings.
</p>
</div>
</body>
</html>