Merge commit 'boyarsh/alt-desktop' into alt-desktop

branding.spec

@@ -7,7 +7,7 @@
 
 Name: branding-%brand-%theme
 Version: 5.0.0
-Release: alt18.1
+Release: alt19
 BuildArch: noarch
 
 BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu
@@ -20,8 +20,8 @@ BuildRequires: libqt4-devel
 BuildRequires: ImageMagick fontconfig bc
 
 %define Theme Desktop
-%define status ПРОТОТИП
-%define status_en Prototype
+%define status beta 
+%define status_en beta
 %define variants altlinux-office-desktop altlinux-office-server altlinux-lite
 
 Packager: Anton V. Boyarshinov <boyarsh at altlinux dot org>
@@ -147,11 +147,14 @@ KDE3 settings for %Brand %version %Theme
 Summary: GNOME settings for %Brand %version %Theme
 License: Distributable
 Group: Graphical desktop/KDE
+Requires: altlinux-menus
 Requires: gtk2-theme-mist
 Provides: gnome-theme-%brand-%theme = %version-%release
 Provides: metacity-theme-%brand-%theme = %version-%release
 Provides: metacity-theme
-Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-kde3-settings ";done )
+Provides: gnome-menus = 2.12
+Conflicts: gnome-menus > 2.12
+Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-gnome-settings ";done )
 
 %description gnome-settings
 GNOME settings for %Brand %version %Theme
@@ -259,7 +262,7 @@ install -m 644 *.rc "%buildroot/%_datadir/apps/ksplash/Themes/ALTLinux%Theme/"
 popd
 
 #gnome-settings
-%define XdgThemeName "%Brand %Theme'
+%define XdgThemeName %Brand %Theme
 pushd gnome-settings
 mkdir -p '%buildroot/%_datadir/themes/%XdgThemeName'
 mkdir -p '%buildroot/%_datadir/themes/%XdgThemeName/gtk-2.0'
@@ -267,6 +270,11 @@ install -m 644 gtkrc '%buildroot/%_datadir/themes/%XdgThemeName/gtk-2.0'
 mkdir -p '%buildroot/%_datadir/themes/%XdgThemeName/metacity-1'
 install -m 644 metacity-theme-1.xml '%buildroot/%_datadir/themes/%XdgThemeName/metacity-1/'
 install -m 644 index.theme '%buildroot/%_datadir/themes/%XdgThemeName/'
+mkdir -p '%buildroot/etc/gnome/xdg/menus/applications-merged/'
+install -m 644 applications.menu '%buildroot/etc/gnome/xdg/menus/applications-merged/'
+mkdir -p '%buildroot/etc/xdg/menus/'
+install -m 644 settings.menu '%buildroot/etc/xdg/menus/'
+cp -a skel/.gconf  '%buildroot/etc/skel/'
 popd
 
 #slideshow
