Author: krejzi
Date: Mon Aug 4 12:28:09 2014
New Revision: 13831
Log:
Merged trunk.
Modified:
branches/systemd/general/sysutils/lm_sensors.xml
branches/systemd/introduction/welcome/changelog.xml
branches/systemd/lxde/desktop/lxpolkit.xml
branches/systemd/lxde/desktop/menu-cache.xml
branches/systemd/packages.ent
Modified: branches/systemd/general/sysutils/lm_sensors.xml
==============================================================================
--- branches/systemd/general/sysutils/lm_sensors.xml Mon Aug 4 12:25:48
2014 (r13830)
+++ branches/systemd/general/sysutils/lm_sensors.xml Mon Aug 4 12:28:09
2014 (r13831)
@@ -126,8 +126,6 @@
<M> (configure all of them as modules)
I2C Hardware Bus support --->
<M> (configure all of them as modules)
- I2C Hardware Bus support --->
- <M> (configure all of them as modules)
[*] Hardware Monitoring support --->
<M> (configure all of them as modules)</literal></screen>
Modified: branches/systemd/introduction/welcome/changelog.xml
==============================================================================
--- branches/systemd/introduction/welcome/changelog.xml Mon Aug 4 12:25:48
2014 (r13830)
+++ branches/systemd/introduction/welcome/changelog.xml Mon Aug 4 12:28:09
2014 (r13831)
@@ -48,6 +48,10 @@
<para>August 4th, 2014</para>
<itemizedlist>
<listitem>
+ <para>[fernando] - Update to menu-cache-0.6.0. Fixes
+ <ulink url="&blfs-ticket-root;5332">#5332</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[igor] - Update to ffmpeg-2.3.1. Fixes
<ulink url="&blfs-ticket-root;5312">#5312</ulink>.</para>
</listitem>
Modified: branches/systemd/lxde/desktop/lxpolkit.xml
==============================================================================
--- branches/systemd/lxde/desktop/lxpolkit.xml Mon Aug 4 12:25:48 2014
(r13830)
+++ branches/systemd/lxde/desktop/lxpolkit.xml Mon Aug 4 12:28:09 2014
(r13831)
@@ -74,8 +74,8 @@
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
- <xref linkend="gtk2"/>,
- <xref linkend="menu-cache"/> and
+ <xref linkend="gtk2"/> and
+<!-- <xref linkend="menu-cache"/> and-->
<xref linkend="polkit"/>
</para>
Modified: branches/systemd/lxde/desktop/menu-cache.xml
==============================================================================
--- branches/systemd/lxde/desktop/menu-cache.xml Mon Aug 4 12:25:48
2014 (r13830)
+++ branches/systemd/lxde/desktop/menu-cache.xml Mon Aug 4 12:28:09
2014 (r13831)
@@ -4,12 +4,12 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
- <!ENTITY menu-cache-download-http
"&sourceforge-repo;/lxde/menu-cache-&menu-cache-version;.tar.gz">
+ <!ENTITY menu-cache-download-http
"&sourceforge-repo;/lxde/menu-cache-&menu-cache-version;.tar.xz">
<!ENTITY menu-cache-download-ftp " ">
- <!ENTITY menu-cache-md5sum "fd296c317a235782fbbd37b6f54bc985">
- <!ENTITY menu-cache-size "400 KB">
- <!ENTITY menu-cache-buildsize "5.6 MB">
- <!ENTITY menu-cache-time "0.2 SBU">
+ <!ENTITY menu-cache-md5sum "f1bbe2281feb4e78c401ca8d7ed46306">
+ <!ENTITY menu-cache-size "280 KB">
+ <!ENTITY menu-cache-buildsize "4.1 MB">
+ <!ENTITY menu-cache-time "less than 0.1 SBU">
]>
<sect1 id="menu-cache" xreflabel="menu-cache-&menu-cache-version;">
@@ -121,6 +121,12 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="../../xincludes/gtk-doc-rebuild.xml"/>
+ <note>
+ <para>With this switch, parallel build is not supported. Use
+ <command>make -j1</command> if you have MAKEFLAGS set to value larger
+ than unity.</para>
+ </note>
+
</sect2>
<sect2 role="content">
Modified: branches/systemd/packages.ent
==============================================================================
--- branches/systemd/packages.ent Mon Aug 4 12:25:48 2014 (r13830)
+++ branches/systemd/packages.ent Mon Aug 4 12:28:09 2014 (r13831)
@@ -524,7 +524,7 @@
<!-- Chapter 34 -->
<!ENTITY lxmenu-data-version "0.1.2">
<!ENTITY lxde-icon-theme-version "0.5.0">
-<!ENTITY menu-cache-version "0.5.1">
+<!ENTITY menu-cache-version "0.6.0">
<!ENTITY libfm-version "1.2.1">
<!ENTITY pcmanfm-version "1.2.1">
<!ENTITY lxpanel-version "0.6.2">
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
