← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gnome-menus/oneiric-201106291711

« back to all changes in this revision

Viewing changes to layout/settings.menu

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Moya, Josselin Mouette, Rodrigo Moya
  • Date: 2011-05-16 12:24:57 UTC
  • mfrom: (1.1.55 upstream) (2.1.14 experimental)
  • Revision ID: james.westby@ubuntu.com-20110516122457-xsdc47g3cj6d3cra
Tags: 3.0.0-0ubuntu1
[ Josselin Mouette ]
* Break alacarte < 0.13.2-2 (version without support for 
  settings.menu).

[ Rodrigo Moya ]
* Rebase on Debian, remaining Ubuntu changes:
* debian/control:
  - Use Standards-Version: 3.8.4
  - Depends: python-xdg for update-gnome-menus-cache
  - Add python-gmenu-dbg package
* debian/gnome-menus.triggers:
  - Add gmenucache trigger
* debian/gnome-menus.postinst:
  - Disable blacklist to not break old applications
* debian/update-gnome-menus-cache:
  - Script to update the menu cache
* debian/python-gmenu.postinst:
  - Add code to generate the menu cache
* debian/patches/06_menus_rename.patch:
  - Rename applications.menu to gnome-applications.menu
* debian/patches/09_app_install_entry.patch:
  - Include Software Center in menus
* debian/patches/22_desktop-cache.patch:
  - Support a desktop.<localename>.cache file in e. g.
    /usr/share/applications/ to speed up menu loading. Those
    are generated with update-gnome-menus-cache <dir>.
* debian/patches/23_add_inherited_gnome_session.patch:
  - Add inherited GNOME session
* debian/patches/*:
  - Add missing descriptions to Ubuntu-specific patches
* debian/patches/series:
  - Disable 01_default_prefix.patch, which is Debian specific

Show diffs side-by-side

added added

removed removed

Lines of Context:
layout/settings.menu
1
 
<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
2
 
 "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
3
 
 
4
 
<Menu>
5
 
 
6
 
  <Name>Desktop</Name>
7
 
  <Directory>X-GNOME-Menu-System.directory</Directory>
8
 
 
9
 
  <!-- Read standard .directory and .desktop file locations -->
10
 
  <DefaultAppDirs/>
11
 
  <DefaultDirectoryDirs/>
12
 
 
13
 
  <!-- Read in overrides and child menus from applications-merged/ -->
14
 
  <DefaultMergeDirs/>
15
 
 
16
 
  <!-- Add a link to the control center -->
17
 
  <Include>
18
 
    <Filename>gnomecc.desktop</Filename>
19
 
  </Include>
20
 
 
21
 
  <!-- Merge in these other files as submenus -->
22
 
  <Menu>
23
 
    <Name>Preferences</Name>
24
 
    <Directory>Settings.directory</Directory>
25
 
    <Include>
26
 
      <And>
27
 
        <Category>Settings</Category>
28
 
        <Not>
29
 
          <Or>
30
 
            <Category>System</Category>
31
 
            <Filename>gnomecc.desktop</Filename>
32
 
          </Or>
33
 
        </Not>
34
 
      </And>
35
 
    </Include>
36
 
  </Menu>
37
 
 
38
 
  <!-- System Settings -->
39
 
  <Menu>
40
 
    <Name>Administration</Name>
41
 
    <Directory>Settings-System.directory</Directory>
42
 
    <Include>
43
 
      <And>
44
 
        <Category>Settings</Category>
45
 
        <Category>System</Category>
46
 
      </And>
47
 
    </Include>
48
 
  </Menu>     <!-- End System Settings -->
49
 
 
50
 
  <Layout>
51
 
    <Menuname>Preferences</Menuname>
52
 
    <Menuname>Administration</Menuname>
53
 
    <Merge type="menus"/>
54
 
    <Merge type="files"/>
55
 
  </Layout>
56
 
 
57
 
</Menu> <!-- End Settings -->