Hello community,
here is the log from the commit of package xfce4-branding-openSUSE for
openSUSE:Factory checked in at 2020-01-10 17:49:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfce4-branding-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.xfce4-branding-openSUSE.new.6675 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-branding-openSUSE"
Fri Jan 10 17:49:40 2020 rev:78 rq:762639 version:4.14+20200110
Changes:
--------
---
/work/SRC/openSUSE:Factory/xfce4-branding-openSUSE/xfce4-branding-openSUSE.changes
2019-12-31 15:49:12.856355188 +0100
+++
/work/SRC/openSUSE:Factory/.xfce4-branding-openSUSE.new.6675/xfce4-branding-openSUSE.changes
2020-01-10 17:49:46.894132447 +0100
@@ -1,0 +2,7 @@
+Fri Jan 10 07:17:47 UTC 2020 - [email protected]
+
+- Update to version 4.14+20200110:
+ * Improved application menus default structure
+ * Add a README based on the one from branding
+
+-------------------------------------------------------------------
Old:
----
xfce4-branding-openSUSE-4.14+20191230.tar.xz
New:
----
xfce4-branding-openSUSE-4.14+20200110.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce4-branding-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.0PkI7i/_old 2020-01-10 17:49:49.494131983 +0100
+++ /var/tmp/diff_new_pack.0PkI7i/_new 2020-01-10 17:49:49.494131983 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xfce4-branding-openSUSE
#
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -33,7 +33,7 @@
%define thunar_volman_version %(rpm -q --queryformat '%%{VERSION}'
thunar-volman)
Name: xfce4-branding-openSUSE
-Version: 4.14+20191230
+Version: 4.14+20200110
Release: 0
Summary: openSUSE Branding of the Xfce Desktop Environment
License: CC-BY-SA-3.0 AND GPL-2.0-or-later
@@ -329,7 +329,9 @@
%files -n libgarcon-branding-openSUSE
%license COPYING
%dir %{_sysconfdir}/xdg/menus
+%dir %{_datadir}/desktop-directories
%config %{_sysconfdir}/xdg/menus/xfce-applications.menu
+%{_datadir}/desktop-directories/YaST.directory
%files -n libxfce4ui-branding-openSUSE
%license COPYING
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.0PkI7i/_old 2020-01-10 17:49:49.518131979 +0100
+++ /var/tmp/diff_new_pack.0PkI7i/_new 2020-01-10 17:49:49.518131979 +0100
@@ -1,4 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/xfce4-branding-openSUSE.git</param>
- <param
name="changesrevision">9c42d6bdb31cd56296dbdbbf0f4106b7ffff6b77</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">b0a749c5c72e1e0c67fc9e365035d971555f1438</param></service><service
name="tar_scm">
+ <param
name="url">https://github.com/Mau-G/xfce4-branding-openSUSE.git</param>
+ <param
name="changesrevision">b0a749c5c72e1e0c67fc9e365035d971555f1438</param></service></servicedata>
\ No newline at end of file
++++++ xfce4-branding-openSUSE-4.14+20191230.tar.xz ->
xfce4-branding-openSUSE-4.14+20200110.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-branding-openSUSE-4.14+20191230/README.md
new/xfce4-branding-openSUSE-4.14+20200110/README.md
--- old/xfce4-branding-openSUSE-4.14+20191230/README.md 1970-01-01
01:00:00.000000000 +0100
+++ new/xfce4-branding-openSUSE-4.14+20200110/README.md 2020-01-10
08:11:11.000000000 +0100
@@ -0,0 +1,55 @@
+This repo contains the openSUSE defaults and branding modifications
+of the Xfce desktop.
+
+If you want to work on modifications for a new release, please create a
+branch based on the latest version, make your changes there and push
+it as new branch to github.
+
+Do not rebase the history - the repository becomes too large otherwise
+and we need to be able to deleted old branches at times.
+
+-----------------------------------------------------------------------
+
+Working with this repo in GitHub
+------------------------------------
+
+On github concepts: origin links to your forked repository and we
+standardized the name of the original to upstream by convention.
+
+First, create a fork of the repo, following this guide:
+https://help.github.com/articles/fork-a-repo
+
+Then clone your fork to your PC:
+
+ git clone
https://github.com/$YOUR_GITHUB_ACCOUNT/xfce4-branding-openSUSE.git
+
+and add the original repository as remote:
+
+ cd xfce4-branding-openSUSE
+ git remote add upstream
https://github.com/openSUSE/xfce4-branding-openSUSE.git
+
+Fetch the original content and checkout/merge the branch you want to work on:
+
+ git fetch upstream
+ git checkout -b 4.14
+ git merge upstream 4.14
+
+Now you can work with your local branch as you normally would.
+
+To commit your changes to your fork, do:
+
+ git commit -m "A useful description (eventually boo#NR) describing what
changed"
+(use -a if all the changes are relatives to the same commit)
+
+ git push
+This will update your repository fork.
+
+Then you can create a pull request, as described here:
+https://help.github.com/articles/creating-a-pull-request
+
+If you want to sync with upstream changes, do a:
+
+ git fetch upstream
+ git merge upstream 4.14
+
+(this is doing manually what git pull will do when set up)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-branding-openSUSE-4.14+20191230/base/etc/xdg/menus/xfce-applications.menu
new/xfce4-branding-openSUSE-4.14+20200110/base/etc/xdg/menus/xfce-applications.menu
---
old/xfce4-branding-openSUSE-4.14+20191230/base/etc/xdg/menus/xfce-applications.menu
2019-12-30 00:25:08.000000000 +0100
+++
new/xfce4-branding-openSUSE-4.14+20200110/base/etc/xdg/menus/xfce-applications.menu
2020-01-10 08:11:11.000000000 +0100
@@ -2,180 +2,183 @@
"http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd";>
<Menu>
- <Name>Xfce</Name>
+ <Name>Xfce</Name>
- <DefaultAppDirs/>
- <DefaultDirectoryDirs/>
- <DefaultMergeDirs/>
-
- <Include>
- <Category>X-Xfce-Toplevel</Category>
- </Include>
-
- <Menu>
- <Name>Accessories</Name>
- <Directory>xfce-accessories.directory</Directory>
- <Include>
- <And>
- <Or>
- <Category>Accessibility</Category>
- <Category>Core</Category>
- <Category>Legacy</Category>
- <Category>Utility</Category>
- </Or>
- <Not>
- <Or>
- <Category>DiscBurning</Category>
- <Category>System</Category>
- </Or>
- </Not>
- </And>
- </Include>
- <Exclude>
- <Category>X-Xfce-Toplevel</Category>
- <Category>Settings</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>
+ <DefaultAppDirs/>
+ <DefaultDirectoryDirs/>
+ <DefaultMergeDirs/>
- <Menu>
- <Name>Games</Name>
- <Directory>xfce-games.directory</Directory>
<Include>
- <Category>Game</Category>
+ <Category>X-Xfce-Toplevel</Category>
+ <Filename>org.opensuse.YaST.desktop</Filename>
+ <Filename>YaST.desktop</Filename>
+ <Filename>org.opensuse.yast.Packager.desktop</Filename>
+ <Filename>yast2-packager.desktop</Filename>
</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>
- <Or>
- <Category>Audio</Category>
- <Category>Video</Category>
- <Category>AudioVideo</Category>
- <Category>DiscBurning</Category>
- </Or>
- </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>
- <Or>
- <Category>Emulator</Category>
- <Category>System</Category>
- </Or>
- </Include>
- <Exclude>
- <Category>X-Xfce-Toplevel</Category>
- <Category>Settings</Category>
- <Category>PackageManager</Category>
- </Exclude>
- </Menu>
-
- <Menu>
- <Name>Settings</Name>
- <Directory>xfce-settings.directory</Directory>
- <Include>
- <Filename>xfce-settings-manager.desktop</Filename>
- <Filename>YaST.desktop</Filename>
- <Filename>org.opensuse.YaST.desktop</Filename>
- <Filename>yast2-packager.desktop</Filename>
- <Filename>org.opensuse.yast.Packager.desktop</Filename>
- </Include>
<Layout>
- <Filename>xfce-settings-manager.desktop</Filename>
- <Filename>YaST.desktop</Filename>
- <Filename>org.opensuse.YaST.desktop</Filename>
- <Filename>yast2-packager.desktop</Filename>
- <Filename>org.opensuse.yast.Packager.desktop</Filename>
+ <Filename>xfce4-run.desktop</Filename>
+ <Separator/>
+ <Filename>exo-terminal-emulator.desktop</Filename>
+ <Filename>exo-file-manager.desktop</Filename>
+ <Filename>exo-mail-reader.desktop</Filename>
+ <Filename>exo-web-browser.desktop</Filename>
+ <Filename>org.opensuse.YaST.desktop</Filename>
+ <Filename>org.opensuse.yast.Packager.desktop</Filename>
+ <Separator/>
+ <Menuname>Settings</Menuname>
+ <Separator/>
+ <Merge type="all"/>
+ <Separator/>
+ <Filename>xfce4-about.desktop</Filename>
+ <Filename>xfce4-session-logout.desktop</Filename>
</Layout>
- </Menu>
- <Menu>
- <Name>Other</Name>
- <Directory>xfce-other.directory</Directory>
- <OnlyUnallocated/>
- <Include>
- <All/>
- </Include>
- <Exclude>
- <Category>Settings</Category>
- <Category>PackageManager</Category>
- <Category>X-Xfce-Toplevel</Category>
- </Exclude>
- </Menu>
-
- <Include>
- <Filename>xfce4-run.desktop</Filename>
- <Filename>xfce4-about.desktop</Filename>
- <Filename>xfce4-session-logout.desktop</Filename>
- </Include>
-
- <Layout>
- <Merge type="menus"/>
- <Menuname>Other</Menuname>
- <Separator/>
- <Menuname>Settings</Menuname>
- <Separator/>
- <Merge type="files"/>
- <Filename>xfce4-run.desktop</Filename>
- <Filename>xfce4-about.desktop</Filename>
- <Filename>xfce4-session-logout.desktop</Filename>
- </Layout>
+ <Menu>
+ <Name>Settings</Name>
+ <Directory>xfce-settings.directory</Directory>
+ <Include>
+ <Category>Settings</Category>
+ </Include>
+ <Exclude>
+ <Category>X-SuSE-YaST</Category>
+ </Exclude>
+
+ <Layout>
+ <Filename>xfce-settings-manager.desktop</Filename>
+ <Separator/>
+ <Merge type="all"/>
+ </Layout>
+
+ <Menu>
+ <Name>Screensavers</Name>
+ <Directory>xfce-screensavers.directory</Directory>
+ <Include>
+ <Category>Screensaver</Category>
+ </Include>
+ </Menu>
+ </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>
+ <Or>
+ <Filename>exo-file-manager.desktop</Filename>
+ <Filename>exo-terminal-emulator.desktop</Filename>
+ <Filename>xfce4-about.desktop</Filename>
+ <Filename>xfce4-run.desktop</Filename>
+ </Or>
+ </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>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Network</Name>
+ <Directory>xfce-network.directory</Directory>
+ <Include>
+ <Category>Network</Category>
+ </Include>
+ <Exclude>
+ <Or>
+ <Filename>exo-mail-reader.desktop</Filename>
+ <Filename>exo-web-browser.desktop</Filename>
+ </Or>
+ </Exclude>
+ </Menu>
+
+ <Menu>
+ <Name>Office</Name>
+ <Directory>xfce-office.directory</Directory>
+ <Include>
+ <Category>Office</Category>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>System</Name>
+ <Directory>xfce-system.directory</Directory>
+ <Include>
+ <Or>
+ <Category>Emulator</Category>
+ <Category>System</Category>
+ </Or>
+ </Include>
+ <Exclude>
+ <Or>
+ <Category>X-SuSE-YaST</Category>
+ <Filename>org.opensuse.YaST.desktop</Filename>
+ <Filename>YaST.desktop</Filename>
+ <Filename>xfce4-session-logout.desktop</Filename>
+ </Or>
+ </Exclude>
+ </Menu>
+
+ <Menu>
+ <Name>YaST</Name>
+ <Directory>YaST.directory</Directory>
+ <Include>
+ <Category>X-SuSE-YaST</Category>
+ <Filename>org.opensuse.YaST.desktop</Filename>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Other</Name>
+ <Directory>xfce-other.directory</Directory>
+ <OnlyUnallocated/>
+ <Include>
+ <All/>
+ </Include>
+ </Menu>
+
</Menu>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-branding-openSUSE-4.14+20191230/base/etc/xdg/menus/xfce-settings-manager.menu
new/xfce4-branding-openSUSE-4.14+20200110/base/etc/xdg/menus/xfce-settings-manager.menu
---
old/xfce4-branding-openSUSE-4.14+20191230/base/etc/xdg/menus/xfce-settings-manager.menu
2019-12-30 00:25:08.000000000 +0100
+++
new/xfce4-branding-openSUSE-4.14+20200110/base/etc/xdg/menus/xfce-settings-manager.menu
2020-01-10 08:11:11.000000000 +0100
@@ -78,7 +78,6 @@
</Or>
</Not>
</And>
- <Category>PackageManager</Category>
</Or>
</Include>
</Menu>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-branding-openSUSE-4.14+20191230/base/etc/xdg/xfce4/whiskermenu/defaults.rc
new/xfce4-branding-openSUSE-4.14+20200110/base/etc/xdg/xfce4/whiskermenu/defaults.rc
---
old/xfce4-branding-openSUSE-4.14+20191230/base/etc/xdg/xfce4/whiskermenu/defaults.rc
2019-12-30 00:25:08.000000000 +0100
+++
new/xfce4-branding-openSUSE-4.14+20200110/base/etc/xdg/xfce4/whiskermenu/defaults.rc
2020-01-10 08:11:11.000000000 +0100
@@ -1,3 +1,4 @@
+favorites=exo-terminal-emulator.desktop,exo-file-manager.desktop,exo-mail-reader.desktop,exo-web-browser.desktop,org.opensuse.YaST.desktop,YaST.desktop,org.opensuse.yast.Packager.desktop,yast2-packager.desktop
button-title=\ Menu\
button-icon=xfce4-button-opensuse
show-button-title=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-branding-openSUSE-4.14+20191230/base/usr/share/desktop-directories/YaST.directory
new/xfce4-branding-openSUSE-4.14+20200110/base/usr/share/desktop-directories/YaST.directory
---
old/xfce4-branding-openSUSE-4.14+20191230/base/usr/share/desktop-directories/YaST.directory
1970-01-01 01:00:00.000000000 +0100
+++
new/xfce4-branding-openSUSE-4.14+20200110/base/usr/share/desktop-directories/YaST.directory
2020-01-10 08:11:11.000000000 +0100
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=YaST
+Type=Directory
+Icon=yast
+NoDisplay=false
+OnlyShowIn=XFCE;
++++++ xfce4-branding-openSUSE.obsinfo ++++++
--- /var/tmp/diff_new_pack.0PkI7i/_old 2020-01-10 17:49:49.666131952 +0100
+++ /var/tmp/diff_new_pack.0PkI7i/_new 2020-01-10 17:49:49.670131952 +0100
@@ -1,5 +1,5 @@
name: xfce4-branding-openSUSE
-version: 4.14+20191230
-mtime: 1577661908
-commit: 9c42d6bdb31cd56296dbdbbf0f4106b7ffff6b77
+version: 4.14+20200110
+mtime: 1578640271
+commit: 640452ba513c28e6a6de0d1334d0c34f84edf00c
