diff --git a/general.ent b/general.ent index 4a6d60716c..c66572eb90 100644 --- a/general.ent +++ b/general.ent @@ -257,7 +257,7 @@ - + @@ -346,7 +346,7 @@ - + @@ -356,7 +356,7 @@ - + @@ -372,37 +372,41 @@ - - + + + + + + - + - + - + - - + + - + - - - - - + + + + + @@ -416,41 +420,41 @@ - + - + - + - + - + - + - - - + + + - + - - - + + + - + diff --git a/gnome/core/gnome-applets.xml b/gnome/core/gnome-applets.xml index 4e4d4ffd88..ea0d000296 100644 --- a/gnome/core/gnome-applets.xml +++ b/gnome/core/gnome-applets.xml @@ -4,12 +4,12 @@ %general-entities; - - - - - - + + + + + + ]> @@ -63,7 +63,7 @@ Required , - and + , and Optional @@ -73,8 +73,11 @@ , , , - libapm - and libnotify + libapm, + and + libnotify-0.2.2 @@ -84,36 +87,29 @@ Install GNOME Applets by running the following commands: -export PRE=`pkg-config --variable=prefix ORBit-2.0` && -./configure --prefix=$PRE --libexecdir=$PRE/sbin \ - --localstatedir=/var/lib --sysconfdir=/etc/gnome && -make tooldir=$PRE/lib/gnome-applets +./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \ + --libexecdir=`pkg-config \ + --variable=prefix ORBit-2.0`/lib/gnome-applets \ + --localstatedir=/var/lib \ + --sysconfdir=&gnome-etc-dir; && +make This package does not come with a test suite. Now, as the root user: - - If you switch to the root - user in a manner which causes the PRE environment variable - to be unset, ensure you set it again before installing the package. - - -make tooldir=$PRE/lib/gnome-applets install && +make install && make -C man install-man - Remove the variable from the unprivileged user's environment using - the following command: - -unset PRE - Command Explanations - --libexecdir=$PRE/sbin: This switch puts libexec - files in $GNOME_PREFIX/sbin instead of + --libexecdir=`pkg-config --variable=prefix + ORBit-2.0`/lib/gnome-applets: This switch puts libexec files + in $GNOME_PREFIX/lib/gnome-applets + instead of $GNOME_PREFIX/libexec. --localstatedir=/var/lib: This switch @@ -121,17 +117,12 @@ make -C man install-man /var/lib/scrollkeeper instead of $GNOME_PREFIX/var/scrollkeeper. - --sysconfdir=/etc/gnome: This switch - puts configuration files in /etc/gnome + --sysconfdir=&gnome-etc-dir;: This switch puts + configuration files in &gnome-etc-dir; instead of $GNOME_PREFIX/etc. - tooldir=$PRE/lib/gnome-applets: This puts the - mini-commander applet files in - $PRE/lib/gnome-applets instead of - $PRE/sbin/gnome-applets. - make -C man install-man: This installs the man-pages - in $PRE/man. + that are not installed during make install. @@ -152,7 +143,7 @@ make -C man install-man stickynotes_applet, and trashapplet None several config directories under the - /etc/gnome/gconf/gconf.xml.defaults/ hierarchy, + &gnome-etc-dir;/gconf/gconf.xml.defaults/ hierarchy, $GNOME_PREFIX/include/libgswitchit, $GNOME_PREFIX/lib/gnome-applets, several help directories under the $GNOME_PREFIX/share/gnome/help/ hierarchy, diff --git a/gnome/core/gnome-backgrounds.xml b/gnome/core/gnome-backgrounds.xml index b7bfffabf3..86365d0123 100644 --- a/gnome/core/gnome-backgrounds.xml +++ b/gnome/core/gnome-backgrounds.xml @@ -4,11 +4,11 @@ %general-entities; - - - + + + - + ]> @@ -62,7 +62,7 @@ gnome-backgrounds Dependencies Required - + diff --git a/gnome/core/gnome-desktop-file-utils.xml b/gnome/core/gnome-desktop-file-utils.xml index 409e6f68b7..3bdb21f4bd 100644 --- a/gnome/core/gnome-desktop-file-utils.xml +++ b/gnome/core/gnome-desktop-file-utils.xml @@ -16,10 +16,9 @@ desktop-file-utils-&desktop-file-utils-version; The package is located in - Chapter 10 – General Utilities, however it is now required by - GNOME-2 starting with version 2.8. - desktop-file-utils is not a direct dependency - of any GNOME-2 package, therefore the package + Chapter 10 — General Utilities and is required by + GNOME-2 but is not a direct dependency of any + GNOME-2 package, therefore the package is mentioned within the GNOME-2 Core Packages chapter to ensure it is installed. diff --git a/gnome/core/gnome-desktop.xml b/gnome/core/gnome-desktop.xml index 2d9c642d40..f7465024ec 100644 --- a/gnome/core/gnome-desktop.xml +++ b/gnome/core/gnome-desktop.xml @@ -4,11 +4,11 @@ %general-entities; - - - + + + - + ]> @@ -78,7 +78,7 @@ running the following commands: ./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \ - --sysconfdir=/etc/gnome --localstatedir=/var/lib && + --sysconfdir=&gnome-etc-dir; --localstatedir=/var/lib && make This package does not come with a test suite. @@ -92,8 +92,8 @@ make Command Explanations - --sysconfdir=/etc/gnome: This switch - puts configuration files in /etc/gnome + --sysconfdir=&gnome-etc-dir;: This switch puts + configuration files in &gnome-etc-dir; instead of $GNOME_PREFIX/etc. : Use this diff --git a/gnome/core/gnome-doc-utils.xml b/gnome/core/gnome-doc-utils.xml index 932443a389..3830bff0ff 100644 --- a/gnome/core/gnome-doc-utils.xml +++ b/gnome/core/gnome-doc-utils.xml @@ -4,8 +4,8 @@ %general-entities; - - + + @@ -69,8 +69,9 @@ GNOME Doc Utils Dependencies Required - and - + , + , and + Optional diff --git a/gnome/core/gnome-icon-theme.xml b/gnome/core/gnome-icon-theme.xml index ce848c6445..894b540895 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 67d75b3fc3..b71bb4726c 100644 --- a/gnome/core/gnome-keyring.xml +++ b/gnome/core/gnome-keyring.xml @@ -4,11 +4,11 @@ %general-entities; - - - - - + + + + + ]> @@ -75,7 +75,8 @@ following commands: ./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \ - --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin && + --libexecdir=`pkg-config \ + --variable=prefix ORBit-2.0`/lib/gnome-keyring && make This package does not come with a test suite. @@ -90,8 +91,9 @@ make Command Explanations --libexecdir=`pkg-config --variable=prefix - ORBit-2.0`/sbin: This switch puts libexec files in - $GNOME_PREFIX/sbin instead of + ORBit-2.0`/lib/gnome-keyring: This switch puts libexec files in + $GNOME_PREFIX/lib/gnome-keyring + instead of $GNOME_PREFIX/libexec. @@ -105,9 +107,10 @@ make Installed Directory - gnome-keyring-ask and gnome-keyring-daemon + gnome-keyring-daemon libgnome-keyring.so - $GNOME_PREFIX/include/gnome-keyring-1 + $GNOME_PREFIX/include/gnome-keyring-1 and + $GNOME_PREFIX/lib/gnome-keyring diff --git a/gnome/core/gnome-menus.xml b/gnome/core/gnome-menus.xml index 3a508211a4..637532db45 100644 --- a/gnome/core/gnome-menus.xml +++ b/gnome/core/gnome-menus.xml @@ -4,8 +4,8 @@ %general-entities; - - + + @@ -67,7 +67,7 @@ Required and - + Optional and @@ -85,7 +85,7 @@ following commands: ./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \ - --sysconfdir=/etc/gnome && + --sysconfdir=&gnome-etc-dir; && make This package does not come with a test suite. @@ -118,7 +118,7 @@ ln -v -s $GNOME_PREFIX/lib/python2.4/site-packages/gmenu.* \ profiles as shown below (you may add additional directories, separated with colons, if desired): -export XDG_CONFIG_DIRS=/etc/gnome/xdg +export XDG_CONFIG_DIRS=/usr/share:&gnome-etc-dir;/xdg @@ -135,7 +135,7 @@ ln -v -s $GNOME_PREFIX/lib/python2.4/site-packages/gmenu.* \ gnome-menu-spec-test libgnome-menu.[so,a] - /etc/gnome/xdg, $GNOME_PREFIX/include/gnome-menus, + &gnome-etc-dir;/xdg, $GNOME_PREFIX/include/gnome-menus, $GNOME_PREFIX/lib/python2.4/site-packages/GMenuSimpleEditor and $GNOME_PREFIX/share/desktop-directories diff --git a/gnome/core/gnome-mime-data.xml b/gnome/core/gnome-mime-data.xml index 919bd5afec..04476ae093 100644 --- a/gnome/core/gnome-mime-data.xml +++ b/gnome/core/gnome-mime-data.xml @@ -4,8 +4,8 @@ %general-entities; - - + + @@ -76,7 +76,7 @@ the following commands: ./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \ - --sysconfdir=/etc/gnome && + --sysconfdir=&gnome-etc-dir; && make This package does not come with a test suite. @@ -92,8 +92,8 @@ install -v -m644 -D man/gnome-vfs-mime.5 \ Command Explanations - --sysconfdir=/etc/gnome: This switch - puts configuration files in /etc/gnome + --sysconfdir=&gnome-etc-dir;: This switch + puts configuration files in &gnome-etc-dir; instead of $GNOME_PREFIX/etc. diff --git a/gnome/core/gnome-panel.xml b/gnome/core/gnome-panel.xml index 4fd2c23b3f..50d8afb093 100644 --- a/gnome/core/gnome-panel.xml +++ b/gnome/core/gnome-panel.xml @@ -4,11 +4,11 @@ %general-entities; - - - + + + - + ]> @@ -62,12 +62,12 @@ Required , - and + , and Optional - (required if - you plan on installing Evolution or + + (required if you plan to install Evolution or GnomeMeeting) and @@ -80,8 +80,9 @@ running the following commands: ./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \ - --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin \ - --localstatedir=/var/lib --sysconfdir=/etc/gnome && + --libexecdir=`pkg-config \ + --variable=prefix ORBit-2.0`/lib/gnome-panel \ + --localstatedir=/var/lib --sysconfdir=&gnome-etc-dir; && make This package does not come with a test suite. @@ -96,12 +97,13 @@ make Command Explanations --libexecdir=`pkg-config --variable=prefix - ORBit-2.0`/sbin: This switch puts libexec files in - $GNOME_PREFIX/sbin instead of + ORBit-2.0`/lib/gnome-panel: This switch puts libexec files in + $GNOME_PREFIX/lib/gnome-panel + instead of $GNOME_PREFIX/libexec. - --sysconfdir=/etc/gnome: This switch - puts configuration files in /etc/gnome + --sysconfdir=&gnome-etc-dir;: This switch puts + configuration files in &gnome-etc-dir; instead of $GNOME_PREFIX/etc. @@ -118,7 +120,7 @@ make clock-applet, fish-applet-2, gnome-desktop-item-edit, gnome-panel, gnome-desktop-item-edit, notification-area-applet, and wnck-applet libpanel-applet-2.[so,a] and bonobo servers - /etc/gnome/gconf/gconf.xml.defaults/[,schemas]/apps, + &gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas]/apps, $GNOME_PREFIX/include/panel-2.0, $GNOME_PREFIX/share/idl/gnome-panel-2.0, some help directories under the $GNOME_PREFIX/share/gnome/help hierarchy, diff --git a/gnome/core/gnome-session.xml b/gnome/core/gnome-session.xml index f1c97ef815..b614d90fd4 100644 --- a/gnome/core/gnome-session.xml +++ b/gnome/core/gnome-session.xml @@ -4,8 +4,8 @@ %general-entities; - - + + @@ -75,7 +75,7 @@ running the following commands: ./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \ - --sysconfdir=/etc/gnome && + --sysconfdir=&gnome-etc-dir; && make This package does not come with a test suite. @@ -89,8 +89,8 @@ make Command Explanations - --sysconfdir=/etc/gnome: This switch puts - configuration files in /etc/gnome + --sysconfdir=&gnome-etc-dir;: This switch puts + configuration files in &gnome-etc-dir; instead of $GNOME_PREFIX/etc. @@ -107,8 +107,8 @@ make gnome-session, gnome-session-properties, gnome-session-remove, gnome-session-save, gnome-smproxy, and gnome-wm None - /etc/gnome/gconf/gconf.xml.defaults/schemas/apps/gnome-session, - /etc/gnome/gconf/gconf.xml.defaults/apps/gnome-session, + &gnome-etc-dir;/gconf/gconf.xml.defaults/schemas/apps/gnome-session, + &gnome-etc-dir;/gconf/gconf.xml.defaults/apps/gnome-session, and $GNOME_PREFIX/share/pixmaps/splash diff --git a/gnome/core/gnome-terminal.xml b/gnome/core/gnome-terminal.xml index ca62b0ea46..96d8a8abad 100644 --- a/gnome/core/gnome-terminal.xml +++ b/gnome/core/gnome-terminal.xml @@ -4,8 +4,8 @@ %general-entities; - - + + @@ -63,7 +63,7 @@ Required , , - and + , and @@ -75,7 +75,7 @@ running the following commands: ./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \ - --localstatedir=/var/lib --sysconfdir=/etc/gnome && + --localstatedir=/var/lib --sysconfdir=&gnome-etc-dir; && make This package does not come with a test suite. @@ -94,8 +94,8 @@ make /var/lib/scrollkeeper instead of $GNOME_PREFIX/var/scrollkeeper. - --sysconfdir=/etc/gnome: This switch - puts configuration files in /etc/gnome + --sysconfdir=&gnome-etc-dir;: This switch puts + configuration files in &gnome-etc-dir; instead of $GNOME_PREFIX/etc. @@ -111,8 +111,8 @@ make gnome-terminal None - /etc/gnome/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal, - /etc/gnome/gconf/gconf.xml.defaults/apps/gnome-terminal, + &gnome-etc-dir;/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal, + &gnome-etc-dir;/gconf/gconf.xml.defaults/apps/gnome-terminal, $GNOME_PREFIX/share/gnome/help/gnome-terminal, $GNOME_PREFIX/share/gnome-terminal, and $GNOME_PREFIX/share/omf/gnome-terminal diff --git a/gnome/core/gnome-themes.xml b/gnome/core/gnome-themes.xml index 423d24eee6..fe2202266b 100644 --- a/gnome/core/gnome-themes.xml +++ b/gnome/core/gnome-themes.xml @@ -4,8 +4,8 @@ %general-entities; - - + + @@ -61,7 +61,7 @@ GNOME Themes Dependencies Required - and + and @@ -87,7 +87,8 @@ make Command Explanations : Using this parameter enables - the installation of additional accessibility themes. + the installation of additional accessibility themes. Omit this parameter if + you have no desire for additional accessibility themes. diff --git a/gnome/core/gnome-vfs.xml b/gnome/core/gnome-vfs.xml index 151bd0b5ef..e5730bd6ad 100644 --- a/gnome/core/gnome-vfs.xml +++ b/gnome/core/gnome-vfs.xml @@ -4,12 +4,12 @@ %general-entities; - - - - - - + + + + + + ]> @@ -59,23 +59,12 @@ - Additional Downloads - - - Required patch if Samba version - greater than 3.0.14 is installed: - - - GNOME Virtual File System Dependencies Required - , - , - , - and - + , + , and + Optional , @@ -85,9 +74,13 @@ , , or - GnuTLS, + GnuTLS + (which needs libgpg-error + then libgcrypt), or , - OpenAFS and + OpenAFS, and Howl @@ -98,10 +91,10 @@ Install GNOME Virtual File System by running the following commands: -patch -Np1 -i ../gnome-vfs-&gnome-vfs-version;-samba_3.0.20-1.patch && -./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \ - --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin \ - --sysconfdir=/etc/gnome && +./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \ + --libexecdir=`pkg-config \ + --variable=prefix ORBit-2.0`/lib/gnome-vfs-2.0 \ + --sysconfdir=&gnome-etc-dir; && make To test the results, issue: make check. @@ -115,13 +108,14 @@ make Command Explanations - --sysconfdir=/etc/gnome: This switch puts - configuration files in /etc/gnome + --sysconfdir=&gnome-etc-dir;: This switch puts + configuration files in &gnome-etc-dir; instead of $GNOME_PREFIX/etc. --libexecdir=`pkg-config --variable=prefix - ORBit-2.0`/sbin: This switch puts libexec files in - $GNOME_PREFIX/sbin instead of + ORBit-2.0`/lib/gnome-vfs-2.0: This switch puts libexec files in + $GNOME_PREFIX/lib/gnome-vfs-2.0 + instead of $GNOME_PREFIX/libexec. rmdir `pkg-config --variable=prefix ORBit-2.0`/doc: @@ -134,6 +128,10 @@ make url="http://ca.geocities.com/jefftranter@rogers.com/eject.html">Eject installed as the eject program is used by default. + : Use this option if you have + GTK-Doc installed and wish to build the API + documentation. + @@ -148,9 +146,9 @@ make gnomevfs-cat, gnomevfs-copy, gnomevfs-info, gnomevfs-ls, gnomevfs-mkdir, gnomevfs-mv, gnomevfs-rm, and gnome-vfs-daemon libgnomevfs-2.[so,a] and modules - /etc/gnome/gconf/schemas, - /etc/gnome/gconf/gconf.xml.defaults/[desktop,schemas,system], - /etc/gnome/gnome-vfs-2.0, + &gnome-etc-dir;/gconf/schemas, + &gnome-etc-dir;/gconf/gconf.xml.defaults/[desktop,schemas,system], + &gnome-etc-dir;/gnome-vfs-2.0, $GNOME_PREFIX/include/gnome-vfs-2.0, $GNOME_PREFIX/include/gnome-vfs-module-2.0, $GNOME_PREFIX/lib/gnome-vfs-2.0, and diff --git a/gnome/core/gnome2-user-docs.xml b/gnome/core/gnome2-user-docs.xml index cb93637dcf..5ca6a732fc 100644 --- a/gnome/core/gnome2-user-docs.xml +++ b/gnome/core/gnome2-user-docs.xml @@ -4,8 +4,8 @@ %general-entities; - - + + @@ -86,7 +86,8 @@ make Now, as the root user: make install && -chmod -v 644 `pkg-config --variable=prefix ORBit-2.0`/share/gnome/help/\ +chmod -v 644 `pkg-config \ +--variable=prefix ORBit-2.0`/share/gnome/help/\ {gnome-access-guide,system-admin-guide,user-guide}/C/*.xml