diff --git a/basicnet/netlibs/libsoup.xml b/basicnet/netlibs/libsoup.xml index 26c102e852..80b783e64d 100644 --- a/basicnet/netlibs/libsoup.xml +++ b/basicnet/netlibs/libsoup.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/book/organization.xml b/book/organization.xml index c658452834..acc5fa16fa 100644 --- a/book/organization.xml +++ b/book/organization.xml @@ -62,7 +62,7 @@ GNOME is the main alternative to KDE in the Desktop Environment arena and - we cover GNOME-&gnome-version; here. + we cover GNOME-&gnome-old-version; here. Part IX - X Software diff --git a/general.ent b/general.ent index 1ea7e88e2b..04734fd2ed 100644 --- a/general.ent +++ b/general.ent @@ -3,7 +3,7 @@ $LastChangedBy$ $Date$ --> - + @@ -562,9 +562,10 @@ $Date$ - + + - + diff --git a/general/genutils/scrollkeeper.xml b/general/genutils/scrollkeeper.xml index 6779743ada..80df782528 100644 --- a/general/genutils/scrollkeeper.xml +++ b/general/genutils/scrollkeeper.xml @@ -83,7 +83,7 @@ --disable-static \ --with-omfdirs=/usr/share/omf:\ /opt/kde-&kde-version;/share/omf:\ -/opt/gnome-&gnome-version;&gnome-minor-version;/share/omf && +/opt/gnome-&gnome-old-version;&gnome-minor-version;/share/omf && make diff --git a/general/prog/python-modules.xml b/general/prog/python-modules.xml index 5a17373c29..aa84193188 100644 --- a/general/prog/python-modules.xml +++ b/general/prog/python-modules.xml @@ -54,8 +54,8 @@ - - + + diff --git a/gnome/add/brasero.xml b/gnome/add/brasero.xml index de554bc097..dc050bccb8 100644 --- a/gnome/add/brasero.xml +++ b/gnome/add/brasero.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/add/bug-buddy.xml b/gnome/add/bug-buddy.xml index b7b87fb36a..0cffe6ab0a 100644 --- a/gnome/add/bug-buddy.xml +++ b/gnome/add/bug-buddy.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/add/eog.xml b/gnome/add/eog.xml index 383bab37a1..fa132d8240 100644 --- a/gnome/add/eog.xml +++ b/gnome/add/eog.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/add/epiphany.xml b/gnome/add/epiphany.xml index 9ec9d81a11..8e28ce9d9a 100644 --- a/gnome/add/epiphany.xml +++ b/gnome/add/epiphany.xml @@ -4,8 +4,8 @@ %general-entities; - - + + @@ -144,7 +144,7 @@ make epiphany None - $GNOME_PREFIX{/include/epiphany/&gnome-version;/epiphany, + $GNOME_PREFIX{/include/epiphany/&gnome-old-version;/epiphany, share/{epiphany/{glade,icons/hicolor/*},gnome/help/epiphany/*}} diff --git a/gnome/add/evince.xml b/gnome/add/evince.xml index 8e4a69d612..d67634e3b0 100644 --- a/gnome/add/evince.xml +++ b/gnome/add/evince.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/add/evolution-data-server.xml b/gnome/add/evolution-data-server.xml index e0f6a70914..1cd810feb5 100644 --- a/gnome/add/evolution-data-server.xml +++ b/gnome/add/evolution-data-server.xml @@ -4,8 +4,8 @@ %general-entities; - - + + @@ -208,9 +208,9 @@ make libedata-cal-1.2.so, libedataserver-1.2.so, libedataserverui-1.2.so, libegroupwise-1.2.so, libexchange-storage-1.2.so, libgdata-1.2.so, libgdata-google and numerous provider and extension modules. - $GNOME_PREFIX/{include/evolution-data-server-&gnome-version;/*, + $GNOME_PREFIX/{include/evolution-data-server-&gnome-old-version;/*, lib/evolution-data-server-1.2/{camel-providers,extensions}, - share/{evolution-data-server-&gnome-version;/{glade,weather}, + share/{evolution-data-server-&gnome-old-version;/{glade,weather}, gtk-doc/html/*,idl/evolution-data-server-1.2, pixmaps/evolution-data-server}} diff --git a/gnome/add/file-roller.xml b/gnome/add/file-roller.xml index 75d9993971..055e5260fd 100644 --- a/gnome/add/file-roller.xml +++ b/gnome/add/file-roller.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/add/gconf-editor.xml b/gnome/add/gconf-editor.xml index cf0f5a4d88..0b580a97cb 100644 --- a/gnome/add/gconf-editor.xml +++ b/gnome/add/gconf-editor.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/add/gdm.xml b/gnome/add/gdm.xml index 9965f7aab7..266b4bd18f 100644 --- a/gnome/add/gdm.xml +++ b/gnome/add/gdm.xml @@ -4,8 +4,8 @@ %general-entities; - - + + @@ -165,7 +165,7 @@ ln -s /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 $(pkg-config \ $GNOME_PREFIX/share/gdm/defaults.conf - + &gnome-etc-dir;/gdm/custom.conf @@ -267,7 +267,7 @@ chmod -v 644 $GNOME_PREFIX/share/xsessions/gnome-dbus.desktop package. If your GNOME_PREFIX environment variable is anything other than /usr or /opt/gnome-&gnome-version;&gnome-minor-version;, + class='directory'>/opt/gnome-&gnome-old-version;&gnome-minor-version;, you will need to modify the PATH statement in the script to include the path where you have GNOME installed. diff --git a/gnome/add/gedit.xml b/gnome/add/gedit.xml index 113d26de45..91e2c46fb9 100644 --- a/gnome/add/gedit.xml +++ b/gnome/add/gedit.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/add/gnome-disk-utility.xml b/gnome/add/gnome-disk-utility.xml index f68313e8cc..142486ee1b 100644 --- a/gnome/add/gnome-disk-utility.xml +++ b/gnome/add/gnome-disk-utility.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/add/gnome-games.xml b/gnome/add/gnome-games.xml index 9246d6bb46..3442b6aede 100644 --- a/gnome/add/gnome-games.xml +++ b/gnome/add/gnome-games.xml @@ -4,8 +4,8 @@ %general-entities; - - + + @@ -34,7 +34,7 @@ artwork and themes for the games are supplied in a separate package. You can download the GNOME Games Extra Data package from . + url="&gnome-download-http;/gnome-games-extra-data/&gnome-old-version;/"/>. Package Information diff --git a/gnome/add/gnome-media.xml b/gnome/add/gnome-media.xml index 76f3ba0ba6..694bd8b51e 100644 --- a/gnome/add/gnome-media.xml +++ b/gnome/add/gnome-media.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/add/gnome-power-manager.xml b/gnome/add/gnome-power-manager.xml index f8dde2d9d9..704dcf1230 100644 --- a/gnome/add/gnome-power-manager.xml +++ b/gnome/add/gnome-power-manager.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/add/gnome-screensaver.xml b/gnome/add/gnome-screensaver.xml index e4697bd859..edf5f0b525 100644 --- a/gnome/add/gnome-screensaver.xml +++ b/gnome/add/gnome-screensaver.xml @@ -4,8 +4,8 @@ %general-entities; - - + + @@ -209,7 +209,7 @@ install -v -m644 xscreensavers/*.desktop \ /etc/pam.d/gnome-screensaver - + &gnome-etc-dir;/gdm/custom.conf diff --git a/gnome/add/gnome-utils.xml b/gnome/add/gnome-utils.xml index 1ecaf3723d..87147ba619 100644 --- a/gnome/add/gnome-utils.xml +++ b/gnome/add/gnome-utils.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/add/gok.xml b/gnome/add/gok.xml index 5e9cb30372..97f4e75f4a 100644 --- a/gnome/add/gok.xml +++ b/gnome/add/gok.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/add/gucharmap.xml b/gnome/add/gucharmap.xml index 0febdf0341..32f75b5205 100644 --- a/gnome/add/gucharmap.xml +++ b/gnome/add/gucharmap.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/add/orca.xml b/gnome/add/orca.xml index 6be55e23f4..5c62f23949 100644 --- a/gnome/add/orca.xml +++ b/gnome/add/orca.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/add/totem-pl-parser.xml b/gnome/add/totem-pl-parser.xml index b71497804d..50b8e4e243 100644 --- a/gnome/add/totem-pl-parser.xml +++ b/gnome/add/totem-pl-parser.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/add/totem.xml b/gnome/add/totem.xml index 536aaf54fe..774684fbd8 100644 --- a/gnome/add/totem.xml +++ b/gnome/add/totem.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/add/zenity.xml b/gnome/add/zenity.xml index f63c12450c..acac242151 100644 --- a/gnome/add/zenity.xml +++ b/gnome/add/zenity.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/core/gnome-applets.xml b/gnome/core/gnome-applets.xml index 08ea354bd1..785f80f6be 100644 --- a/gnome/core/gnome-applets.xml +++ b/gnome/core/gnome-applets.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/core/gnome-backgrounds.xml b/gnome/core/gnome-backgrounds.xml index 772293109e..3cac050ad7 100644 --- a/gnome/core/gnome-backgrounds.xml +++ b/gnome/core/gnome-backgrounds.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/core/gnome-control-center.xml b/gnome/core/gnome-control-center.xml index fb2822613f..58006b32a8 100644 --- a/gnome/core/gnome-control-center.xml +++ b/gnome/core/gnome-control-center.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/core/gnome-desktop.xml b/gnome/core/gnome-desktop.xml index a67aa29ad0..fe75fe6758 100644 --- a/gnome/core/gnome-desktop.xml +++ b/gnome/core/gnome-desktop.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/core/gnome-icon-theme.xml b/gnome/core/gnome-icon-theme.xml index c70c23f7dc..fdfad3c3df 100644 --- a/gnome/core/gnome-icon-theme.xml +++ b/gnome/core/gnome-icon-theme.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/core/gnome-keyring.xml b/gnome/core/gnome-keyring.xml index 5db0be5e2a..4d2c8529a8 100644 --- a/gnome/core/gnome-keyring.xml +++ b/gnome/core/gnome-keyring.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/core/gnome-menus.xml b/gnome/core/gnome-menus.xml index 9927a1ed1c..a7f8b7ef5f 100644 --- a/gnome/core/gnome-menus.xml +++ b/gnome/core/gnome-menus.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/core/gnome-panel.xml b/gnome/core/gnome-panel.xml index 9187e1b77d..c2cf7e4d4f 100644 --- a/gnome/core/gnome-panel.xml +++ b/gnome/core/gnome-panel.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/core/gnome-session.xml b/gnome/core/gnome-session.xml index 024ce911cf..bb2c121c01 100644 --- a/gnome/core/gnome-session.xml +++ b/gnome/core/gnome-session.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/core/gnome-settings-daemon.xml b/gnome/core/gnome-settings-daemon.xml index b02f61ff08..fed38ea62c 100644 --- a/gnome/core/gnome-settings-daemon.xml +++ b/gnome/core/gnome-settings-daemon.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/core/gnome-terminal.xml b/gnome/core/gnome-terminal.xml index 7086ce674f..e9d0eb608c 100644 --- a/gnome/core/gnome-terminal.xml +++ b/gnome/core/gnome-terminal.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/core/gnome-themes.xml b/gnome/core/gnome-themes.xml index 5a09dea69c..a99047a418 100644 --- a/gnome/core/gnome-themes.xml +++ b/gnome/core/gnome-themes.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/core/gnome-user-docs.xml b/gnome/core/gnome-user-docs.xml index 2edddd6ba4..6eebb783e2 100644 --- a/gnome/core/gnome-user-docs.xml +++ b/gnome/core/gnome-user-docs.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/core/libgnome.xml b/gnome/core/libgnome.xml index 2e62628d9b..3fc87cc95d 100644 --- a/gnome/core/libgnome.xml +++ b/gnome/core/libgnome.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/core/libgnomekbd.xml b/gnome/core/libgnomekbd.xml index 98a59c86b2..3aaca28c4c 100644 --- a/gnome/core/libgnomekbd.xml +++ b/gnome/core/libgnomekbd.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/core/libgweather.xml b/gnome/core/libgweather.xml index dee4753dc9..c4452d43c9 100644 --- a/gnome/core/libgweather.xml +++ b/gnome/core/libgweather.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/core/nautilus.xml b/gnome/core/nautilus.xml index 1f862cc92f..82d41e6559 100644 --- a/gnome/core/nautilus.xml +++ b/gnome/core/nautilus.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/core/pre-install-config.xml b/gnome/core/pre-install-config.xml index cb15a81af6..8740d5c8cc 100644 --- a/gnome/core/pre-install-config.xml +++ b/gnome/core/pre-install-config.xml @@ -33,33 +33,33 @@ issue the following commands as the root user: -install -v -m755 -d /opt/gnome-&gnome-version;&gnome-minor-version; && -ln -v -s gnome-&gnome-version;&gnome-minor-version; /opt/gnome +install -v -m755 -d /opt/gnome-&gnome-old-version;&gnome-minor-version; && +ln -v -s gnome-&gnome-old-version;&gnome-minor-version; /opt/gnome If you created the symbolic link, change all instances of /opt/gnome-&gnome-version;&gnome-minor-version; + class='directory'>/opt/gnome-&gnome-old-version;&gnome-minor-version; to /opt/gnome in the instructions below. -export GNOME_PREFIX=/opt/gnome-&gnome-version;&gnome-minor-version; +export GNOME_PREFIX=/opt/gnome-&gnome-old-version;&gnome-minor-version; The try-out group will also need to make all the following configuration changes: Add to your system or personal profile: -export PATH=$PATH:/opt/gnome-&gnome-version;&gnome-minor-version;/bin -export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome-&gnome-version;&gnome-minor-version;/lib/pkgconfig -export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome-&gnome-version;&gnome-minor-version;/share/pkgconfig -export GNOME_LIBCONFIG_PATH=/usr/lib:/opt/gnome-&gnome-version;&gnome-minor-version;/lib +export PATH=$PATH:/opt/gnome-&gnome-old-version;&gnome-minor-version;/bin +export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome-&gnome-old-version;&gnome-minor-version;/lib/pkgconfig +export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome-&gnome-old-version;&gnome-minor-version;/share/pkgconfig +export GNOME_LIBCONFIG_PATH=/usr/lib:/opt/gnome-&gnome-old-version;&gnome-minor-version;/lib Add to your /etc/ld.so.conf: cat >> /etc/ld.so.conf << "EOF" # Begin gnome addition to /etc/ld.so.conf -/opt/gnome-&gnome-version;&gnome-minor-version;/lib +/opt/gnome-&gnome-old-version;&gnome-minor-version;/lib # End gnome addition EOF @@ -69,7 +69,7 @@ EOF cat >> /etc/man_db.conf << "EOF" # Begin gnome addition to man_db.conf -MANDATORY_MANPATH /opt/gnome-&gnome-version;&gnome-minor-version;/share/man +MANDATORY_MANPATH /opt/gnome-&gnome-old-version;&gnome-minor-version;/share/man # End gnome addition to man_db.conf EOF diff --git a/gnome/core/yelp.xml b/gnome/core/yelp.xml index f5052de524..37913c46d6 100644 --- a/gnome/core/yelp.xml +++ b/gnome/core/yelp.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/gnome/gnome-intro.xml b/gnome/gnome-intro.xml index 0e31369001..e320f1fad0 100644 --- a/gnome/gnome-intro.xml +++ b/gnome/gnome-intro.xml @@ -25,23 +25,23 @@ $Date$ --> This chapter presents the instructions to install a complete - GNOME-&gnome-version;&gnome-minor-version; desktop environment. The order of + GNOME-&gnome-old-version;&gnome-minor-version; desktop environment. The order of the installed packages follows the build order defined by the GNOME development team and has been thoroughly tested by the BLFS team. - The installation of GNOME-&gnome-version;&gnome-minor-version; is a + The installation of GNOME-&gnome-old-version;&gnome-minor-version; is a large undertaking and one we would like to see you complete with the least amount of stress. One of the first goals in this installation is to protect your previously installed software, especially if you are testing GNOME on - your machine. GNOME-&gnome-version; packages utilize the + your machine. GNOME-&gnome-old-version; packages utilize the passed to configure, so you will use that and an environment variable (GNOME_PREFIX) to add flexibility to the installation. @@ -50,26 +50,26 @@ $Date$ install using . If you are not sure that you are going to keep the GNOME installation, or you think you will update to the newest releases as they become available, you should install with - . + . Setting the environment variable and the additional edits required by the second option are covered in the Pre-Installation Configuration section. If you choose the second option, removal of - GNOME-&gnome-version;&gnome-minor-version; is as easy as removing the edits + GNOME-&gnome-old-version;&gnome-minor-version; is as easy as removing the edits from the pre-installation page and issuing the following command (you may need to become the root user): -rm -rf /opt/gnome-&gnome-version;&gnome-minor-version; +rm -rf /opt/gnome-&gnome-old-version;&gnome-minor-version; If your system was completely built per LFS and BLFS instructions, you have a very good chance of using - GNOME-&gnome-version;&gnome-minor-version; after your first installation. If + GNOME-&gnome-old-version;&gnome-minor-version; after your first installation. If you are a typical LFS user, you have made modifications to the instructions along the way knowing that you have to take those modifications into account on future installations. You should have no problems integrating - GNOME-&gnome-version;&gnome-minor-version; into your unique setup, but you + GNOME-&gnome-old-version;&gnome-minor-version; into your unique setup, but you will have to install well over 50 packages before you can run GNOME through any testing (assuming your windowing system is preinstalled and tested). You should anticipate that you will be rebuilding GNOME at least once to make @@ -97,16 +97,16 @@ make /opt/gnome/var to /var. You should consider using the GNOME 1.4 hint located at if you have no - interest in GNOME-&gnome-version;&gnome-minor-version;. --> + interest in GNOME-&gnome-old-version;&gnome-minor-version;. --> Alternate Installation Methods As was previously mentioned, building a GNOME desktop from sources is a significant project. Some may find it too tedious or time-consuming to perform a full installation following the BLFS book. You may wish to review the - automated methods mentioned in the GNOME-&gnome-version; Release + automated methods mentioned in the GNOME-&gnome-old-version; Release Notes. Note that using any other method to install - GNOME-&gnome-version;&gnome-minor-version; other than using the BLFS + GNOME-&gnome-old-version;&gnome-minor-version; other than using the BLFS instructions cannot be supported by the BLFS team. Alternate methods are only mentioned as a courtesy to builders who would like to build GNOME from sources but do not have the time/desire/patience/whatever to follow the BLFS diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index ef5d1a2b5f..80879e83d4 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -40,6 +40,16 @@ --> + + August 15th, 2010 + + + [wblaszcz] - GNOME update prep. (Changed gnome-version to + gnome-old-version) + + + + August 14th, 2010 diff --git a/x/lib/libwnck.xml b/x/lib/libwnck.xml index e7646eacdd..15cdbd8ddf 100644 --- a/x/lib/libwnck.xml +++ b/x/lib/libwnck.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/x/wm/metacity.xml b/x/wm/metacity.xml index 2c3ae50fbe..1c7df290d5 100644 --- a/x/wm/metacity.xml +++ b/x/wm/metacity.xml @@ -4,8 +4,8 @@ %general-entities; - - + + diff --git a/xsoft/office/evolution.xml b/xsoft/office/evolution.xml index 3a925288cd..a4b47cee32 100644 --- a/xsoft/office/evolution.xml +++ b/xsoft/office/evolution.xml @@ -4,8 +4,8 @@ %general-entities; - - + +