Changeset 7d3721e

Timestamp:

08/04/2014 07:28:09 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

systemd-11177

Children:

bdb73cf

Parents:

e19b210

Message:

Merged trunk.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@13831 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general/sysutils/lm_sensors.xml (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• lxde/desktop/lxpolkit.xml (modified) (1 diff)
• lxde/desktop/menu-cache.xml (modified) (2 diffs)
• packages.ent (modified) (1 diff)

general/sysutils/lm_sensors.xml

@@ -124 +124 @@
     [*] I2C device interface
     I2C Algorithms  --->
-      <M> (configure all of them as modules)
-    I2C Hardware Bus support  --->
       <M> (configure all of them as modules)
     I2C Hardware Bus support  --->

introduction/welcome/changelog.xml

@@ -48 +48 @@
       <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

lxde/desktop/lxpolkit.xml

@@ -75 +75 @@
     <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>

lxde/desktop/menu-cache.xml

@@ -5 +5 @@
   %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">
 ]>
 
@@ -122 +122 @@
       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>
 

packages.ent

@@ -525 +525 @@
 <!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">