diff --git a/general.ent b/general.ent index 8b7918aa21..fc161adea6 100644 --- a/general.ent +++ b/general.ent @@ -682,7 +682,7 @@ $Date$ - + diff --git a/gnome/core/gnome-desktop.xml b/gnome/core/gnome-desktop.xml index 6be3b8f98e..10c1011408 100644 --- a/gnome/core/gnome-desktop.xml +++ b/gnome/core/gnome-desktop.xml @@ -4,12 +4,12 @@ %general-entities; - - - - - - + + + + + + ]> @@ -29,12 +29,11 @@ Introduction to GNOME Desktop - The GNOME Desktop package contains - the gnome-about program, the - libgnome-desktop-2 library and + The GNOME Desktop package contains the + libgnome-desktop-3 library and GNOME's core graphics files and icons. - &lfs65_checked; + &lfs70_built; Package Information @@ -61,9 +60,12 @@ GNOME Desktop Dependencies Required - , + , , - , + + gsettings-desktop-schemas-3.2.0, + , , and @@ -81,9 +83,7 @@ Install GNOME Desktop by running the following commands: -./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \ - --sysconfdir=&gnome-etc-dir; \ - --localstatedir=/var/lib && +./configure --prefix=$GNOME_PREFIX && make This package does not come with a test suite. @@ -100,12 +100,6 @@ make - - - - : Use this parameter to supply a custom name in the Distributor: field of the GNOME About display window. @@ -114,6 +108,9 @@ make parameter if KDE is installed in any prefix other than /usr. + : This switch prevents the static + libraries being installed. + @@ -123,16 +120,20 @@ make Contents - Installed Program + Installed Programs Installed Library - Installed Directory + Installed Directories - gnome-about - libgnome-desktop-2.{so,a} - $GNOME_PREFIX/{include/gnome-desktop-2.0/libgnomeui, - share/{applications,gnome-about/headers,gtk-doc/html/gnome-desktop, - libgnome-desktop,omf/{fdl,gpl,lgpl}}} + None + libgnome-desktop-3.{so,a} + /usr/{include/gnome-desktop-3.0/libgnome-desktop, + share/{gnome/help/{fdl/{C,ar,ca,de,el,es,eu,fr,hu,ko,oc,pl,sl,sv,uk,vi, + zh_CN},gpl/{C,ar,ca,cs,de,el,es,eu,fi,fr,hu,ko,nds,oc,pa,sl,sv,uk,vi, + zh_CN},lgpl/{C,ar,de,el,es,eu,fi,fr,hu,ko,oc,pa,pt_BR,sl,sv,uk,vi, + zh_CN}},gtk-doc/html/gnome-desktop3,libgnome-desktop-3.0, + locale/{an/LC_MESSAGES,fur/LC_MESSAGES,ig/LC_MESSAGES,lo/LC_MESSAGES, + yo/LC_MESSAGES},omf/{fdl,gpl,lgpl}}} @@ -141,24 +142,14 @@ make - - gnome-about - - produces the about screen. - - gnome-about - - - - - - libgnome-desktop-2.{so,a} + + libgnome-desktop-3.{so,a} contains APIs being tested for inclusion in libgnome or libgnomeui. - - libgnome-desktop-2.{so,a} + + libgnome-desktop-3.{so,a} diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index df980ece10..2b637861ee 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -65,6 +65,9 @@ [ken] - merge gnome-control-center-3.2.2 from Wayne. + + [ken] - merge gnome-desktop-3.2.1 from Wayne. +