diff --git a/gnome/add/acme.xml b/gnome/add/acme.xml
deleted file mode 100644
index ff099487b5..0000000000
--- a/gnome/add/acme.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-acme-&acme-version;
-
-&acme-intro;
-&acme-inst;
-&acme-desc;
-
-
-
diff --git a/gnome/add/acme/acme-desc.xml b/gnome/add/acme/acme-desc.xml
deleted file mode 100644
index 9e6c911ac9..0000000000
--- a/gnome/add/acme/acme-desc.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-Contents
-
-The acme package contains
-acme.
-
-
-
-Description
-
-acme
-acme captures non-standard keystrokes and
-executes commands, if available.
-
-
diff --git a/gnome/add/acme/acme-intro.xml b/gnome/add/acme/acme-intro.xml
deleted file mode 100644
index 3d7a064bef..0000000000
--- a/gnome/add/acme/acme-intro.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-Introduction to acme
-
-The acme package contains interface
-programs that are useful for capturing non-standard keyboard keys and
-executing programs or scripts that enable those keys.
-
-Package information
-
-Download (HTTP):
-Download (FTP):
-Download size: &acme-size;
-Estimated Disk space required: &acme-buildsize;
-Estimated build time: &acme-time;
-
-
-acme dependencies
-Required
- and
-
-
-
diff --git a/gnome/add/acme/acme.ent b/gnome/add/acme/acme.ent
deleted file mode 100644
index 5ac0142584..0000000000
--- a/gnome/add/acme/acme.ent
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gnome/add/add.xml b/gnome/add/add.xml
index 04b5a06ece..c293081a86 100644
--- a/gnome/add/add.xml
+++ b/gnome/add/add.xml
@@ -8,7 +8,7 @@ as wanted basis.
&libgnomeprint;
&libgnomeprintui;
->khtml2;
+>khtml;
&libgtkhtml;
&yelp;
&bug-buddy;
@@ -19,7 +19,7 @@ as wanted basis.
&file-roller;
&gconf-editor;
&gnome-utils;
-&gal2;
+&gal;
&gnome-system-monitor;
&gnome-media;
&nautilus-media;
@@ -36,7 +36,6 @@ as wanted basis.
&gok;
&epiphany;
&gnomemeeting;
-
&gnome-games;
&gnome2-user-docs;
&gdm;
diff --git a/gnome/add/at-spi.xml b/gnome/add/at-spi.xml
new file mode 100644
index 0000000000..fca34ebd60
--- /dev/null
+++ b/gnome/add/at-spi.xml
@@ -0,0 +1,11 @@
+
+
+AT SPI-&at-spi-version;
+
+&at-spi-intro;
+&at-spi-inst;
+&at-spi-exp;
+&at-spi-desc;
+
+
+
diff --git a/gnome/add/at-spi/at-spi-desc.xml b/gnome/add/at-spi/at-spi-desc.xml
new file mode 100644
index 0000000000..0ce0c4e03d
--- /dev/null
+++ b/gnome/add/at-spi/at-spi-desc.xml
@@ -0,0 +1,17 @@
+
+Contents
+
+The AT SPI package contains libcspi
+libraries, libspi libraries and
+at-spi-registryd.
+
+
+
+Description
+
+at-spi-registryd
+at-spi-registryd is the registry daemon that allows communication
+between the UI and assistance devices.
+
+
diff --git a/gnome/add/at-spi/at-spi-exp.xml b/gnome/add/at-spi/at-spi-exp.xml
new file mode 100644
index 0000000000..a1580154ac
--- /dev/null
+++ b/gnome/add/at-spi/at-spi-exp.xml
@@ -0,0 +1,14 @@
+
+Command explanations
+
+--libexecdir=`pkg-config --variable=prefix
+ORBit-2.0`/sbin: This switch puts libexec files in
+$GNOME_PREFIX/sbin instead of
+$GNOME_PREFIX/libexec.
+
+: This switch prevent the
+rebuilding of the documentation during the make command.
+
+
+
+
diff --git a/gnome/add/at-spi/at-spi-inst.xml b/gnome/add/at-spi/at-spi-inst.xml
new file mode 100644
index 0000000000..a4059452ff
--- /dev/null
+++ b/gnome/add/at-spi/at-spi-inst.xml
@@ -0,0 +1,13 @@
+
+Installation of AT SPI
+
+Install AT SPI by running the following commands:
+
+./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+ --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin \
+ --disable-gtk-doc &&
+make &&
+make install
+
+
+
diff --git a/gnome/add/at-spi/at-spi-intro.xml b/gnome/add/at-spi/at-spi-intro.xml
new file mode 100644
index 0000000000..b2c1e89470
--- /dev/null
+++ b/gnome/add/at-spi/at-spi-intro.xml
@@ -0,0 +1,29 @@
+
+Introduction to AT
+SPI
+
+The AT SPI package contains Assistive Technology Service Provider
+Interface. This is useful for redirecting UI events to accessible
+applications and adaptive/assistive technologies.
+
+Package information
+
+Download (HTTP):
+Download (FTP):
+Download size: &at-spi-size;
+Estimated Disk space required:
+&at-spi-buildsize;
+Estimated build time:
+&at-spi-time;
+
+
+AT SPI dependencies
+Required
+ and
+Optional
+
+
+
+
diff --git a/gnome/add/at-spi/at-spi.ent b/gnome/add/at-spi/at-spi.ent
new file mode 100644
index 0000000000..d861205b6a
--- /dev/null
+++ b/gnome/add/at-spi/at-spi.ent
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gnome/add/docs/gnome2-user-docs-desc.xml b/gnome/add/docs/gnome2-user-docs-desc.xml
deleted file mode 100644
index ba2efd04e0..0000000000
--- a/gnome/add/docs/gnome2-user-docs-desc.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-Contents
-
-The GNOME2 User Docs package contains
-OMF files.
-
-
-
-Description
-
-OMF files
-OMF files contain user documentation. These include introductions and
-help on the core packages.
-
-
diff --git a/gnome/add/docs/gnome2-user-docs-exp.xml b/gnome/add/docs/gnome2-user-docs-exp.xml
deleted file mode 100644
index f87c6f7253..0000000000
--- a/gnome/add/docs/gnome2-user-docs-exp.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-Command explanations
-
---localstatedir=/var/lib: This switch
-puts ScrollKeeper files in /var/lib/scrollkeeper
-instead of $GNOME_PREFIX/var/scrollkeeper.
-
-
-
diff --git a/gnome/add/docs/gnome2-user-docs-inst.xml b/gnome/add/docs/gnome2-user-docs-inst.xml
deleted file mode 100644
index ba5b557854..0000000000
--- a/gnome/add/docs/gnome2-user-docs-inst.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-Installation of GNOME2 User Docs
-
-Install GNOME2 User Docs by running the following commands:
-
-./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
- --localstatedir=/var/lib &&
-make &&
-make install
-
-
diff --git a/gnome/add/docs/gnome2-user-docs-intro.xml b/gnome/add/docs/gnome2-user-docs-intro.xml
deleted file mode 100644
index 0db124fda9..0000000000
--- a/gnome/add/docs/gnome2-user-docs-intro.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-Introduction to GNOME2 User Docs
-
-The GNOME2 User Docs package contains end user documents for
-GNOME.
-
-Package information
-
-Download (HTTP):
-Download (FTP):
-Download size: &gnome2-user-docs-size;
-Estimated Disk space required:
-&gnome2-user-docs-buildsize;
-Estimated build time:
-&gnome2-user-docs-time;
-
-
-GNOME2 User Docs dependencies
-Required
-
-Optional
-
-docbook-utils
-
-
-
diff --git a/gnome/add/docs/gnome2-user-docs.ent b/gnome/add/docs/gnome2-user-docs.ent
deleted file mode 100644
index da8a271f6c..0000000000
--- a/gnome/add/docs/gnome2-user-docs.ent
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gnome/add/gal.xml b/gnome/add/gal.xml
new file mode 100644
index 0000000000..476c371bf6
--- /dev/null
+++ b/gnome/add/gal.xml
@@ -0,0 +1,9 @@
+
+
+GAL-&gal-version;
+
+&gal-intro;
+&gal-inst;
+&gal-desc;
+
+
diff --git a/gnome/add/gal/gal-desc.xml b/gnome/add/gal/gal-desc.xml
new file mode 100644
index 0000000000..f6fa3c764e
--- /dev/null
+++ b/gnome/add/gal/gal-desc.xml
@@ -0,0 +1,8 @@
+
+Contents
+
+The GAL package contains library
+routines refactored from Evolution and Gnumeric.
+
+
+
diff --git a/gnome/add/acme/acme-inst.xml b/gnome/add/gal/gal-inst.xml
similarity index 54%
rename from gnome/add/acme/acme-inst.xml
rename to gnome/add/gal/gal-inst.xml
index 9590f848c2..b045d123e7 100644
--- a/gnome/add/acme/acme-inst.xml
+++ b/gnome/add/gal/gal-inst.xml
@@ -1,7 +1,7 @@
-Installation of acme
+Installation of GAL
-Install acme by running the following commands:
+Install GAL by running the following commands:
./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` &&
make &&
diff --git a/gnome/add/gal/gal-intro.xml b/gnome/add/gal/gal-intro.xml
new file mode 100644
index 0000000000..423555bcfb
--- /dev/null
+++ b/gnome/add/gal/gal-intro.xml
@@ -0,0 +1,30 @@
+
+Introduction to GAL
+
+The GAL package contains library
+functions that came from Evolution and
+Gnumeric.
+GAL is short for
+GNOME Application Libs.
+
+Package information
+
+Download (HTTP):
+Download (FTP):
+Download size: &gal-size;
+Estimated Disk space required: &gal-buildsize;
+Estimated build time: &gal-time;
+
+
+GAL dependencies
+Required
+
+
+
+Optional
+
+
+
+
+
+
diff --git a/gnome/add/gal/gal.ent b/gnome/add/gal/gal.ent
new file mode 100644
index 0000000000..d0868601a3
--- /dev/null
+++ b/gnome/add/gal/gal.ent
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/gnome/add/gconf-editor.xml b/gnome/add/gconf-editor.xml
new file mode 100644
index 0000000000..b304cf1e4c
--- /dev/null
+++ b/gnome/add/gconf-editor.xml
@@ -0,0 +1,10 @@
+
+
+GConf Editor-&gconf-editor-version;
+
+&gconf-editor-intro;
+&gconf-editor-inst;
+&gconf-editor-desc;
+
+
+
diff --git a/gnome/add/gconf-editor/gconf-editor-desc.xml b/gnome/add/gconf-editor/gconf-editor-desc.xml
new file mode 100644
index 0000000000..802431668b
--- /dev/null
+++ b/gnome/add/gconf-editor/gconf-editor-desc.xml
@@ -0,0 +1,18 @@
+
+Contents
+
+The GConf Editor package contains
+gconf-editor.
+
+
+
+Description
+
+gconf-editor
+gconf-editor allows direct modification of the
+GConf
+configuration database.
+
+
+
+
diff --git a/gnome/add/gconf-editor/gconf-editor-inst.xml b/gnome/add/gconf-editor/gconf-editor-inst.xml
new file mode 100644
index 0000000000..22b06ec4b5
--- /dev/null
+++ b/gnome/add/gconf-editor/gconf-editor-inst.xml
@@ -0,0 +1,11 @@
+
+Installation of GConf Editor
+
+Install GConf Editor by running the following commands:
+
+./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` &&
+make &&
+make install
+
+
+
diff --git a/gnome/add/gconf-editor/gconf-editor-intro.xml b/gnome/add/gconf-editor/gconf-editor-intro.xml
new file mode 100644
index 0000000000..f3de5ef894
--- /dev/null
+++ b/gnome/add/gconf-editor/gconf-editor-intro.xml
@@ -0,0 +1,27 @@
+
+Introduction to GConf Editor
+
+The GConf Editor package contains a
+GUI editor for the GConf
+configuration database.
+
+Package information
+
+Download (HTTP):
+Download (FTP):
+Download size: &gconf-editor-size;
+Estimated Disk space required:
+&gconf-editor-buildsize;
+Estimated build time:
+&gconf-editor-time;
+
+
+GConf Editor dependencies
+Required
+
+
+
+
+
diff --git a/gnome/add/gconf-editor/gconf-editor.ent b/gnome/add/gconf-editor/gconf-editor.ent
new file mode 100644
index 0000000000..ab5ac3d75f
--- /dev/null
+++ b/gnome/add/gconf-editor/gconf-editor.ent
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/gnome/add/gdm.xml b/gnome/add/gdm.xml
new file mode 100644
index 0000000000..3af74fbe99
--- /dev/null
+++ b/gnome/add/gdm.xml
@@ -0,0 +1,12 @@
+
+
+GDM-&gdm-version;
+
+&gdm-intro;
+&gdm-inst;
+&gdm-exp;
+&gdm-config;
+&gdm-desc;
+
+
+
diff --git a/gnome/add/gdm/gdm-config.xml b/gnome/add/gdm/gdm-config.xml
new file mode 100644
index 0000000000..bcd23eefb0
--- /dev/null
+++ b/gnome/add/gdm/gdm-config.xml
@@ -0,0 +1,45 @@
+
+Configuring GDM
+
+Config files
+gdm.conf
+
+
+Configuration Information
+
+The GDM PAM
+config files contain modules not present in a BLFS
+installation. The following commands will replace those files:
+cat > /etc/pam.d/gdm << "EOF"
+auth required pam_unix.so
+auth required pam_nologin.so
+account required pam_unix.so
+password required pam_unix.so
+session required pam_unix.so
+EOF
+cat > /etc/pam.d/gdm-autologin << "EOF"
+auth required pam_env.so
+auth required pam_nologin.so
+auth required pam_permit.so
+account required pam_unix.so
+password required pam_unix.so
+session required pam_unix.so
+EOF
+
+gdm can be tested by executing it from a root console.
+
+To start a graphical login at boot, install /etc/rc.d/init.d/gdm
+init script included in the package.
+
+make install-gdm
+
+To autostart with a graphical login, edit
+/etc/inittab so that the line reading
+id:3:initdefault:
+is changed to
+id:5:initdefault:
+
+
+
+
+
diff --git a/gnome/add/gdm/gdm-desc.xml b/gnome/add/gdm/gdm-desc.xml
new file mode 100644
index 0000000000..2f3f62f24c
--- /dev/null
+++ b/gnome/add/gdm/gdm-desc.xml
@@ -0,0 +1,52 @@
+
+Contents
+
+The GDM package contains
+gdm,
+gdm-binary,
+gdmXnest,
+gdmXnestchooser,
+gdmchooser,
+gdmflexiserver,
+gdmgreeter,
+gdmlogin,
+gdmphotosetup,
+gdmsetup,
+gdmthemetester,
+gdm-restart,
+gdm-safe-restart,
+gdm-stop,
+gdmconfig,
+gdmopen and
+gdmtranslate.
+
+
+
+Description
+
+gdm
+gdm is a wrapper script to execute the
+GDM binary, the configurable
+GNOME based login prompt.
+
+gdmchooser
+gdmchooser is an application for selecting
+XDMCP enabled hosts on
+the local network.
+
+gdmsetup
+gdmsetup is a graphical interface to edit the
+gdm.conf.
+
+gdm-restart and gdm-safe-restart
+gdm-restart sends the HUP
+signal and gdm-safe-restart sends the
+USR1 signal to the daemon so that it restarts. They are used after the
+config file is edited.
+
+gdmconfig
+gdmconfig is an application for managing the configuration of the
+entire GDM applications suite. It handles look and feel, security,
+XDMCP, GDMchooser and more.
+
+
diff --git a/gnome/add/gdm/gdm-exp.xml b/gnome/add/gdm/gdm-exp.xml
new file mode 100644
index 0000000000..29270ca5df
--- /dev/null
+++ b/gnome/add/gdm/gdm-exp.xml
@@ -0,0 +1,18 @@
+
+Command explanations
+
+--sysconfdir=/etc/gnome: This command puts
+configuration files in /etc/gnome instead of
+/opt/gnome2/etc.
+
+--localstatedir=/var/lib: This command
+puts files in /var/lib instead of
+/opt/gnome2/var.
+
+--with-pam-prefix=/etc: This command puts
+PAM
+configuration files in /etc/pam.d instead of
+/etc/gnome.
+
+
+
diff --git a/gnome/add/gdm/gdm-inst.xml b/gnome/add/gdm/gdm-inst.xml
new file mode 100644
index 0000000000..0252238c2c
--- /dev/null
+++ b/gnome/add/gdm/gdm-inst.xml
@@ -0,0 +1,15 @@
+
+Installation of GDM
+
+Install GDM by running the following commands:
+
+groupadd gdm &&
+useradd -c gdm -d /dev/null -g gdm -s /bin/bash gdm &&
+./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+ --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin \
+ --sysconfdir=/etc/gnome --localstatedir=/var/lib \
+ --with-pam-prefix=/etc &&
+make &&
+make install
+
+
diff --git a/gnome/add/gdm/gdm-intro.xml b/gnome/add/gdm/gdm-intro.xml
new file mode 100644
index 0000000000..f8b7f6d75f
--- /dev/null
+++ b/gnome/add/gdm/gdm-intro.xml
@@ -0,0 +1,36 @@
+
+Introduction to GDM
+
+The GDM package
+contains GNOME's Display Manager daemon. This is
+useful for allowing configurable graphical logins.
+
+Package information
+
+Download (HTTP):
+Download (FTP):
+Download size: &gdm-size;
+Estimated Disk space required:
+&gdm-buildsize;
+Estimated build time:
+&gdm-time;
+
+
+GDM dependencies
+Required
+
+,
+ and
+
+
+Optional
+
+,
+ and
+SELinux
+
+
+
+
diff --git a/gnome/add/gdm/gdm.ent b/gnome/add/gdm/gdm.ent
new file mode 100644
index 0000000000..f9af88c05f
--- /dev/null
+++ b/gnome/add/gdm/gdm.ent
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gnome/add/games/gnome-games-desc.xml b/gnome/add/gnome-games/gnome-games-desc.xml
similarity index 100%
rename from gnome/add/games/gnome-games-desc.xml
rename to gnome/add/gnome-games/gnome-games-desc.xml
diff --git a/gnome/add/games/gnome-games-exp.xml b/gnome/add/gnome-games/gnome-games-exp.xml
similarity index 100%
rename from gnome/add/games/gnome-games-exp.xml
rename to gnome/add/gnome-games/gnome-games-exp.xml
diff --git a/gnome/add/games/gnome-games-inst.xml b/gnome/add/gnome-games/gnome-games-inst.xml
similarity index 100%
rename from gnome/add/games/gnome-games-inst.xml
rename to gnome/add/gnome-games/gnome-games-inst.xml
diff --git a/gnome/add/games/gnome-games-intro.xml b/gnome/add/gnome-games/gnome-games-intro.xml
similarity index 100%
rename from gnome/add/games/gnome-games-intro.xml
rename to gnome/add/gnome-games/gnome-games-intro.xml
diff --git a/gnome/add/games/gnome-games.ent b/gnome/add/gnome-games/gnome-games.ent
similarity index 100%
rename from gnome/add/games/gnome-games.ent
rename to gnome/add/gnome-games/gnome-games.ent
diff --git a/gnome/add/gnome-media/gnome-media-desc.xml b/gnome/add/gnome-media/gnome-media-desc.xml
new file mode 100644
index 0000000000..8236b61a7d
--- /dev/null
+++ b/gnome/add/gnome-media/gnome-media-desc.xml
@@ -0,0 +1,32 @@
+
+Contents
+
+The GNOME Media package contains
+gnome-sound-recorder,
+gnome-cd,
+gnome-volume-control and
+vumeter.
+
+
+
+Description
+
+gnome-sound-recorder
+gnome-sound-recorder is
+GNOME's recorder.
+
+gnome-cd
+gnome-cd is
+GNOME's
+CD Player.
+
+gnome-volume-control
+gnome-volume-control is
+GNOME's mixer with volume
+applet.
+
+vumeter
+vumeter is a visual volume meter.
+
+
+
diff --git a/gnome/add/gnome-media/gnome-media-exp.xml b/gnome/add/gnome-media/gnome-media-exp.xml
new file mode 100644
index 0000000000..2758bf43a3
--- /dev/null
+++ b/gnome/add/gnome-media/gnome-media-exp.xml
@@ -0,0 +1,19 @@
+
+Command explanations
+
+--libexecdir=`pkg-config --variable=prefix
+ORBit-2.0`/sbin: This switch puts libexec files in
+$GNOME_PREFIX/sbin instead of
+$GNOME_PREFIX/libexec.
+
+--sysconfdir=/etc/gnome: This switch puts
+configuration files in /etc/gnome instead of
+$GNOME_PREFIX/etc.
+
+--localstatedir=/var/lib: This switch
+puts ScrollKeeper files in /var/lib/scrollkeeper
+instead of $GNOME_PREFIX/var/scrollkeeper.
+
+
+
diff --git a/gnome/add/gnome-media/gnome-media-inst.xml b/gnome/add/gnome-media/gnome-media-inst.xml
new file mode 100644
index 0000000000..e51be892ab
--- /dev/null
+++ b/gnome/add/gnome-media/gnome-media-inst.xml
@@ -0,0 +1,13 @@
+
+Installation of GNOME Media
+
+Install GNOME Media by running the following commands:
+
+./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+ --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin \
+ --sysconfdir=/etc/gnome --localstatedir=/var/lib &&
+make &&
+make install
+
+
+
diff --git a/gnome/add/gnome-media/gnome-media-intro.xml b/gnome/add/gnome-media/gnome-media-intro.xml
new file mode 100644
index 0000000000..aaf564347a
--- /dev/null
+++ b/gnome/add/gnome-media/gnome-media-intro.xml
@@ -0,0 +1,35 @@
+
+Introduction to GNOME Media
+
+The GNOME Media
+package contains GNOME's media
+applications.
+
+Package information
+
+Download (HTTP):
+Download (FTP):
+Download size: &gnome-media-size;
+Estimated Disk space required:
+&gnome-media-buildsize;
+Estimated build time:
+&gnome-media-time;
+
+
+GNOME Media dependencies
+Required
+
+ and
+
+
+Optional
+
+,
+ and
+
+
+
+
+
diff --git a/gnome/add/gnome-media/gnome-media.ent b/gnome/add/gnome-media/gnome-media.ent
new file mode 100644
index 0000000000..e1df2b1d21
--- /dev/null
+++ b/gnome/add/gnome-media/gnome-media.ent
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gnome/add/gtkhtml.xml b/gnome/add/gtkhtml.xml
new file mode 100644
index 0000000000..8ac0b4025a
--- /dev/null
+++ b/gnome/add/gtkhtml.xml
@@ -0,0 +1,9 @@
+
+
+GtkHTML->khtml-version;
+
+>khtml-intro;
+>khtml-inst;
+>khtml-desc;
+
+
diff --git a/gnome/add/gtksourceview.xml b/gnome/add/gtksourceview.xml
new file mode 100644
index 0000000000..c1bd0accb5
--- /dev/null
+++ b/gnome/add/gtksourceview.xml
@@ -0,0 +1,10 @@
+
+
+gtksourceview->ksourceview-version;
+
+>ksourceview-intro;
+>ksourceview-inst;
+>ksourceview-desc;
+
+
+
diff --git a/gnome/add/libgnomeprint.xml b/gnome/add/libgnomeprint.xml
new file mode 100644
index 0000000000..6da4ab1fee
--- /dev/null
+++ b/gnome/add/libgnomeprint.xml
@@ -0,0 +1,11 @@
+
+
+libgnomeprint-&libgnomeprint-version;
+
+&libgnomeprint-intro;
+&libgnomeprint-inst;
+&libgnomeprint-exp;
+&libgnomeprint-desc;
+
+
+
diff --git a/gnome/add/libgnomeprintui.xml b/gnome/add/libgnomeprintui.xml
new file mode 100644
index 0000000000..c7938489a4
--- /dev/null
+++ b/gnome/add/libgnomeprintui.xml
@@ -0,0 +1,11 @@
+
+
+libgnomeprintui-&libgnomeprintui-version;
+
+&libgnomeprintui-intro;
+&libgnomeprintui-inst;
+&libgnomeprintui-exp;
+&libgnomeprintui-desc;
+
+
+
diff --git a/gnome/add/libgtkhtml.xml b/gnome/add/libgtkhtml.xml
new file mode 100644
index 0000000000..5c82211d34
--- /dev/null
+++ b/gnome/add/libgtkhtml.xml
@@ -0,0 +1,10 @@
+
+
+libgtkhtml-&libgtkhtml-version;
+
+&libgtkhtml-intro;
+&libgtkhtml-inst;
+&libgtkhtml-desc;
+
+
+
diff --git a/gnome/gnome.ent b/gnome/gnome.ent
index 10b06d503b..c3336fc36f 100644
--- a/gnome/gnome.ent
+++ b/gnome/gnome.ent
@@ -81,19 +81,19 @@
-
+
%libgnomeprint;
-
+
%libgnomeprintui;
-
-%gtkhtml2;
-
+
+%gtkhtml;
+
%libgtkhtml;
%yelp;
%bug-buddy;
-
+
%gtksourceview;
%gedit;
@@ -103,15 +103,15 @@
%ggv;
%file-roller;
-
+
%gconf-editor;
-
+
%gnome-utils;
-
-%gal2;
-
+
+%gal;
+
%gnome-system-monitor;
-
+
%gnome-media;
%nautilus-media;
@@ -129,7 +129,7 @@
%zenity;
%gnome-speech;
-
+
%at-spi;
%gnome-mag;
@@ -141,25 +141,11 @@
%epiphany;
%gnomemeeting;
-
-
-
-
-
-%linc;
-%bonobo-activation;
-%gtk-thinice-engine;
-%libgail-gnome;
-
-
-
-
+
%gnome-games;
+
%gnome2-user-docs;
-%acme;
-
-
-
+
%gdm;
@@ -174,11 +160,11 @@
-
+
-
+
%orbit;
%oaf;
@@ -189,9 +175,9 @@
%gconf1;
%gnome-vfs1;
%libglade14;
-%gal;
+%gal1;
%guppi;
%libcapplet;
%soup;
-%gtkhtml;
+%gtkhtml1;
%libghttp;