@@ -351,6 +359,9 @@ echo $lang > lang
 
 %files gnome-settings
 %_datadir/themes/*
+/etc/gnome/xdg/menus/applications-merged/
+/etc/xdg/menus/*
+/etc/skel/.gconf
 
 %files slideshow
 /usr/share/install2/slideshow
@@ -361,6 +372,9 @@ echo $lang > lang
 %_desktopdir/*
 
 %changelog
+* Mon Aug 03 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt19
+- production images and slides
+
 * Thu Jun 25 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt18.1
 - titles removed from wallpater and installer 
 

gnome-settings/applications.menu

+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+
+<Menu>
+
+  <Name>Applications</Name>
+  <Directory>X-GNOME-Menu-Applications.directory</Directory>
+
+  <!-- Scan legacy dirs first, as later items take priority -->
+  <!-- <KDELegacyDirs/> -->
+  <LegacyDir>/etc/X11/applnk</LegacyDir>
+  <LegacyDir>/usr/share/gnome/apps</LegacyDir>
+
+  <!-- Read standard .directory and .desktop file locations -->
+  <!-- <DefaultAppDirs/> -->
+  <!-- <DefaultDirectoryDirs/> -->
+
+  <!-- Read in overrides and child menus from applications-merged/ -->
+  <!-- <DefaultMergeDirs/> -->
+
+  <!-- Accessories submenu -->
+  <Menu>
+    <Name>Accessories</Name>
+    <Directory>Utility.directory</Directory>
+    <Include>
+      <And>
+        <Category>Utility</Category>
+	<!-- Accessibility spec must have either the Utility or Settings
+	     category, and we display an accessibility submenu already for
+	     the ones that do not have Settings, so don't display accessibility
+	     applications here -->
+        <Not><Category>Accessibility</Category></Not>
+        <Not><Category>System</Category></Not>
+      </And>
+    </Include>
+  </Menu> <!-- End Accessories -->
+
+  <!-- Accessibility submenu -->
+  <Menu>
+    <Name>Universal Access</Name>
+    <Directory>Utility-Accessibility.directory</Directory>
+    <Include>
+      <And>
+        <Category>Accessibility</Category>
+        <Not><Category>Settings</Category></Not>
+      </And>
+    </Include>
+  </Menu> <!-- End Accessibility -->
+
+  <!-- Development Tools -->
+  <Menu>
+    <Name>Development</Name>
+    <Directory>Development.directory</Directory>
+    <Include>
+      <And>
+        <Category>Development</Category>
+      </And>
+      <Filename>emacs.desktop</Filename>
+    </Include>
+  </Menu> <!-- End Development Tools -->
+
+  <!-- Education -->
+  <Menu>
+    <Name>Education</Name>
+    <Directory>Education.directory</Directory>
+    <Include>
+      <And>
+        <Category>Education</Category>
+      </And>
+    </Include>
+  </Menu> <!-- End Education -->
+
+  <!-- Games -->
+  <Menu>
+    <Name>Games</Name>
+    <Directory>Game.directory</Directory>
+    <Include>
+      <And>
+        <Category>Game</Category>
+      </And>
+    </Include>
+  </Menu> <!-- End Games -->
+
+  <!-- Graphics -->
+  <Menu>
+    <Name>Graphics</Name>
+    <Directory>Graphics.directory</Directory>
+    <Include>
+      <And>
+        <Category>Graphics</Category>
+      </And>
+    </Include>
+  </Menu> <!-- End Graphics -->
+
+  <!-- Internet -->
+  <Menu>
+    <Name>Internet</Name>
+    <Directory>Network.directory</Directory>
+    <Include>
+      <And>
+        <Category>Network</Category>
+      </And>
+    </Include>
+  </Menu>   <!-- End Internet -->
+
+  <!-- Multimedia -->
+  <Menu>
+    <Name>Multimedia</Name>
+    <Directory>AudioVideo.directory</Directory>
+    <Include>
+      <And>
+        <Category>AudioVideo</Category>
+      </And>
+    </Include>
+  </Menu>   <!-- End Multimedia -->
+
+  <!-- Office -->
+  <Menu>
+    <Name>Office</Name>
+    <Directory>Office.directory</Directory>
+    <Include>
+      <And>
+        <Category>Office</Category>
+      </And>
+    </Include>
+  </Menu> <!-- End Office -->
+
+  <!-- System Tools-->
+  <Menu>
+    <Name>System</Name>
+    <Directory>System-Tools.directory</Directory>
+    <Include>
+      <And>
+        <Category>System</Category>
+        <Not><Category>Settings</Category></Not>
+      </And>
+    </Include>
+  </Menu>   <!-- End System Tools -->
+
+  <!-- Other -->
+  <Menu>
+    <Name>Other</Name>
+    <Directory>X-GNOME-Other.directory</Directory>
+    <OnlyUnallocated/>
+    <Include>
+      <And>
+        <Not><Category>Core</Category></Not>
+        <Not><Category>Settings</Category></Not>
+        <Not><Category>Screensaver</Category></Not>
+      </And>
+    </Include>
+  </Menu> <!-- End Other -->
+
+</Menu> <!-- End Applications -->

gnome-settings/settings.menu

+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+
+<Menu>
+
+  <Name>Desktop</Name>
+  <Directory>X-GNOME-Menu-System.directory</Directory>
+
+  <!-- Read standard .directory and .desktop file locations -->
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+
+  <!-- Read in overrides and child menus from applications-merged/ -->
+  <DefaultMergeDirs/>
+
+  <!-- Add a link to the control center -->
+  <Include>
+    <Filename>gnomecc.desktop</Filename>
+  </Include>
+
+  <!-- Merge in these other files as submenus -->
+  <Menu>
+    <Name>Preferences</Name>
+    <Directory>Settings.directory</Directory>
+    <Include>
+      <And>
+        <Category>Settings</Category>
+        <Not>
+          <Or>
+            <Category>System</Category>
+            <Filename>gnomecc.desktop</Filename>
+          </Or>
+        </Not>
+      </And>
+    </Include>
+  </Menu>
+
+  <!-- System Settings -->
+  <Menu>
+    <Name>Administration</Name>
+    <Directory>Settings-System.directory</Directory>
+    <Include>
+      <And>
+        <Category>Settings</Category>
+        <Category>System</Category>
+      </And>
+    </Include>
+  </Menu>     <!-- End System Settings -->
+
+  <Layout>
+    <Menuname>Preferences</Menuname>
+    <Menuname>Administration</Menuname>
+    <Merge type="menus"/>
+    <Merge type="files"/>
+  </Layout>
+
+</Menu> <!-- End Settings -->

gnome-settings/skel/.gconf/apps/panel/applets/applet_0/%gconf.xml

+<?xml version="1.0"?>
+<gconf>
+	<entry name="attached_toplevel_id" mtime="1247751374" schema="/schemas/apps/panel/objects/attached_toplevel_id"/>
+	<entry name="position" mtime="1247751374" schema="/schemas/apps/panel/objects/position" type="int" value="1088"/>
+	<entry name="use_menu_path" mtime="1247751374" schema="/schemas/apps/panel/objects/use_menu_path"/>
+	<entry name="action_type" mtime="1247751374" schema="/schemas/apps/panel/objects/action_type"/>
+	<entry name="toplevel_id" mtime="1247751374" schema="/schemas/apps/panel/objects/toplevel_id" type="string">
+		<stringvalue>top_panel</stringvalue>
+	</entry>
+	<entry name="tooltip" mtime="1247751374" schema="/schemas/apps/panel/objects/tooltip"/>
+	<entry name="use_custom_icon" mtime="1247751374" schema="/schemas/apps/panel/objects/use_custom_icon"/>
+	<entry name="object_type" mtime="1247751374" schema="/schemas/apps/panel/objects/object_type" type="string">
+		<stringvalue>bonobo-applet</stringvalue>
+	</entry>
+	<entry name="panel_right_stick" mtime="1247751374" schema="/schemas/apps/panel/objects/panel_right_stick" type="bool" value="false"/>
+	<entry name="locked" mtime="1247751374" schema="/schemas/apps/panel/objects/locked"/>
+	<entry name="custom_icon" mtime="1247751374" schema="/schemas/apps/panel/objects/custom_icon"/>
+	<entry name="bonobo_iid" mtime="1247751374" schema="/schemas/apps/panel/objects/bonobo_iid" type="string">
+		<stringvalue>OAFIID:GNOME_KeyboardApplet</stringvalue>
+	</entry>
+	<entry name="launcher_location" mtime="1247751374" schema="/schemas/apps/panel/objects/launcher_location"/>
+	<entry name="menu_path" mtime="1247751374" schema="/schemas/apps/panel/objects/menu_path"/>
+</gconf>