Hello community, here is the log from the commit of package xfce4-branding-openSUSE for openSUSE:Factory checked in at Tue Oct 4 18:16:14 CEST 2011. -------- --- openSUSE:Factory/xfce4-branding-openSUSE/xfce4-branding-openSUSE.changes 2011-09-23 12:51:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/xfce4-branding-openSUSE/xfce4-branding-openSUSE.changes 2011-10-04 17:17:04.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Oct 4 14:53:54 UTC 2011 - gber@opensuse.org + +- fixed "Administration" menu for >= 12.1 (bnc#719826) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.x33BsM/_old 2011-10-04 18:16:10.000000000 +0200 +++ /var/tmp/diff_new_pack.x33BsM/_new 2011-10-04 18:16:10.000000000 +0200 @@ -174,6 +174,13 @@ >etc/xdg/autostart/xfce4-tips-autostart.desktop %install +%if 0%{?suse_version} > 1140 +rm -f etc/xdg/menus/xfce-applications.legacy.menu +%else +mv etc/xdg/menus/xfce-applications.legacy.menu \ + etc/xdg/menus/xfce-applications.menu +rm -f usr/share/desktop-directories/xfce-settings-system.directory +%endif find etc usr -depth -print | cpio -pvd %{buildroot} %clean @@ -220,6 +227,9 @@ %doc COPYING %dir %{_sysconfdir}/xdg/menus %config %{_sysconfdir}/xdg/menus/xfce-applications.menu +%if 0%{?suse_version} > 1140 +%{_datadir}/desktop-directories/xfce-settings-system.directory +%endif %files -n libxfce4ui-branding-openSUSE %defattr(-,root,root) ++++++ xfce4-branding-openSUSE-4.8.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.8.0/etc/xdg/menus/xfce-applications.legacy.menu new/xfce4-branding-openSUSE-4.8.0/etc/xdg/menus/xfce-applications.legacy.menu --- old/xfce4-branding-openSUSE-4.8.0/etc/xdg/menus/xfce-applications.legacy.menu 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.8.0/etc/xdg/menus/xfce-applications.legacy.menu 2011-10-04 16:48:42.000000000 +0200 @@ -0,0 +1,207 @@ +<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" + "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd"> + +<Menu> + <Name>Xfce</Name> + + <DefaultAppDirs/> + <DefaultDirectoryDirs/> + + <DefaultMergeDirs/> + + <Include> + <Filename>xfrun4.desktop</Filename> + <Filename>xfhelp4.desktop</Filename> + <Filename>xfce4-about.desktop</Filename> + <Filename>xfce4-session-logout.desktop</Filename> + </Include> + + <Layout> + <Merge type="all"/> + <Separator/> + <Menuname>Settings</Menuname> + <Separator/> + <Filename>xfrun4.desktop</Filename> + <Filename>xfhelp4.desktop</Filename> + <Filename>xfce4-about.desktop</Filename> + <Filename>xfce4-session-logout.desktop</Filename> + </Layout> + + <Menu> + <Name>Settings</Name> + <Directory>xfce-settings.directory</Directory> + + <Menu> + <Name>Preferences</Name> + <Directory>Settings.directory</Directory> + <Include> + <Category>Settings</Category> + </Include> + <Exclude> + <Category>System</Category> + <Category>X-XfceSettingsDialog</Category> + <Category>X-XFCE</Category> + </Exclude> + <Include> + <Filename>xfce-settings-manager.desktop</Filename> + </Include> + + <Layout> + <Filename>xfce-settings-manager.desktop</Filename> + <Separator/> + <Merge type="all"/> + </Layout> + </Menu> + + <Menu> + <Name>Administration</Name> + <Directory>Settings-System.directory</Directory> + <Include> + <And> + <Category>Settings</Category> + <Category>System</Category> + </And> + <Category>PackageManager</Category> + </Include> + <Exclude> + <Category>X-SuSE-YaST</Category> + </Exclude> + + <Layout> + <Merge type="all"/> + </Layout> + </Menu> + + <Layout> + <Menuname>Preferences</Menuname> + <Menuname>Administration</Menuname> + <Merge type="menus"/> + <Merge type="files"/> + </Layout> + </Menu> + + <Menu> + <Name>Accessories</Name> + <Directory>xfce-accessories.directory</Directory> + <Include> + <Or> + <Category>Accessibility</Category> + <Category>Core</Category> + <Category>Legacy</Category> + <Category>Utility</Category> + </Or> + </Include> + <Exclude> + <Category>Settings</Category> + <Category>DiscBurning</Category> + <Category>System</Category> + <Category>X-Xfce-Toplevel</Category> + </Exclude> + </Menu> + + <Menu> + <Name>Development</Name> + <Directory>xfce-development.directory</Directory> + <Include> + <Category>Development</Category> + </Include> + </Menu> + + <Menu> + <Name>Education</Name> + <Directory>xfce-education.directory</Directory> + <Include> + <Category>Education</Category> + </Include> + </Menu> + + <Menu> + <Name>Games</Name> + <Directory>xfce-games.directory</Directory> + <Include> + <Category>Game</Category> + </Include> + </Menu> + + <Menu> + <Name>Graphics</Name> + <Directory>xfce-graphics.directory</Directory> + <Include> + <Category>Graphics</Category> + </Include> + </Menu> + + <Menu> + <Name>Multimedia</Name> + <Directory>xfce-multimedia.directory</Directory> + <Include> + <Category>Audio</Category> + <Category>Video</Category> + <Category>AudioVideo</Category> + <Category>DiscBurning</Category> + </Include> + <Exclude> + <Category>Settings</Category> + </Exclude> + </Menu> + + <Menu> + <Name>Network</Name> + <Directory>xfce-network.directory</Directory> + <Include> + <Category>Network</Category> + </Include> + <Exclude> + <Category>X-Xfce-Toplevel</Category> + </Exclude> + </Menu> + + <Menu> + <Name>Office</Name> + <Directory>xfce-office.directory</Directory> + <Include> + <Category>Office</Category> + </Include> + </Menu> + + <Menu> + <Name>Science</Name> + <Directory>xfce-science.directory</Directory> + <Include> + <Category>Science</Category> + </Include> + </Menu> + + <Menu> + <Name>System</Name> + <Directory>xfce-system.directory</Directory> + <Include> + <And> + <Or> + <Category>Emulator</Category> + <Category>System</Category> + </Or> + <Not> + <Category>Settings</Category> + </Not> + </And> + </Include> + <Exclude> + <Category>X-Xfce-Toplevel</Category> + </Exclude> + </Menu> + + <Menu> + <Name>Other</Name> + <Directory>xfce-other.directory</Directory> + <OnlyUnallocated/> + <Include> + <All/> + </Include> + <Exclude> + <Category>Settings</Category> + <Category>X-Xfce-Toplevel</Category> + </Exclude> + </Menu> + +</Menu> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.8.0/etc/xdg/menus/xfce-applications.menu new/xfce4-branding-openSUSE-4.8.0/etc/xdg/menus/xfce-applications.menu --- old/xfce4-branding-openSUSE-4.8.0/etc/xdg/menus/xfce-applications.menu 2011-02-07 02:27:07.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.8.0/etc/xdg/menus/xfce-applications.menu 2011-10-04 16:52:04.000000000 +0200 @@ -55,7 +55,7 @@ <Menu> <Name>Administration</Name> - <Directory>Settings-System.directory</Directory> + <Directory>xfce-settings-system.directory</Directory> <Include> <And> <Category>Settings</Category> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.8.0/usr/share/desktop-directories/xfce-settings-system.directory new/xfce4-branding-openSUSE-4.8.0/usr/share/desktop-directories/xfce-settings-system.directory --- old/xfce4-branding-openSUSE-4.8.0/usr/share/desktop-directories/xfce-settings-system.directory 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.8.0/usr/share/desktop-directories/xfce-settings-system.directory 2011-10-04 16:48:58.000000000 +0200 @@ -0,0 +1,7 @@ +[Desktop Entry] +X-SuSE-translate=true +Type=Directory +Name=Administration +Comment=Change system-wide settings (affects all users) +Icon=preferences-system + continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org