[debian-edu-commits] debian-edu/ 03/06: go back to standard kde menu

[Alexander Alemayhu]

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

ccscanf-guest pushed a commit to annotated tag 0.412.0.edu.etch.1+svn35015
in repository debian-edu-config.

commit f9cd8860ea28ff785be887ea4a7dec9a4398bb47
Author: Steffen Joeris <white at debian.org>
Date:   Sun Jun 24 14:16:05 2007 +0000

    go back to standard kde menu
---
 debian/changelog                                   |   2 +
 .../etc/xdg/menus/applications-kmenuedit.menu      | 160 ---------------------
 2 files changed, 2 insertions(+), 160 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9747b87..e92dcca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ debian-edu-config (0.412.0.edu.etch.1+svn35006) unstable; urgency=low
   * Include updated Spanish start page (see skolelinux bug #1156)
     Thanks to José L. Redrejo
   * Delete old obsolete directories from the old kde-profile
+  * Make sure that the standard kde start menu is recognized and avoid
+    having an empty menu (Closes skolelinux bug #1199)
 
  -- Petter Reinholdtsen <pere at debian.org>  Sun, 24 Jun 2007 09:22:50 +0100
 
diff --git a/share/debian-edu/students/etc/xdg/menus/applications-kmenuedit.menu b/share/debian-edu/students/etc/xdg/menus/applications-kmenuedit.menu
deleted file mode 100644
index 9f05a12..0000000
--- a/share/debian-edu/students/etc/xdg/menus/applications-kmenuedit.menu
+++ /dev/null
@@ -1,160 +0,0 @@
-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-<Menu>
- <Exclude>
-  <Filename>kde-Kfind.desktop</Filename>
-  <Filename>kde-Help.desktop</Filename>
-  <Filename>kde-Home.desktop</Filename>
-  <Filename>kde-KControl.desktop</Filename>
-  <Filename>kde-adept_installer.desktop</Filename>
- </Exclude>
- <Menu>
-  <Name>Applications</Name>
-  <Deleted/>
- </Menu>
- <Menu>
-  <Name>Utilities</Name>
-  <Deleted/>
- </Menu>
- <Menu>
-  <Name>System</Name>
-  <Deleted/>
- </Menu>
- <Menu>
-  <Name>Settingsmenu</Name>
-  <Deleted/>
- </Menu>
- <Menu>
-  <Name>Science</Name>
-  <Deleted/>
- </Menu>
- <Menu>
-  <Name>Office</Name>
-  <Deleted/>
- </Menu>
- <Menu>
-  <Name>Multimedia</Name>
-  <Deleted/>
- </Menu>
- <Menu>
-  <Name>Internet</Name>
-  <Deleted/>
- </Menu>
- <Menu>
-  <Name>Graphics</Name>
-  <Deleted/>
- </Menu>
- <Menu>
-  <Name>Games</Name>
-  <Deleted/>
- </Menu>
- <Menu>
-  <Name>Edutainment</Name>
-  <Deleted/>
- </Menu>
- <Menu>
-  <Name>Development</Name>
-  <Deleted/>
- </Menu>
- <Menu>
-  <Name>Debian</Name>
-  <Deleted/>
- </Menu>
- <Menu>
-  <Name>msuic</Name>
-  <Directory>music.directory</Directory>
-  <Deleted/>
- </Menu>
- <Menu>
-  <Name>mathematics</Name>
-  <Directory>mathematics.directory</Directory>
-  <Include>
-   <Filename>kmplot.desktop</Filename>
-   <Filename>kbruch.desktop</Filename>
-   <Filename>kpercentage.desktop</Filename>
-  </Include>
-  <Exclude>
-   <Filename>kalzium.desktop</Filename>
-  </Exclude>
-  <Layout>
-   <Merge type="files" />
-   <Filename>kpercentage.desktop</Filename>
-   <Filename>kmplot.desktop</Filename>
-   <Filename>kbruch.desktop</Filename>
-  </Layout>
- </Menu>
- <Menu>
-  <Name>.hidden</Name>
-  <Include>
-   <Filename>kde-Kfind.desktop</Filename>
-   <Filename>kde-Help.desktop</Filename>
-   <Filename>kde-Home.desktop</Filename>
-   <Filename>kde-KControl.desktop</Filename>
-   <Filename>kde-adept_installer.desktop</Filename>
-   <Filename>kalzium.desktop</Filename>
-  </Include>
- </Menu>
- <Menu>
-  <Name>languages</Name>
-  <Directory>languages.directory</Directory>
-  <Include>
-   <Filename>klatin.desktop</Filename>
-   <Filename>kvoctrain.desktop</Filename>
-   <Filename>kwordquiz.desktop</Filename>
-  </Include>
-  <Layout>
-   <Merge type="files" />
-   <Filename>klatin.desktop</Filename>
-   <Filename>kvoctrain.desktop</Filename>
-   <Filename>kwordquiz.desktop</Filename>
-  </Layout>
- </Menu>
- <Menu>
-  <Name>science</Name>
-  <Layout>
-   <Merge type="files" />
-   <Filename>kstars.desktop</Filename>
-   <Filename>kalzium.desktop</Filename>
-  </Layout>
-  <Directory>science.directory</Directory>
-  <Include>
-   <Filename>kalzium.desktop</Filename>
-   <Filename>kstars.desktop</Filename>
-  </Include>
- </Menu>
- <Menu>
-  <Name>computer_science</Name>
-  <Directory>computer_science.directory</Directory>
-  <Include>
-   <Filename>kturtle.desktop</Filename>
-  </Include>
-  <Layout>
-   <Merge type="files" />
-   <Filename>kturtle.desktop</Filename>
-  </Layout>
- </Menu>
- <Layout>
-  <Merge type="menus" />
-  <Menuname>writing</Menuname>
-  <Menuname>creative work</Menuname>
-  <Menuname>computer_science</Menuname>
-  <Menuname>languages</Menuname>
-  <Menuname>science</Menuname>
-  <Menuname>mathematics</Menuname>
-  <Menuname>music</Menuname>
- </Layout>
- <Menu>
-  <Name>writing</Name>
-  <Layout>
-   <Merge type="files" />
-   <Filename>oowriter.desktop</Filename>
-   <Filename>ooimpress.desktop</Filename>
-   <Filename>oocalc.desktop</Filename>
-  </Layout>
-  <Directory>writing.directory</Directory>
-  <Include>
-   <Filename>oowriter.desktop</Filename>
-   <Filename>ooimpress.desktop</Filename>
-   <Filename>oocalc.desktop</Filename>
-  </Include>
- </Menu>
-</Menu>

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