[Frugalware-git] fwife: select-basic: fix packages

2011-04-13 Thread Elentir
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=96ad3c2d2958b0ae8c5600eb56e801dd1d6f3c96

commit 96ad3c2d2958b0ae8c5600eb56e801dd1d6f3c96
Author: Elentir elen...@frugalware.org
Date:   Tue Apr 12 22:52:15 2011 +0200

select-basic: fix packages

diff --git a/src/plugins/select-basic.c b/src/plugins/select-basic.c
index 5c299b4..c9bce6a 100644
--- a/src/plugins/select-basic.c
+++ b/src/plugins/select-basic.c
@@ -178,10 +178,16 @@ void configure_desktop_basic(void)
/* Disable devel as well in this mode */
selectcat(devel, 0);

-   /* Disable xapps as well */
+   /* Disable some xapps as well */
selectfile(xapps, geeqie, 0);
+   selectfile(xapps, qt4-designer, 0);
selectfile(xapps, firefox, 0);
selectfile(xapps, thunderbird, 0);
+   selectfile(apps, attica, 0);
+   selectfile(apps, qt-data, 0);
+   selectfile(apps, soprano, 0);
+   selectfile(xapps, mplayer, 0);
+   selectfile(xapps, akonadi, 0);

if(strcmp(lang ,en)) {
ptr = g_strdup_printf(firefox-%s, lang);
@@ -197,7 +203,7 @@ void configure_desktop_basic(void)

/* Disable all default desktop categories */
selectcat(kde, 0);
-   selectcat(gnome, 0);
+   selectallfiles(gnome, NULL, 0);
selectcat(xfce4, 0);

if(!strcmp(seldesk, _(KDE)))
@@ -213,20 +219,21 @@ void configure_desktop_basic(void)
selectfile(kde-extra, rekonq, 1);
selectfile(kde-extra, krita, 1);
selectfile(xapps, gftp, 0);
-   selectfile(xapps, mplayer, 0);
selectfile(xapps, pidgin, 0);
selectfile(xapps, xchat, 0);
+   selectfile(apps, attica, 1);
+   selectfile(xapps, akonadi, 1);
}
else if(!strcmp(seldesk, _(GNOME)))
{
-   selectcat(gnome, 1);
+   selectallfiles(gnome, NULL, 1);
selectcat(gnome-extra, 1);
selectfile(gnome-extra, epiphany, 1);
selectfile(gnome-extra, empathy, 1);
selectfile(gnome-extra, gnucash, 1);
selectfile(xapps-extra, transmission, 1);
selectfile(xapps, gimp, 1);
-   selectfile(xapps, akonadi, 0);
+   selectfile(xapps, pidgin, 0);
}
else if(!strcmp(seldesk, _(XFCE)))
{
@@ -237,7 +244,7 @@ void configure_desktop_basic(void)
selectfile(xapps-extra, xarchiver, 1);
selectfile(xapps-extra, claws-mail, 1);
selectfile(xapps, gimp, 1);
-   selectfile(xapps, akonadi, 0);
+   selectfile(gnome, gksu-frugalware, 1);
}
else if(!strcmp(seldesk, _(LXDE)))
{
@@ -248,7 +255,7 @@ void configure_desktop_basic(void)
selectfile(xapps-extra, claws-mail, 1);
selectfile(xapps-extra, xarchiver, 1);
selectfile(xapps, gimp, 1);
-   selectfile(xapps, akonadi, 0);
+   selectfile(gnome, gksu-frugalware, 1);
}

free(lang);
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] fwife: select-basic: fix packages again

2011-04-13 Thread Elentir
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=f79bd5f5b25199133b3127e7958b00f068dac2d1

commit f79bd5f5b25199133b3127e7958b00f068dac2d1
Author: Elentir elen...@frugalware.org
Date:   Wed Apr 13 22:12:56 2011 +0200

select-basic: fix packages again

diff --git a/src/plugins/select-basic.c b/src/plugins/select-basic.c
index c9bce6a..2594479 100644
--- a/src/plugins/select-basic.c
+++ b/src/plugins/select-basic.c
@@ -173,21 +173,55 @@ void configure_desktop_basic(void)

/* Disable lib in basic mode - lib used are just add as dependencies */
selectcat(lib, 0);
-   selectcat(xlib, 0);

/* Disable devel as well in this mode */
selectcat(devel, 0);

