Author: dj
Date: Fri Jun  3 22:57:23 2016
New Revision: 17438

Log:
[systemd-merge] - Chapter 25 layout

Added:
   trunk/BOOK/x/lib/colord-gtk.xml   (contents, props changed)
      - copied, changed from r17427, branches/systemd/x/lib/colord-gtk.xml
   trunk/BOOK/x/lib/gtk-vnc.xml   (contents, props changed)
      - copied, changed from r17427, branches/systemd/x/lib/gtk-vnc.xml
   trunk/BOOK/x/lib/webkitgtk2.xml   (contents, props changed)
      - copied, changed from r17427, branches/systemd/x/lib/webkitgtk2.xml
Modified:
   trunk/BOOK/packages.ent
   trunk/BOOK/x/lib/gtk-engines.xml
   trunk/BOOK/x/lib/lib.xml

Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent     Fri Jun  3 22:29:03 2016        (r17437)
+++ trunk/BOOK/packages.ent     Fri Jun  3 22:57:23 2016        (r17438)
@@ -501,6 +501,7 @@
 <!ENTITY clutter-version              "1.26.0">
 <!ENTITY clutter-gst-version          "3.0.18">
 <!ENTITY clutter-gtk-version          "1.8.0">
+<!ENTITY colord-gtk-version           "0.1.26">
 <!ENTITY fltk-version                 "1.3.3">
 <!ENTITY freeglut-version             "3.0.0">
 <!ENTITY gdk-pixbuf-version           "2.34.0">
@@ -512,6 +513,7 @@
 <!ENTITY gtkmm2-version               "2.24.4">
 <!ENTITY gtkmm3-version               "3.20.1">
 <!ENTITY gtksourceview-version        "3.20.3">
+<!ENTITY gtk-vnc-version              "0.5.4">
 <!ENTITY imlib2-version               "1.4.9">
 <!ENTITY keybinder2-version           "0.3.0">
 <!ENTITY libnotify-version            "0.7.6">
@@ -523,6 +525,7 @@
 <!ENTITY qtwebkit-version             "5.6.0">
 <!ENTITY shared-mime-info-version     "1.6">
 <!ENTITY startup-notification-version "0.12">
+<!ENTITY webkitgtk2-version           "2.4.10">    <!-- Even minors only -->
 <!ENTITY webkitgtk-version            "2.12.2">    <!-- Even minors only -->
 
 <!ENTITY gtk2-libdir                  "2.0/2.10.0">

Copied and modified: trunk/BOOK/x/lib/colord-gtk.xml (from r17427, 
branches/systemd/x/lib/colord-gtk.xml)
==============================================================================
--- branches/systemd/x/lib/colord-gtk.xml       Thu Jun  2 13:29:29 2016        
(r17427, copy source)
+++ trunk/BOOK/x/lib/colord-gtk.xml     Fri Jun  3 22:57:23 2016        (r17438)
@@ -12,7 +12,7 @@
   <!ENTITY colord-gtk-time          "less than 0.1 SBU">
 ]>
 
-<sect1 id="colord-gtk" xreflabel="colord-gtk-&colord-gtk-version;">
+<sect1 id="colord-gtk" xreflabel="colord-gtk-&colord-gtk-version;" 
revision="systemd">
   <?dbhtml filename="colord-gtk.html"?>
 
   <sect1info>
@@ -35,7 +35,7 @@
       <application>Colord</application>.
     </para>
 
-    &lfs77_checked;
+    <!-- &lfs77_checked; -->
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/BOOK/x/lib/gtk-engines.xml
==============================================================================
--- trunk/BOOK/x/lib/gtk-engines.xml    Fri Jun  3 22:29:03 2016        (r17437)
+++ trunk/BOOK/x/lib/gtk-engines.xml    Fri Jun  3 22:57:23 2016        (r17438)
@@ -14,7 +14,7 @@
   <!ENTITY gtk-engines-time          "0.4 SBU">
 ]>
 
-<sect1 id="gtk-engines" xreflabel="GTK Engines-&gtk-engines-version;">
+<sect1 id="gtk-engines" xreflabel="GTK Engines-&gtk-engines-version;" 
revision="systemd">
   <?dbhtml filename="gtk-engines.html"?>
 
   <sect1info>

Copied and modified: trunk/BOOK/x/lib/gtk-vnc.xml (from r17427, 
branches/systemd/x/lib/gtk-vnc.xml)
==============================================================================
--- branches/systemd/x/lib/gtk-vnc.xml  Thu Jun  2 13:29:29 2016        
(r17427, copy source)
+++ trunk/BOOK/x/lib/gtk-vnc.xml        Fri Jun  3 22:57:23 2016        (r17438)
@@ -12,7 +12,7 @@
   <!ENTITY gtk-vnc-time          "0.2 SBU">
 ]>
 
-<sect1 id="gtk-vnc" xreflabel="gtk-vnc-&gtk-vnc-version;">
+<sect1 id="gtk-vnc" xreflabel="gtk-vnc-&gtk-vnc-version;" revision="systemd">
   <?dbhtml filename="gtk-vnc.html"?>
 
   <sect1info>
@@ -35,7 +35,7 @@
       it to be completely asynchronous while remaining single threaded.
     </para>
 
-    &lfs77_checked;
+    <!-- &lfs77_checked; -->
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/BOOK/x/lib/lib.xml
==============================================================================
--- trunk/BOOK/x/lib/lib.xml    Fri Jun  3 22:29:03 2016        (r17437)
+++ trunk/BOOK/x/lib/lib.xml    Fri Jun  3 22:57:23 2016        (r17438)
@@ -34,6 +34,10 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="clutter.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="clutter-gst.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="clutter-gtk.xml"/>
+
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="colord-gtk.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="fltk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="freeglut.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="gdk-pixbuf.xml"/>
@@ -41,9 +45,16 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="goffice010.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="gtk+2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="gtk+3.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="gtk-engines.xml"/> -->
+
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="gtk-engines.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="gtkmm2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="gtkmm3.xml"/>
+
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="gtk-vnc.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="gtksourceview.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="imlib2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="keybinder2.xml"/>
@@ -58,7 +69,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="qt5.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="qtwebkit5.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="startup-notification.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="webkitgtk2.xml"/> -->
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="webkitgtk2.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="webkitgtk.xml"/>
 
 </chapter>

Copied and modified: trunk/BOOK/x/lib/webkitgtk2.xml (from r17427, 
branches/systemd/x/lib/webkitgtk2.xml)
==============================================================================
--- branches/systemd/x/lib/webkitgtk2.xml       Thu Jun  2 13:29:29 2016        
(r17427, copy source)
+++ trunk/BOOK/x/lib/webkitgtk2.xml     Fri Jun  3 22:57:23 2016        (r17438)
@@ -12,7 +12,7 @@
   <!ENTITY webkitgtk2-time          "50 SBU (using parallelism=4, both built, 
webkitgtk-3.0 takes a little longer than webkitgtk-1.0)">
 ]>
 
-<sect1 id="webkitgtk2" xreflabel="WebKitGTK+-&webkitgtk2-version;">
+<sect1 id="webkitgtk2" xreflabel="WebKitGTK+-&webkitgtk2-version;" 
revision="systemd">
   <?dbhtml filename="webkitgtk2.html"?>
 
   <sect1info>
@@ -36,7 +36,7 @@
       platforms.
     </para>
 
-    &lfs77_checked;
+    <!-- &lfs77_checked; -->
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to