Changeset cbc3f97 for x/lib

Timestamp:

01/30/2016 08:17:30 PM (8 years ago)

Author:

DJ Lucas <dj@…>

Branches:

systemd-13485

Children:

b93238f0

Parents:

852ccfd5

Message:

Merge chapter 14 from trunk, merge recent updates from trunk to completed chapters, more -systemd.xml files cleanup.

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

Location:

x/lib

Files:

• colord-gtk.xml (moved) (moved from x/lib/colord-gtk-systemd.xml )
• gtk-vnc.xml (moved) (moved from x/lib/gtk-vnc-systemd.xml )
• lib.xml (modified) (3 diffs)
• webkitgtk.xml (moved) (moved from x/lib/webkitgtk-systemd.xml )
• webkitgtk2.xml (moved) (moved from x/lib/webkitgtk2-systemd.xml )

x/lib/lib.xml

@@ -35 +35 @@
   <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"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="colord-gtk-systemd.xml"/>
+  <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"/>
@@ -46 +46 @@
   <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"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk-vnc-systemd.xml"/>
+  <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"/>
@@ -60 +60 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt5.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-systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk-systemd.xml"/>
+  <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>