[debian-edu-commits] debian-edu/ 01/01: Rename Graphics.directory -> Edu-Graphics.directory (Closes: #846566). Related file menus/applications-merged/graphics.menu: Fix content.

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu.

commit dc6ba219a5c345d164b674100a9b4dddacd4acf7
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Fri Dec 2 16:59:26 2016 +0100

    Rename Graphics.directory -> Edu-Graphics.directory (Closes: #846566).
    Related file menus/applications-merged/graphics.menu: Fix content.
---
 debian/changelog                                        |  5 ++++-
 .../{Graphics.directory => Edu-Graphics.directory}      |  0
 menus/applications-merged/graphics.menu                 | 17 ++++++++++++-----
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 66f4c2f..2fba572 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
 debian-edu (1.916) UNRELEASED; urgency=medium
 
   [ Wolfgang Schweer ]
-  * Adjust (Graphics|Physics).directory files to use Debian Edu specific icons.
+  * Rename Graphics.directory -> Edu-Graphics.directory (Closes: #846566).
+  * Related file menus/applications-merged/graphics.menu: Fix content.
+  * Adjust (Edu-Graphics|Physics).directory files to use Debian Edu specific
+    icons.
   * Use alphabetical order for language entries in the Physics.directory file.
 
   [ Holger Levsen ]
diff --git a/desktop-directories/Graphics.directory b/desktop-directories/Edu-Graphics.directory
similarity index 100%
rename from desktop-directories/Graphics.directory
rename to desktop-directories/Edu-Graphics.directory
diff --git a/menus/applications-merged/graphics.menu b/menus/applications-merged/graphics.menu
index c4e5afb..fe44ed1 100644
--- a/menus/applications-merged/graphics.menu
+++ b/menus/applications-merged/graphics.menu
@@ -3,11 +3,18 @@
 <Menu>
   <Name>Applications</Name>
     <Menu>
-	<Name>Utilities</Name>
-	<Exclude>
-		<Filename>qcad.desktop</Filename>
-	</Exclude>
-    </Menu> <!-- End /usr/share/applnk/Utilities -->
+      <Name>Education</Name>
 
+        <Menu>
+          <Name>Graphics</Name>
+          <Directory>Edu-Graphics.directory</Directory>
+          <Include>
+            <And>
+              <Category>Graphics</Category>
+            </And>
+          </Include>
+       </Menu> <!-- End Graphics -->
 
+    
+    </Menu> <!-- End Education -->
 </Menu> <!-- End Applications -->

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu.git