CVS: moonbase/profiles/gnome2 CONFLICTS, NONE, 1.1 DEPENDS, 1.11, 1.12 DETAILS, 1.5, 1.6

[nhudson at lunar-linux.org]

Update of /var/cvs/lunar/moonbase/profiles/gnome2
In directory dbguin.lunar-linux.org:/tmp/cvs-serv32078

Modified Files:
	DEPENDS DETAILS 
Added Files:
	CONFLICTS 
Log Message:

Adding this for gnome 2.4.0


--- NEW FILE: CONFLICTS ---
conflicts linc                 &&
conflicts libIDL               &&
conflicts ORBit2               &&
conflicts bonobo-activation    &&
conflicts libbonobo            &&
conflicts GConf2               &&
conflicts gnome-mime-data2     &&
conflicts gnome-vfs2           &&
conflicts libgnome             &&
conflicts libart_lgpl          &&
conflicts libglade2            &&
conflicts libgnomecanvas       &&
conflicts libbonoboui          &&
conflicts gnome-icon-theme     &&
conflicts libgnomui            &&
conflicts libwnck              &&
conflicts gtk-engines2         &&
conflicts gtk-thinice-theme    &&
conflicts gnome-themes         &&
conflicts vte                  &&
conflicts libgtop2             &&
conflicts gail                 &&
conflicts at-spi               &&
conflicts libgail-gnome        &&
conflicts librsvg              &&
conflicts eel                  &&
conflicts libgtkhtml           &&
conflicts libgnomeprint        &&
conflicts libgnomeprintui      &&
conflicts gnome-desktop        &&
conflicts gnome-panel          &&
conflicts gnome-session        &&
conflicts nautilus             &&
conflicts nautilus-cd-burner   &&
conflicts control-center       &&
conflicts nautilus-media       &&
conflicts gnome-terminal       &&
conflicts gnome-system-monitor &&
conflicts gnome-applets2       &&
conflicts gnome-utils2         &&
conflicts gnome-games2         &&
conflicts yelp                 &&
conflicts bug-buddy            &&
conflicts gedit                &&
conflicts eog                  &&
conflicts gnome-media2         &&
conflicts gnome2-user-docs     &&
conflicts gcalctool            &&
conflicts gucharmap            

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/profiles/gnome2/DEPENDS,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- DEPENDS	17 Jul 2003 13:24:34 -0000	1.11
+++ DEPENDS	12 Sep 2003 04:03:58 -0000	1.12
@@ -1,7 +1,7 @@
+depends docbook-profile         &&
 depends freetype2		&&
 depends pkgconfig		&&
 depends glib-2			&&
-depends pango                   &&
 depends gtk+-2			&&
 depends audiofile		&&
 depends esound			&&
@@ -9,10 +9,9 @@
 depends linc			&&
 depends atk			&&
 depends gnome-common2		&&
+depends pango			&&
 depends libIDL			&&
 depends ORBit2			&&
-depends bonobo-activation	&&
-depends startup-notification    &&
 depends GConf2			&&
 depends libart_lgpl		&&
 depends libzvt			&&
@@ -22,22 +21,21 @@
 depends libglade2		&&
 depends libgnome		&&
 depends libgnomecanvas		&&
+depends zenity                  &&
 depends libbonoboui		&&
+depends gtk-engines2            &&
+depends gnome-themes            &&
+depends gnome-icon-theme        &&
 depends libgnomeui		&&
 depends libwnck			&&
 depends libgnomeprint		&&
 depends libgnomeprintui		&&
-depends libgnomeprint20         &&
-depends libgnomeprintui20       &&
 depends libgtop2		&&
 depends librsvg 		&&
 depends gail			&&
-depends eel 			&&
+depends eel			&&
 depends libgtkhtml		&&
-depends gtk-engines2		&&
 depends gnome-desktop		&&
-depends gnome-themes            &&
-depends gnome-icon-theme        &&
 depends gnome-panel		&&
 depends gnome-session		&&
 depends gnome-terminal		&&
@@ -45,29 +43,17 @@
 depends gnome-applets2		&&
 depends control-center2		&&
 depends bug-buddy		&&
-depends eog 			&&
-depends nautilus 		&&
-depends nautilus-media          &&
+depends eog			&&
+depends nautilus		&&
 depends gnome-system-monitor	&&
 depends yelp			&&
-depends gedit 			&&
-depends librep2			&&
-depends rep-gtk2		&&
-
-if  ! grep -q "METACITY"  $MODULE_CONFIG; then
-  if query "Install metacity instead of sawfish?" y ; then 
-    depends metacity
-    echo  "METACITY=y"  >>  $MODULE_CONFIG
-  else
-    depends sawfish
-    echo  "METACITY=n"  >>  $MODULE_CONFIG
-  fi
-fi                              &&
-
+depends gedit			&&
+depends metacity                &&
 depends gnome-media2		&&
 depends gdm			&&
 depends at-spi			&&
 depends libgail-gnome		&&
 depends gconf-editor		&&
-depends gnome-audio             &&
+depends gcalctool               &&
+depends gucharmap               &&
 depends gnome2-user-docs

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/profiles/gnome2/DETAILS,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- DETAILS	21 Aug 2003 13:27:46 -0000	1.5
+++ DETAILS	12 Sep 2003 04:03:58 -0000	1.6
@@ -1,10 +1,11 @@
           MODULE=gnome2
-         VERSION=2.2.2
+         VERSION=2.4.0
         WEB_SITE=http://www.gnome.org
          ENTERED=20020729
-         UPDATED=20030204
-     export PATH=/opt/lunar/gnome/2/bin:$PATH
+         UPDATED=20030904
            SHORT="GNOME is the GNU Network Object Model Environment."
+         export PKG_CONFIG_PATH=/opt/lunar/gnome/2/lib/pkgconfig:$PKG_CONFIG_PATH
+         export PATH=/opt/lunar/gnome/2/bin:$PATH
 cat << EOF
 GNOME is the GNU Network Object Model Environment. 
 This project is building a complete, user-friendly