Hello community,
here is the log from the commit of package lxde-common-branding-openSUSE for
openSUSE:Factory checked in at 2014-10-31 18:27:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lxde-common-branding-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.lxde-common-branding-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxde-common-branding-openSUSE"
Changes:
--------
---
/work/SRC/openSUSE:Factory/lxde-common-branding-openSUSE/lxde-common-branding-openSUSE.changes
2014-09-09 19:00:24.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.lxde-common-branding-openSUSE.new/lxde-common-branding-openSUSE.changes
2014-10-31 20:16:38.000000000 +0100
@@ -1,0 +2,28 @@
+Fri Oct 31 11:01:51 UTC 2014 - [email protected]
+
+- removed conflicting files.
+
+-------------------------------------------------------------------
+Fri Oct 24 20:35:41 UTC 2014 - [email protected]
+
+- upgrade openSUSE branding based on new upstream lxde-common
+ 0.99.0
+- removed patches:
+ * lxde-common-0.5.5-lxde-logout.patch
+ * lxde-common-0.5.5-lxpanel.patch
+ * lxde-common-0.5.5-openbox-menu.patch
+ * lxde-common-0.5.5-openbox-shortcut.patch
+ * lxde-common-0.5.5-openbox-titlebar-font.patch
+ * lxde-common-0.5.5-pcmanfm-default.patch
+ * lxde-common-0.5.5-use-Adwaita-as-default-theme.patch
+- added patches:
+ * lxde-common-0.99.0-lxde-logout.patch
+ * lxde-common-0.99.0-lxpanel.patch
+ * lxde-common-0.99.0-openbox-menu.patch
+ * lxde-common-0.99.0-openbox-shortcut.patch
+ * lxde-common-0.99.0-openbox-titlebar-font.patch
+ * lxde-common-0.99.0-pcmanfm-default.patch
+ * lxde-common-0.99.0-use-Adwaita-as-default-theme.patch
+- spec file clean up
+
+-------------------------------------------------------------------
Old:
----
lxde-common-0.5.5-lxde-logout.patch
lxde-common-0.5.5-lxpanel.patch
lxde-common-0.5.5-openbox-menu.patch
lxde-common-0.5.5-openbox-shortcut.patch
lxde-common-0.5.5-openbox-titlebar-font.patch
lxde-common-0.5.5-pcmanfm-default.patch
lxde-common-0.5.5-use-Adwaita-as-default-theme.patch
lxde-common-0.5.5.tar.bz2
New:
----
lxde-common-0.99.0-lxde-logout.patch
lxde-common-0.99.0-lxpanel.patch
lxde-common-0.99.0-openbox-menu.patch
lxde-common-0.99.0-openbox-shortcut.patch
lxde-common-0.99.0-openbox-titlebar-font.patch
lxde-common-0.99.0-pcmanfm-default.patch
lxde-common-0.99.0-use-Adwaita-as-default-theme.patch
lxde-common-0.99.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lxde-common-branding-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.QoJRWk/_old 2014-10-31 20:16:39.000000000 +0100
+++ /var/tmp/diff_new_pack.QoJRWk/_new 2014-10-31 20:16:39.000000000 +0100
@@ -16,7 +16,7 @@
#
-%define upstream_ver 0.5.5
+%define upstream_ver 0.99.0
Name: lxde-common-branding-openSUSE
Version: 12.1
Release: 0
@@ -24,19 +24,17 @@
License: GPL-2.0
Group: System/GUI/LXDE
Url: http://www.opensuse.org
-Source0: lxde-common-%{upstream_ver}.tar.bz2
+Source0: lxde-common-%{upstream_ver}.tar.xz
Source1: start-here-branding.svg
Source2: suse-logout.png
-Patch0: lxde-common-0.5.5-pcmanfm-default.patch
-Patch1: lxde-common-0.5.5-openbox-menu.patch
-Patch2: lxde-common-0.5.5-lxpanel.patch
-Patch3: lxde-common-0.5.5-lxde-logout.patch
-Patch4: lxde-common-0.5.5-openbox-shortcut.patch
-Patch5:
lxde-common-0.5.5-use-Adwaita-as-default-theme.patch
-# Apply after lxde-common-0.5.5-use-Adwaita-as-default-theme.patch
-Patch6: lxde-common-0.5.5-openbox-titlebar-font.patch
-BuildRequires: autoconf
-BuildRequires: automake
+Patch0: lxde-common-0.99.0-pcmanfm-default.patch
+Patch1: lxde-common-0.99.0-openbox-menu.patch
+Patch2: lxde-common-0.99.0-lxpanel.patch
+Patch3: lxde-common-0.99.0-lxde-logout.patch
+Patch4: lxde-common-0.99.0-openbox-shortcut.patch
+Patch5:
lxde-common-0.99.0-use-Adwaita-as-default-theme.patch
+# Apply after lxde-common-0.99.0-use-Adwaita-as-default-theme.patch
+Patch6: lxde-common-0.99.0-openbox-titlebar-font.patch
BuildRequires: fdupes
BuildRequires: intltool
BuildRequires: update-desktop-files
@@ -53,7 +51,6 @@
BuildArch: noarch
Conflicts: otherproviders(lxde-common-branding)
-
%description
This branding-style package sets openSUSE style improvements into LXDE.
You should always prefer branding-openSUSE packages to branding-upstream.
@@ -84,22 +81,15 @@
rm -rf %{buildroot}/%{_bindir}/startlxde
rm -rf %{buildroot}/%{_datadir}/lxde/wallpapers
rm -rf %{buildroot}/%{_mandir}
+rm -rf %{buildroot}/%{_datadir}/applications/*.desktop
%fdupes -s %{buildroot}
%files
%defattr(-,root,root)
%{_bindir}/lxde-logout
-%dir %{_datadir}/lxpanel
-%dir %{_datadir}/lxpanel/profile
-%dir %{_datadir}/lxpanel/profile/LXDE
-%{_datadir}/lxpanel/profile/LXDE/config
-%dir %{_datadir}/lxpanel/profile/LXDE/panels
-%{_datadir}/lxpanel/profile/LXDE/panels/panel
%dir %{_datadir}/lxde
%dir %{_datadir}/lxde/images
-%dir %{_datadir}/lxde/openbox
-%{_datadir}/lxde/openbox/*.xml
%{_datadir}/lxde/images/logout-banner.png
%{_datadir}/lxde/images/lxde-icon.png
%{_datadir}/lxde/images/suse-logout.png
@@ -111,5 +101,14 @@
%config %{_sysconfdir}/xdg/lxsession/LXDE/autostart
%config %{_sysconfdir}/xdg/lxsession/LXDE/desktop.conf
%config %{_sysconfdir}/xdg/pcmanfm/LXDE/pcmanfm.conf
+%dir %{_sysconfdir}/xdg/lxpanel
+%dir %{_sysconfdir}/xdg/lxpanel/LXDE
+%dir %{_sysconfdir}/xdg/lxpanel/LXDE/panels
+%dir %{_sysconfdir}/xdg/openbox
+%dir %{_sysconfdir}/xdg/openbox/LXDE
+%config %{_sysconfdir}/xdg/lxpanel/LXDE/config
+%config %{_sysconfdir}/xdg/lxpanel/LXDE/panels/panel
+%config %{_sysconfdir}/xdg/openbox/LXDE/menu.xml
+%config %{_sysconfdir}/xdg/openbox/LXDE/rc.xml
%changelog
++++++ lxde-common-0.5.5-lxde-logout.patch ->
lxde-common-0.99.0-lxde-logout.patch ++++++
---
/work/SRC/openSUSE:Factory/lxde-common-branding-openSUSE/lxde-common-0.5.5-lxde-logout.patch
2011-09-23 02:12:17.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.lxde-common-branding-openSUSE.new/lxde-common-0.99.0-lxde-logout.patch
2014-10-31 20:16:37.000000000 +0100
@@ -1,6 +1,5 @@
-diff -uNr old-lxde-common-0.5.5//lxde-logout.in
lxde-common-0.5.5/lxde-logout.in
---- old-lxde-common-0.5.5//lxde-logout.in 2011-07-30 12:01:38.342518913
+0200
-+++ lxde-common-0.5.5/lxde-logout.in 2011-07-30 12:03:17.863518814 +0200
+--- lxde-common-0.99.0/lxde-logout.in 2014-09-01 16:17:11.000000000 +0200
++++ lxde-common-0.99.0-new/lxde-logout.in 2014-10-24 20:22:11.284423916
+0200
@@ -1,2 +1,2 @@
#!/bin/sh
-lxsession-logout --banner "@prefix@/share/lxde/images/logout-banner.png"
--side=top
++++++ lxde-common-0.5.5-lxpanel.patch -> lxde-common-0.99.0-lxpanel.patch
++++++
---
/work/SRC/openSUSE:Factory/lxde-common-branding-openSUSE/lxde-common-0.5.5-lxpanel.patch
2014-08-06 11:42:28.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.lxde-common-branding-openSUSE.new/lxde-common-0.99.0-lxpanel.patch
2014-10-31 20:16:37.000000000 +0100
@@ -1,5 +1,5 @@
---- lxde-common-0.5.5/lxpanel/panel.in 2011-07-29 16:04:03.000000000 +0200
-+++ lxde-common-0.5.5-new/lxpanel/panel.in 2014-08-03 11:30:37.661740346
+0200
+--- lxde-common-0.99.0/lxpanel/panel.in 2014-10-23 16:08:00.000000000
+0200
++++ lxde-common-0.99.0-new/lxpanel/panel.in 2014-10-24 20:19:03.760992513
+0200
@@ -7,16 +7,17 @@
margin=0
widthtype=percent
++++++ lxde-common-0.5.5-openbox-menu.patch ->
lxde-common-0.99.0-openbox-menu.patch ++++++
---
/work/SRC/openSUSE:Factory/lxde-common-branding-openSUSE/lxde-common-0.5.5-openbox-menu.patch
2011-09-23 02:12:17.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.lxde-common-branding-openSUSE.new/lxde-common-0.99.0-openbox-menu.patch
2014-10-31 20:16:37.000000000 +0100
@@ -1,6 +1,5 @@
-diff -uNr old-lxde-common-0.5.5//openbox/menu.xml
lxde-common-0.5.5/openbox/menu.xml
---- old-lxde-common-0.5.5//openbox/menu.xml 2011-07-30 11:51:28.562518871
+0200
-+++ lxde-common-0.5.5/openbox/menu.xml 2011-07-30 11:55:42.815518891 +0200
+--- lxde-common-0.99.0/openbox/menu.xml 2014-09-01 16:17:11.000000000
+0200
++++ lxde-common-0.99.0-new/openbox/menu.xml 2014-10-24 20:15:15.907113536
+0200
@@ -2,23 +2,23 @@
<openbox_menu xmlns="http://openbox.org/3.4/menu";>
@@ -37,11 +36,11 @@
<command>obconf</command>
</action>
</item>
-+ <item label="Run Command">
++ <item label="Run Command">
+ <action name="Execute">
+
<startupnotify><enabled>yes</enabled><icon>gtk-run</icon></startupnotify>
+ <command>lxpanelctl run</command>
-+ </action>
++ </action>
+ </item>
<item label="Reload Config Files">
<action name="Reconfigure" />
++++++ lxde-common-0.5.5-openbox-shortcut.patch ->
lxde-common-0.99.0-openbox-shortcut.patch ++++++
---
/work/SRC/openSUSE:Factory/lxde-common-branding-openSUSE/lxde-common-0.5.5-openbox-shortcut.patch
2014-09-09 19:00:24.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.lxde-common-branding-openSUSE.new/lxde-common-0.99.0-openbox-shortcut.patch
2014-10-31 20:16:37.000000000 +0100
@@ -1,7 +1,6 @@
-diff -uNr old-lxde-common-0.5.0//openbox/rc.xml.in
lxde-common-0.5.0/openbox/rc.xml.in
---- old-lxde-common-0.5.0//openbox/rc.xml.in 2008-04-26 04:32:26.000000000
+0200
-+++ lxde-common-0.5.0/openbox/rc.xml.in 2010-03-23 08:43:40.534105730
+0100
-@@ -271,12 +271,19 @@
+--- lxde-common-0.99.0/openbox/rc.xml.in 2014-10-23 16:08:00.000000000
+0200
++++ lxde-common-0.99.0-new/openbox/rc.xml.in 2014-10-24 20:27:01.327451058
+0200
+@@ -271,13 +271,13 @@
</action>
</keybind>
@@ -13,27 +12,22 @@
</action>
</keybind>
+- <keybind key="A-F1">
+ <keybind key="Super_L">
-+ <action name="Execute">
-+ <command>lxpanelctl menu</command>
-+ </action>
-+ </keybind>
-+
-+
- <keybind key="F11">
- <action name="ToggleFullscreen"/>
- </keybind>
-@@ -288,6 +295,13 @@
+ <action name="Execute">
+ <command>lxpanelctl menu</command>
+ </action>
+@@ -294,9 +294,11 @@
</action>
</keybind>
+- <!-- Launch gnome-screenshot when PrintScreen is pressed -->
+ <!-- Launch xfce4-screenshooter for screenshots -->
-+ <keybind key="Print">
+ <keybind key="Print">
+- <action name="Execute"><command>gnome-screenshot -i</command></action>
+ <action name="Execute">
+ <command>xfce4-screenshooter -f</command>
+ </action>
-+ </keybind>
-+
- </keyboard>
-
+ </keybind>
+ <!-- Launch LXRandR when Fn+Screen is pressed -->
++++++ lxde-common-0.5.5-openbox-titlebar-font.patch ->
lxde-common-0.99.0-openbox-titlebar-font.patch ++++++
---
/work/SRC/openSUSE:Factory/lxde-common-branding-openSUSE/lxde-common-0.5.5-openbox-titlebar-font.patch
2014-08-06 11:42:28.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.lxde-common-branding-openSUSE.new/lxde-common-0.99.0-openbox-titlebar-font.patch
2014-10-31 20:16:37.000000000 +0100
@@ -1,6 +1,6 @@
---- lxde-common-0.5.5/openbox/rc.xml.in 2014-08-03 12:13:24.823758540
+0200
-+++ lxde-common-0.5.5-new/openbox/rc.xml.in 2014-08-03 12:01:28.924513845
+0200
-@@ -57,19 +57,19 @@
+--- lxde-common-0.99.0/openbox/rc.xml.in 2014-10-24 22:25:07.018394980
+0200
++++ lxde-common-0.99.0-new/openbox/rc.xml.in 2014-10-24 22:27:36.893342071
+0200
+@@ -57,10 +57,10 @@
<keepBorder>yes</keepBorder>
<animateIconify>yes</animateIconify>
<font place="ActiveWindow">
@@ -13,14 +13,12 @@
<!-- 'bold' or 'normal' -->
<slant>normal</slant>
<!-- 'italic' or 'normal' -->
- </font>
- <font place="InactiveWindow">
-- <name>sans</name>
-+ <name>Cantarell</name>
+@@ -69,7 +69,7 @@
+ <name>sans</name>
<size>10</size>
<!-- font size in points -->
- <weight>bold</weight>
-+ <weight>normal</weight>
++ <weight>Cantarell</weight>
<!-- 'bold' or 'normal' -->
<slant>normal</slant>
<!-- 'italic' or 'normal' -->
++++++ lxde-common-0.5.5-pcmanfm-default.patch ->
lxde-common-0.99.0-pcmanfm-default.patch ++++++
---
/work/SRC/openSUSE:Factory/lxde-common-branding-openSUSE/lxde-common-0.5.5-pcmanfm-default.patch
2014-08-06 11:42:28.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.lxde-common-branding-openSUSE.new/lxde-common-0.99.0-pcmanfm-default.patch
2014-10-31 20:16:37.000000000 +0100
@@ -1,6 +1,5 @@
-diff -uNr old-lxde-common-0.5.5//pcmanfm/pcmanfm.conf.in
lxde-common-0.5.5/pcmanfm/pcmanfm.conf.in
---- lxde-common-0.5.5/pcmanfm/pcmanfm.conf.in 2011-07-29 16:04:03.000000000
+0200
-+++ lxde-common-0.5.5-new/pcmanfm/pcmanfm.conf.in 2014-08-01
14:23:10.299226922 +0200
+--- lxde-common-0.99.0/pcmanfm/pcmanfm.conf.in 2014-10-23 16:08:00.000000000
+0200
++++ lxde-common-0.99.0-new/pcmanfm/pcmanfm.conf.in 2014-10-24
20:09:17.743019479 +0200
@@ -2,12 +2,18 @@
bm_open_method=0
su_cmd=xdg-su -c '%s'
@@ -18,14 +17,11 @@
desktop_fg=#ffffff
desktop_shadow=#000000
+show_wm_menu=0
-
+
[ui]
always_show_tabs=0
-@@ -17,4 +23,5 @@
- view_mode=0
+@@ -18,3 +24,4 @@
show_hidden=0
sort_type=0
--sort_by=0
-+sort_by=2
+ sort_by=2
+pathbar_mode_buttons=1
-+
\ No newline at end of file
++++++ lxde-common-0.5.5-use-Adwaita-as-default-theme.patch ->
lxde-common-0.99.0-use-Adwaita-as-default-theme.patch ++++++
---
/work/SRC/openSUSE:Factory/lxde-common-branding-openSUSE/lxde-common-0.5.5-use-Adwaita-as-default-theme.patch
2014-08-06 11:42:28.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.lxde-common-branding-openSUSE.new/lxde-common-0.99.0-use-Adwaita-as-default-theme.patch
2014-10-31 20:16:37.000000000 +0100
@@ -1,21 +1,21 @@
---- lxde-common-0.5.5-old/desktop.conf 2011-07-29 16:04:03.000000000 +0200
-+++ lxde-common-0.5.5/desktop.conf 2014-06-15 09:21:36.843059505 +0200
-@@ -2,7 +2,8 @@
+--- lxde-common-0.99.0/desktop.conf 2014-09-01 16:17:11.000000000 +0200
++++ lxde-common-0.99.0-new/desktop.conf 2014-10-24 20:29:31.141398985
+0200
+@@ -2,8 +2,8 @@
window_manager=openbox-lxde
-
+
[GTK]
-sNet/ThemeName=Clearlooks
+-sNet/IconThemeName=nuoveXT2
+sNet/ThemeName=Adwaita
-+sGtk/CursorThemeName=Adwaita
- sNet/IconThemeName=nuoveXT2
++sNet/IconThemeName=Adwaita
sGtk/FontName=Sans 10
iGtk/ToolbarStyle=3
-
---- lxde-common-0.5.5/openbox/rc.xml.in 2011-07-29 16:04:03.000000000
+0200
-+++ lxde-common-0.5.5-new/openbox/rc.xml.in 2014-08-01 14:06:15.102106757
+0200
+ iGtk/ButtonImages=1
+--- lxde-common-0.99.0-new/openbox/rc.xml.in 2014-10-24 20:32:18.001113429
+0200
++++ lxde-common-0.99.0-new-a/openbox/rc.xml.in 2014-10-24 20:29:58.000000000
+0200
@@ -42,7 +42,7 @@
</placement>
-
+
<theme>
- <name>Onyx</name>
+ <name>Adwaita-ob</name>
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
