From d2db46f0e0fe8d40ab2342d3a30915fb97996763 Mon Sep 17 00:00:00 2001
From: Randy McMurchy <randy@linuxfromscratch.org>
Date: Sun, 12 Feb 2006 23:57:39 +0000
Subject: [PATCH] Updated to GConf Editor-2.12.1

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@5676 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  2 +-
 gnome/add/gconf-editor.xml         | 20 +++++++++-----------
 introduction/welcome/changelog.xml |  3 +++
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/general.ent b/general.ent
index 6e736c6bd6..0d746eb8b0 100644
--- a/general.ent
+++ b/general.ent
@@ -430,7 +430,7 @@
 <!ENTITY ggv-version                  "2.12.0">
 <!ENTITY evince-version               "0.4.0">
 <!ENTITY file-roller-version          "2.12.2">
-<!ENTITY gconf-editor-version         "2.12.0">
+<!ENTITY gconf-editor-version         "2.12.1">
 <!ENTITY gnome-utils-version          "2.12.2">
 <!ENTITY gnome-system-monitor-version "2.12.1">
 <!ENTITY nautilus-cd-burner-version   "2.12.2">
diff --git a/gnome/add/gconf-editor.xml b/gnome/add/gconf-editor.xml
index ea939889b6..2e68dcca31 100644
--- a/gnome/add/gconf-editor.xml
+++ b/gnome/add/gconf-editor.xml
@@ -4,11 +4,11 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY gconf-editor-download-http "http://ftp.gnome.org/pub/GNOME/sources/gconf-editor/&gnome-version;/gconf-editor-&gconf-editor-version;.tar.bz2">
-  <!ENTITY gconf-editor-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/gconf-editor/&gnome-version;/gconf-editor-&gconf-editor-version;.tar.bz2">
-  <!ENTITY gconf-editor-md5sum        "ec8b0d4ee2a460ed31f69e4825fb4e17">
-  <!ENTITY gconf-editor-size          "531 KB">
-  <!ENTITY gconf-editor-buildsize     "7.6 MB">
+  <!ENTITY gconf-editor-download-http "&gnome-download-http;/gconf-editor/&gnome-version;/gconf-editor-&gconf-editor-version;.tar.bz2">
+  <!ENTITY gconf-editor-download-ftp  "&gnome-download-ftp;/gconf-editor/&gnome-version;/gconf-editor-&gconf-editor-version;.tar.bz2">
+  <!ENTITY gconf-editor-md5sum        "0fa81dee78ca10f0192eb19afa6883f5">
+  <!ENTITY gconf-editor-size          "539 KB">
+  <!ENTITY gconf-editor-buildsize     "7.8 MB">
   <!ENTITY gconf-editor-time          "0.1 SBU">
 ]>
 
@@ -73,7 +73,8 @@
     following commands:</para>
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --sysconfdir=&gnome-etc-dir; --localstatedir=/var/lib &amp;&amp;
+            --sysconfdir=&gnome-etc-dir; \
+            --localstatedir=/var/lib &amp;&amp;
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -110,11 +111,8 @@ make</userinput></screen>
       <seglistitem>
         <seg>gconf-editor</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/apps/gconf-editor,
-        &gnome-etc-dir;/gconf/gconf.xml.defaults/schemas/apps/gconf-editor,
-        $GNOME_PREFIX/share/gnome/help/gconf-editor,
-        $GNOME_PREFIX/share/omf/gconf-editor, and
-        $GNOME_PREFIX/share/pixmaps/gconf-editor</seg>
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas/]apps/gconf-editor
+        and $GNOME_PREFIX/share/[gnome/help, omf, pixmaps]/gconf-editor</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 576230bd9e..b75f07aba4 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,9 @@
     <listitem>
       <para>February 12th, 2006</para>
       <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated to GConf Editor-2.12.1.</para>
+        </listitem>
         <listitem>
           <para>[archaic] - Updated to Postfix-2.2.8.</para>
         </listitem>