Hello community,

here is the log from the commit of package xfce4-branding-openSUSE for 
openSUSE:Factory checked in at 2012-07-02 11:24:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfce4-branding-openSUSE (Old)
 and      /work/SRC/openSUSE:Factory/.xfce4-branding-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "xfce4-branding-openSUSE", Maintainer is "xfce-maintain...@suse.de"

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/xfce4-branding-openSUSE/xfce4-branding-openSUSE.changes
  2012-06-26 17:42:05.000000000 +0200
+++ 
/work/SRC/openSUSE:Factory/.xfce4-branding-openSUSE.new/xfce4-branding-openSUSE.changes
     2012-07-02 11:24:31.000000000 +0200
@@ -1,0 +2,6 @@
+Sun Jul  1 09:14:57 UTC 2012 - g...@opensuse.org
+
+- remove submenus below Settings which are accessible through the
+  xfce4-settings-manager
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xfce4-branding-openSUSE-4.10.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-applications.menu 
new/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-applications.menu
--- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-applications.menu     
2012-06-05 09:48:42.000000000 +0200
+++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-applications.menu     
2012-07-01 11:14:39.000000000 +0200
@@ -9,12 +9,6 @@
   <DefaultMergeDirs/>
 
   <Menu>
-    <Name>Settings</Name>
-    <Directory>xfce-settings.directory</Directory>
-    <MergeFile type="path">xfce-settings-manager.menu</MergeFile>
-  </Menu>
-
-  <Menu>
     <Name>Accessories</Name>
     <Directory>xfce-accessories.directory</Directory>
     <Include>
@@ -131,6 +125,21 @@
   </Menu>
 
   <Menu>
+    <Name>Settings</Name>
+    <Directory>xfce-settings.directory</Directory>
+    <Include>
+      <Filename>xfce-settings-manager.desktop</Filename>
+      <Filename>YaST.desktop</Filename>
+      <Filename>package-manager.desktop</Filename>
+    </Include>
+    <Layout>
+      <Filename>xfce-settings-manager.desktop</Filename>
+      <Filename>YaST.desktop</Filename>
+      <Filename>package-manager.desktop</Filename>
+    </Layout>
+  </Menu>
+
+  <Menu>
     <Name>Other</Name>
     <Directory>xfce-other.directory</Directory>
     <OnlyUnallocated/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-settings-manager.menu 
new/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-settings-manager.menu
--- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-settings-manager.menu 
2012-06-05 09:48:42.000000000 +0200
+++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-settings-manager.menu 
2012-07-01 11:14:44.000000000 +0200
@@ -96,14 +96,7 @@
     </Exclude>
   </Menu>
 
-  <Include>
-    <Filename>xfce-settings-manager.desktop</Filename>
-    <Filename>YaST.desktop</Filename>
-  </Include>
-
   <Layout>
-    <Merge type="files"/>
-    <Separator/>
     <Menuname>Personal</Menuname>
     <Menuname>Hardware</Menuname>
     <Menuname>System</Menuname>

++++++ xfce4-branding-openSUSE_11.4-4.10.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-applications.menu 
new/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-applications.menu
--- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-applications.menu     
2012-04-14 18:00:12.000000000 +0200
+++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-applications.menu     
2012-07-01 11:13:27.000000000 +0200
@@ -9,12 +9,6 @@
   <DefaultMergeDirs/>
 
   <Menu>
-    <Name>Settings</Name>
-    <Directory>xfce-settings.directory</Directory>
-    <MergeFile type="path">xfce-settings-manager.menu</MergeFile>
-  </Menu>
-
-  <Menu>
     <Name>Accessories</Name>
     <Directory>xfce-accessories.directory</Directory>
     <Include>
@@ -131,6 +125,21 @@
   </Menu>
 
   <Menu>
+    <Name>Settings</Name>
+    <Directory>xfce-settings.directory</Directory>
+    <Include>
+      <Filename>xfce-settings-manager.desktop</Filename>
+      <Filename>YaST.desktop</Filename>
+      <Filename>package-manager.desktop</Filename>
+    </Include>
+    <Layout>
+      <Filename>xfce-settings-manager.desktop</Filename>
+      <Filename>YaST.desktop</Filename>
+      <Filename>package-manager.desktop</Filename>
+    </Layout>
+  </Menu>
+
+  <Menu>
     <Name>Other</Name>
     <Directory>xfce-other.directory</Directory>
     <OnlyUnallocated/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-settings-manager.menu 
new/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-settings-manager.menu
--- old/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-settings-manager.menu 
2012-04-20 22:21:19.000000000 +0200
+++ new/xfce4-branding-openSUSE-4.10.0/etc/xdg/menus/xfce-settings-manager.menu 
2012-07-01 11:13:59.000000000 +0200
@@ -96,14 +96,7 @@
     </Exclude>
   </Menu>
 
-  <Include>
-    <Filename>xfce-settings-manager.desktop</Filename>
-    <Filename>YaST.desktop</Filename>
-  </Include>
-
   <Layout>
-    <Merge type="files"/>
-    <Separator/>
     <Menuname>Personal</Menuname>
     <Menuname>Hardware</Menuname>
     <Menuname>System</Menuname>

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to