From owner-freebsd-gnome Sat Mar 8 9:56:27 2003 Delivered-To: freebsd-gnome@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1670B37B405; Sat, 8 Mar 2003 09:56:24 -0800 (PST) Received: from creme-brulee.marcuscom.com (rdu57-17-158.nc.rr.com [66.57.17.158]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0909943FB1; Sat, 8 Mar 2003 09:56:23 -0800 (PST) (envelope-from marcus@marcuscom.com) Received: from [192.168.1.4] (shumai.marcuscom.com [192.168.1.4]) by creme-brulee.marcuscom.com (8.12.7/8.12.7) with ESMTP id h28HsdZX027561; Sat, 8 Mar 2003 12:54:39 -0500 (EST) (envelope-from marcus@marcuscom.com) Subject: Re: GNOME 2.2 or GNOME 1.4 on 4.8 CDs? From: Joe Marcus Clarke To: Murray Stokely Cc: portmgr@FreeBSD.ORG, FreeBSD GNOME Users , re@FreeBSD.ORG In-Reply-To: <20030302190211.Z57064@freebsdmall.com> References: <20030302190211.Z57064@freebsdmall.com> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-QaGGoyGBcZw/XnMKWSAe" Organization: MarcusCom, Inc. Message-Id: <1047146177.96334.4.camel@shumai.marcuscom.com> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.2.2 Date: 08 Mar 2003 12:56:18 -0500 X-Spam-Status: No, hits=-16.2 required=5.0 tests=IN_REP_TO,PGP_SIGNATURE_2,REFERENCES autolearn=ham version=2.50 X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Sender: owner-freebsd-gnome@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --=-QaGGoyGBcZw/XnMKWSAe Content-Type: multipart/mixed; boundary="=-B04hjusMfBMh1EFjKxCN" --=-B04hjusMfBMh1EFjKxCN Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On Sun, 2003-03-02 at 22:02, Murray Stokely wrote: > GNOME 1.4 is still listed in print-cdrom-packages.sh. Should this be > updated to gnome 2.2? Murray, I saw you MFC'd the GNOME 2 changes for print-cdrom-packages.sh. Here are the diffs for sysinstall. Joe >=20 > - Murray >=20 > To Unsubscribe: send mail to majordomo@FreeBSD.org > with "unsubscribe freebsd-gnome" in the body of the message --=20 PGP Key : http://www.marcuscom.com/pgp.asc --=-B04hjusMfBMh1EFjKxCN Content-Disposition: attachment; filename=config.c.diff Content-Type: text/plain; name=config.c.diff; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable --- src/release/sysinstall/config.c.orig Wed Mar 5 22:58:29 2003 +++ src/release/sysinstall/config.c Wed Mar 5 23:00:49 2003 @@ -596,20 +596,10 @@ if (DITEM_STATUS(ret) !=3D DITEM_FAILURE && gotit("startkde")) write_root_xprofile("exec startkde\n"); } - else if (!strcmp(desk, "gnome")) { - ret =3D package_add("gnome"); + else if (!strcmp(desk, "gnome2")) { + ret =3D package_add("gnome2"); if (DITEM_STATUS(ret) !=3D DITEM_FAILURE && gotit("gnome-session")) { - ret =3D package_add("sawfish-gnome"); - if (DITEM_STATUS(ret) !=3D DITEM_FAILURE && gotit("sawfish")) - write_root_xprofile("exec gnome-session\n"); - } - } - else if (!strcmp(desk, "enlightenment")) { - ret =3D package_add("gnomecore"); - if (DITEM_STATUS(ret) !=3D DITEM_FAILURE && gotit("gnome-session")) { - ret =3D package_add("enlightenment"); - if (DITEM_STATUS(ret) !=3D DITEM_FAILURE && gotit("enlightenment")) - write_root_xprofile("exec gnome-session\n"); + write_root_xprofile("exec gnome-session\n"); } } else if (!strcmp(desk, "afterstep")) { --=-B04hjusMfBMh1EFjKxCN Content-Disposition: attachment; filename=menus.c.diff Content-Type: text/plain; name=menus.c.diff; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable --- src/release/sysinstall/menus.c.orig Wed Mar 5 23:00:53 2003 +++ src/release/sysinstall/menus.c Wed Mar 5 23:02:09 2003 @@ -953,15 +953,13 @@ NULL, dmenuExit }, { "2 KDE", "The K Desktop Environment.", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=3Dkde" }, - { "3 GNOME + Sawfish", "GNOME + Sawfish window manager.", - NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=3Dgnome" }, - { "4 GNOME + Enlightenment","GNOME + The E window manager", - NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=3Denlightenment" }, - { "5 Afterstep", "The Afterstep window manager", + { "3 GNOME 2", "The GNOME 2 Desktop Environment", + NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=3Dgnome2" }, + { "4 Afterstep", "The Afterstep window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=3Dafterstep" }, - { "6 Windowmaker", "The Windowmaker window manager", + { "5 Windowmaker", "The Windowmaker window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=3Dwindowmaker" }, - { "7 fvwm", "The fvwm window manager", + { "6 fvwm", "The fvwm window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=3Dfvwm2" }, { NULL } }, }; --=-B04hjusMfBMh1EFjKxCN-- --=-QaGGoyGBcZw/XnMKWSAe Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQA+ai7Bb2iPiv4Uz4cRApahAKCFiN8XvNoJ1CutFTOtexVTpWR12gCfdFkN AqtkTZ5ac95PjnfFfCLFd1w= =XXhO -----END PGP SIGNATURE----- --=-QaGGoyGBcZw/XnMKWSAe-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-gnome" in the body of the message