/* Disable some xapps as well */
-   selectfile(xapps, geeqie, 0);
-   selectfile(xapps, qt4-designer, 0);
-   selectfile(xapps, firefox, 0);
-   selectfile(xapps, thunderbird, 0);
-   selectfile(apps, attica, 0);
-   selectfile(apps, qt-data, 0);
-   selectfile(apps, soprano, 0);
-   selectfile(xapps, mplayer, 0);
-   selectfile(xapps, akonadi, 0);
+   selectallfiles(xapps, NULL, 0);
+   selectallfiles(apps, NULL, 0);
+   selectallfiles(xlib, NULL, 0);
+
+   selectfile(xapps, dvdauthor, 1);
+   selectfile(xapps, emacs, 1);
+   selectfile(xapps, gfpm, 1);
+   selectfile(xapps, gnetconfig, 1);
+   selectfile(xapps, gnokii, 1);
+   selectfile(xapps, gvfs, 1);
+   selectfile(xapps, icedtea-web, 1);
+   selectfile(xapps, libreoffice, 1);
+   selectfile(xapps, vte, 1);
+   selectfile(xapps, system-config-printer, 1);
+   selectfile(xapps, startup-notification, 1);
+   selectfile(xapps, splashy, 1);
+   selectfile(xapps, xpdf, 1);
+   selectfile(xapps, udisks, 1);
+
+   selectfile(apps, bash-completion, 1);
+   selectfile(apps, bc, 1);
+   selectfile(apps, bluez, 1);
+   selectfile(apps, cdrtools, 1);
+   selectfile(apps, sudo, 1);
+   selectfile(apps, irqbalance, 1);
+   selectfile(apps, logrotate, 1);
+   selectfile(apps, man-pages, 1);
+   selectfile(apps, nano, 1);
+   selectfile(apps, pm-utils, 1);
+   selectfile(apps, pmount, 1);
+   selectfile(apps, recode, 1);
+   selectfile(apps, unarj, 1);
+   selectfile(apps, unzip, 1);
+   selectfile(apps, unarj, 1);
+   selectfile(apps, vim, 1);
+   selectfile(apps, upower, 1);
+   selectfile(apps, memtest86+, 1);
+
+   selectfile(network, apache, 0);
+   selectfile(network, samba, 0);
+   selectfile(network, procmail, 0);
+   selectfile(network, postfix, 0);
+
+   selectfile(xlib, flashplugin, 1);

if(strcmp(lang ,en)) {
ptr = g_strdup_printf(firefox-%s, lang);
@@ -218,11 +252,10 @@ void configure_desktop_basic(void)
selectcat(kde-extra, 1);
selectfile(kde-extra, rekonq, 1);
selectfile(kde-extra, krita, 1);
-   selectfile(xapps, gftp, 0);
-   selectfile(xapps, pidgin, 0);
-   selectfile(xapps, xchat, 0);
+   selectfile(kde-extra, kmymoney2, 1);
selectfile(apps, attica, 1);
selectfile(xapps, akonadi, 1);
+   selectfile(xapps-extra, qtparted, 1);
}
else if(!strcmp(seldesk, _(GNOME)))
{
@@ -233,18 +266,32 @@ void configure_desktop_basic(void)
selectfile(gnome-extra, gnucash, 1);
selectfile(xapps-extra, transmission, 1);
selectfile(xapps, gimp, 1);
-   selectfile(xapps, pidgin, 0);
+   selectfile(xapps, gftp, 1);
+   selectfile(xapps, xchat, 1);
+   selectfile(xmultimedia, phonon, 0);
+   selectfile(xapps-extra, gparted, 1);
}
else if(!strcmp(seldesk, _(XFCE)))
{
selectcat(xfce4, 1);
selectcat(xfce4-extra, 1);
selectallfiles(xfce4-extra, NULL, 1);
+   selectfile(xfce4-extra, xfce4-xmms-plugin, 0);
+   selectfile(xfce4-extra, xfce4-xfapplet-plugin, 0);
+   selectfile(xfce4-extra, xfce4-indicator-plugin, 0);
+   selectfile(xfce4-extra, xfbib, 0);
selectfile(xapps-extra, midori, 1);
selectfile(xapps-extra, xarchiver, 1);
selectfile(xapps-extra, claws-mail, 1);
selectfile(xapps, gimp, 1);
+   selectfile(xapps, gftp, 1);
+   selectfile(xapps, pidgin, 1);
selectfile(gnome, gksu-frugalware, 1);
+   selectfile(xapps, xchat, 1);
+   selectfile(xmultimedia, phonon, 0);
+   selectfile(xapps-extra, epdfview, 1);
+   selectfile(xapps-extra, gparted, 1);
+   selectfile(xapps-extra, grisbi, 1);
}
else if(!strcmp(seldesk, _(LXDE)))
{
@@ -255,7 +302,15 @@ void configure_desktop_basic(void)
selectfile(xapps-extra, claws-mail, 1);
selectfile(xapps-extra, xarchiver, 1);
selectfile(xapps, gimp, 1);
+   selectfile(xapps, gftp, 1);
+   selectfile(xapps, pidgin, 1);
selectfile(gnome, gksu-frugalware, 1);
+   selectfile(xapps, xchat, 1);
+   selectfile(xmultimedia, phonon, 0);
+   selectfile(xapps-extra, epdfview, 1);