From 0ae36b81583f3fe3b8dd17bdccf49d8b4e80a2d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20=C5=BDivkovi=C4=87?= <igor@linuxfromscratch.org>
Date: Wed, 15 Oct 2003 07:59:47 +0000
Subject: [PATCH] moved gconf1 to gnome 1.4 libs

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@1392 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 gnome/gnome.ent                                 | 4 ++--
 gnome/{lib => otherlibs}/gconf/gconf1-desc.xml  | 0
 gnome/{lib => otherlibs}/gconf/gconf1-inst.xml  | 0
 gnome/{lib => otherlibs}/gconf/gconf1-intro.xml | 0
 gnome/{lib => otherlibs}/gconf/gconf1.ent       | 0
 gnome/{lib => otherlibs}/gconf1.xml             | 0
 6 files changed, 2 insertions(+), 2 deletions(-)
 rename gnome/{lib => otherlibs}/gconf/gconf1-desc.xml (100%)
 rename gnome/{lib => otherlibs}/gconf/gconf1-inst.xml (100%)
 rename gnome/{lib => otherlibs}/gconf/gconf1-intro.xml (100%)
 rename gnome/{lib => otherlibs}/gconf/gconf1.ent (100%)
 rename gnome/{lib => otherlibs}/gconf1.xml (100%)

diff --git a/gnome/gnome.ent b/gnome/gnome.ent
index 86edccd814..a614ba1e46 100644
--- a/gnome/gnome.ent
+++ b/gnome/gnome.ent
@@ -36,7 +36,6 @@
 <!ENTITY % libgtkhtml SYSTEM "lib/libgtkhtml/libgtkhtml.ent">
 <!ENTITY % gtk-engines SYSTEM "lib/gtk-engines/gtk-engines.ent">
 <!ENTITY % oaf SYSTEM "lib/oaf/oaf.ent">
-<!ENTITY % gconf1 SYSTEM "lib/gconf/gconf1.ent">
 <!ENTITY % gnome-vfs1 SYSTEM "lib/gnome-vfs/gnome-vfs1.ent">
 <!ENTITY % gnome-icon-themes SYSTEM "lib/themes/gnome-icon-themes.ent">
 <!ENTITY % vte SYSTEM "lib/vte/vte.ent">
@@ -76,7 +75,6 @@
 %eel;
 %libgtkhtml;
 %gtk-engines;
-%gconf1;
 %gnome-vfs1;
 %gnome-icon-themes;
 %gnome-themes;
@@ -158,6 +156,7 @@
 <!ENTITY % gtkhtml SYSTEM "otherlibs/gtkhtml/gtkhtml.ent">
 <!ENTITY % libghttp SYSTEM "otherlibs/libghttp/libghttp.ent">
 <!ENTITY % bonobo14 SYSTEM "otherlibs/bonobo14/bonobo14.ent">
+<!ENTITY % gconf1 SYSTEM "otherlibs/gconf/gconf1.ent">
 <!ENTITY % guppi SYSTEM "otherlibs/guppi/guppi.ent">
 <!ENTITY % soup SYSTEM "otherlibs/soup/soup.ent">
 <!ENTITY % bonobo-conf SYSTEM "otherlibs/bonobo-conf/bonobo-conf.ent">
@@ -169,6 +168,7 @@
 %gtkhtml;
 %libghttp;
 %bonobo14;
+%gconf1;
 %guppi;
 %soup;
 %bonobo-conf;
diff --git a/gnome/lib/gconf/gconf1-desc.xml b/gnome/otherlibs/gconf/gconf1-desc.xml
similarity index 100%
rename from gnome/lib/gconf/gconf1-desc.xml
rename to gnome/otherlibs/gconf/gconf1-desc.xml
diff --git a/gnome/lib/gconf/gconf1-inst.xml b/gnome/otherlibs/gconf/gconf1-inst.xml
similarity index 100%
rename from gnome/lib/gconf/gconf1-inst.xml
rename to gnome/otherlibs/gconf/gconf1-inst.xml
diff --git a/gnome/lib/gconf/gconf1-intro.xml b/gnome/otherlibs/gconf/gconf1-intro.xml
similarity index 100%
rename from gnome/lib/gconf/gconf1-intro.xml
rename to gnome/otherlibs/gconf/gconf1-intro.xml
diff --git a/gnome/lib/gconf/gconf1.ent b/gnome/otherlibs/gconf/gconf1.ent
similarity index 100%
rename from gnome/lib/gconf/gconf1.ent
rename to gnome/otherlibs/gconf/gconf1.ent
diff --git a/gnome/lib/gconf1.xml b/gnome/otherlibs/gconf1.xml
similarity index 100%
rename from gnome/lib/gconf1.xml
rename to gnome/otherlibs/gconf1.xml