From 1dad085e4797d5d00ef053d8a31fb41120641cc5 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 5 Mar 2010 23:29:02 +0000 Subject: [PATCH] Reorganisation stage6 --- stage5/stage5-install | 1 - stage6/packages-update | 7 ------- stage6/{stage4-additions => stage6-additions} | 0 stage6/{stage4-install => stage6-install} | 16 +++++----------- 4 files changed, 5 insertions(+), 19 deletions(-) rename stage6/{stage4-additions => stage6-additions} (100%) rename stage6/{stage4-install => stage6-install} (90%) diff --git a/stage5/stage5-install b/stage5/stage5-install index 0eba619..ba66112 100755 --- a/stage5/stage5-install +++ b/stage5/stage5-install @@ -27,7 +27,6 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the # Gtk ipkg_ac ${LIBSIGCPP} ipkg_ac ${GTK_DOC} -### ipkg_ac ${GLITZ} ipkg_ac ${CAIRO} ipkg_ac ${CAIROMM} ipkg_ac_nb ${PANGO} diff --git a/stage6/packages-update b/stage6/packages-update index 203366d..ed15912 100644 --- a/stage6/packages-update +++ b/stage6/packages-update @@ -23,7 +23,6 @@ fpkg_gnome ${LIBGNOME} fpkg_gnome ${LIBGNOMECANVAS} fpkg_gnome ${LIBBONOBOUI} fpkg_gnome ${GNOME_ICON_THEME} -fpkg_gnu ${LIBTASN1} fpkg_gnome ${GNOME_KEYRING} fpkg_gnome ${LIBGNOMEUI} fpkg_gnome ${GNOME_THEMES} @@ -82,7 +81,6 @@ fpkg_gnome ${GNOME_KEYRING_MANAGER} fpkg_gnome ${GNOME_VOLUME_MANAGER} fpkg ${LIBMUSICBRAINZ} "http://ftp.musicbrainz.org/pub/musicbrainz" fpkg_gnome ${GNOME_SOUND_JUICER} -fpkg ${ISO_CODES} "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes" fpkg_gnome ${GNOME_TOTEM} fpkg_gnome ${GDM} @@ -100,10 +98,5 @@ fpkg ${ABIWORD} "http://www.abisource.com/downloads/abiword/$(get_pkg_ver fpkg_gnome ${EVOLUTION_EXCHANGE} fpkg_gnome ${EVOLUTION} -fpkg ${LIBGPG_ERROR} "http://ftp.gnupg.org/gcrypt/libgpg-error" -fpkg ${LIBGCRYPT} "http://ftp.gnupg.org/gcrypt/libgcrypt" -fpkg ${GNUTLS} "http://ftp.gnupg.org/gcrypt/gnutls" -fpkg_sf ${PIDGIN} - # Return last error exit $? diff --git a/stage6/stage4-additions b/stage6/stage6-additions similarity index 100% rename from stage6/stage4-additions rename to stage6/stage6-additions diff --git a/stage6/stage4-install b/stage6/stage6-install similarity index 90% rename from stage6/stage4-install rename to stage6/stage6-install index c19b315..91808f4 100755 --- a/stage6/stage4-install +++ b/stage6/stage6-install @@ -19,13 +19,13 @@ fi init_log_file # GNOME-2.X configuration -action_checkbox "Configuring ${GNOME2_VER}" ./cis-gnome-config -action_checkbox "Reloading /etc/profile" source /etc/profile +#action_checkbox "Configuring ${GNOME2_VER}" ./cis-gnome-config +#action_checkbox "Reloading /etc/profile" source /etc/profile # Gnome 2 core packages -ipkg_gnome ${ORBIT2} +##ipkg_gnome ${ORBIT2} ipkg_gnome ${LIBBONOBO} -ipkg_cust ${GCONF} cis-gconf +###ipkg_cust ${GCONF} cis-gconf ipkg_gnome ${GNOME_MIME_DATA} ####ipkg_cust ${GNOME_VFS} cis-gnome-nb ####ipkg_gnome ${GNOME_VFS_MONIKERS} @@ -33,8 +33,7 @@ ipkg_gnome ${LIBGNOME} ipkg_gnome ${LIBGNOMECANVAS} ipkg_gnome ${LIBBONOBOUI} ipkg_ac ${GNOME_ICON_THEME} -ipkg_ac ${LIBTASN1} -ipkg_gnome ${GNOME_KEYRING} +##ipkg_gnome ${GNOME_KEYRING} ipkg_gnome ${LIBGNOMEUI} ipkg_ac ${GNOME_THEMES} ipkg_ac_nb ${SCROLLKEEPER} "--localstatedir=/var --disable-static --with-omfdirs=/usr/share/omf:/opt/${GNOME2_VER}/share/omf" @@ -96,7 +95,6 @@ ipkg_gnome ${GNOME_VOLUME_MANAGER} ipkg_cust ${LIBMUSICBRAINZ} cis-libmusicbrainz ipkg_gnome ${GNOME_SOUND_JUICER} -ipkg_cust ${ISO_CODES} cis-iso-codes ipkg_gnome ${GNOME_TOTEM} ipkg_cust ${GDM} cis-gdm ipkg_ac ${LIBNOTIFY} @@ -111,9 +109,5 @@ ipkg_ac ${WV} ipkg_ac ${ABIWORD} "--disable-spellcheck" ipkg_gnome ${EVOLUTION} "--with-nss-includes=/usr/include/nss --with-nspr-includes=/usr/include/nspr --with-openldap=yes --with-krb5=/usr" ipkg_gnome ${EVOLUTION_EXCHANGE} -ipkg_ac ${LIBGPG_ERROR} -ipkg_ac ${LIBGCRYPT} -ipkg_ac ${GNUTLS} -ipkg_ac ${PIDGIN} exit $? -- 2.20.1