slinux: Initial port Simply Linux distro from m-p-d

conf.d/simply.mk

-# simply images
-
-ifeq (distro,$(IMAGE_CLASS))
-
-distro/live-simply: distro/.livecd-install use/slinux/full
-	@$(call add,THE_LISTS,slinux/live-install slinux/live)
-
-distro/simply: distro/.installer use/slinux/full
-	@$(call set,INSTALLER,simply-linux)
-	@$(call add,INSTALL2_PACKAGES,sysvinit)
-
-endif

conf.d/slinux.mk

+# Simply Linux images
+
+ifeq (distro,$(IMAGE_CLASS))
+
+distro/slinux-live: distro/.livecd-install use/slinux/base
+	@$(call add,THE_LISTS,slinux/live-install)
+
+distro/slinux: distro/.installer use/slinux/full use/rescue/base
+	@$(call set,INSTALLER,simply-linux)
+	@$(call add,MAIN_GROUPS,slinux/dropbox slinux/emulators-full slinux/games-base slinux/games slinux/games-full slinux/games-full-steam slinux/graphics-base slinux/graphics-full-blender slinux/graphics slinux/graphics-full-inkscape slinux/graphics-full-shotwell slinux/graphics-full-synfigstudio slinux/multimedia-full-audacity slinux/multimedia-base slinux/multimedia-full-cheese slinux/multimedia slinux/multimedia-full-pitivi slinux/multimedia-full-sound-juicer slinux/network-base)
+
+endif

features.in/slinux/config.mk

-use/slinux: use/x11/xfce
+use/slinux: use/x11
 	@$(call add_feature)
 	@$(call set,BRANDING,simply-linux)
-	@$(call add,THE_BRANDING,menu xfce-settings)
+	@$(call add,THE_BRANDING,menu xfce-settings system-settings)
 	@$(call set,META_VOL_SET,Simply Linux)
 
-use/slinux/base: use/slinux use/x11/lightdm/gtk +pulse
+use/slinux/base: use/isohybrid use/slinux use/x11/xorg use/x11/lightdm/gtk +pulse use/luks \
+	+plymouth +nm use/x11/gtk/nm use/memtest +systemd +wireless use/l10n/default/ru_RU use/live/x11 \
+	use/branding/complete; @:
 	@$(call add,THE_LISTS,gnome-p2p)
-	@$(call add,THE_LISTS,slinux/$(ARCH))
-	@$(call add,THE_LISTS,slinux/games)
-	@$(call add,THE_LISTS,slinux/graphics)
-	@$(call add,THE_LISTS,slinux/misc)
-	@$(call add,THE_LISTS,slinux/misc-dvd)
-	@$(call add,THE_LISTS,slinux/multimedia)
-	@$(call add,THE_LISTS,slinux/network)
-	@$(call add,THE_LISTS,slinux/xfce)
+	@$(call add,THE_LISTS,slinux/games-base)
+	@$(call add,THE_LISTS,slinux/graphics-base)
+	@$(call add,THE_LISTS,slinux/live)
+	@$(call add,THE_LISTS,slinux/misc-base)
+	@$(call add,THE_LISTS,slinux/multimedia-base)
+	@$(call add,THE_LISTS,slinux/network-base)
+	@$(call add,THE_LISTS,slinux/xfce-base)
 	@$(call add,THE_LISTS,$(call tags,base l10n))
+	@$(call add,STAGE2_PACKAGES,installer-distro-desktop)
+	@$(call add,STAGE2_PACKAGES,fonts-ttf-google-droid-sans)
+	@$(call add,STAGE2_PACKAGES,xorg-conf-synaptics)
+	@$(call add,THE_KMODULES,staging)
 
-use/slinux/full: use/isohybrid use/slinux/base +systemd +wireless \
-	use/branding/complete use/fonts/install2 use/x11/3d; @:
+use/slinux/full: use/slinux/base
+	@$(call add,MAIN_LISTS,slinux/not-install-full)
+	@$(call add,THE_KMODULES,virtualbox)
+	@$(call add,THE_KMODULES,nvidia fglrx)
+	@$(call add,MAIN_KMODULES,bbswitch)
 
 use/slinux/arm: use/slinux use/x11/lightdm/gtk
-	@$(call add,THE_LISTS,slinux/arm)
+	@$(call add,THE_LISTS,slinux-arm)

pkg.in/groups/slinux/dropbox.directory

+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Dropbox support
+X-Alterator-PackageList=slinux/dropbox
+X-Alterator-Required=no
+Name[ru_RU]=Поддержка Dropbox

pkg.in/groups/slinux/emulators-full.directory

+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Emulators
+X-Alterator-PackageList=slinux/emulators-full
+Name[ru_RU]=Эмуляторы и виртуальные машины
+X-Alterator-Conflicts=wine-local
+Categories=XFCE

pkg.in/groups/slinux/games-base.directory

+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Base Components
+X-Alterator-PackageList=slinux/games-base
+X-Alterator-Parent=slinux/games
+X-Alterator-Required=yes
+Name[ru_RU]=Основные компоненты
+Categories=XFCE

pkg.in/groups/slinux/games-full-steam.directory

+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Steam
+Name[ru_RU]=Steam
+X-Alterator-PackageList=slinux/games-full-steam
+X-Alterator-Parent=slinux/games
+X-Alterator-Required=yes
+X-Alterator-Conflicts=games
+Categories=XFCE

pkg.in/groups/slinux/games-full.directory

+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Extra Components
+X-Alterator-PackageList=slinux/games-full
+X-Alterator-Parent=slinux/games
+X-Alterator-Required=no
+Name[ru_RU]=Дополнительные компоненты
+Categories=XFCE

pkg.in/groups/slinux/games.directory

+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Games
+X-Alterator-PackageList=zero
+Name[ru_RU]=Игры
+Categories=XFCE

pkg.in/groups/slinux/graphics-base.directory

+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Base Components
+X-Alterator-PackageList=slinux/graphics-base
+X-Alterator-Parent=slinux/graphics
+X-Alterator-Required=yes
+Name[ru_RU]=Основные компоненты
+X-Alterator-Conflicts=graphics
+Categories=XFCE

pkg.in/groups/slinux/graphics-full-blender.directory

+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Blender 3D modeller
+Name[ru_RU]=Редактор 3D-моделей Blender
+X-Alterator-PackageList=slinux/graphics-full-blender
+X-Alterator-Parent=slinux/graphics
+X-Alterator-Required=yes
+X-Alterator-Conflicts=graphics
+Categories=XFCE

pkg.in/groups/slinux/graphics-full-inkscape.directory

+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Inkscape
+Name[ru_RU]=Редактор векторной графики Inkscape
+X-Alterator-PackageList=slinux/graphics-full-inkscape
+X-Alterator-Parent=slinux/graphics
+X-Alterator-Required=yes
+X-Alterator-Conflicts=graphics
+Categories=XFCE

pkg.in/groups/slinux/graphics-full-shotwell.directory

+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Shotwell
+Name[ru_RU]=Программа управления фотографиями Shotwell
+X-Alterator-PackageList=slinux/graphics-full-shotwell
+X-Alterator-Parent=slinux/graphics
+X-Alterator-Required=yes
+X-Alterator-Conflicts=graphics
+Categories=XFCE

pkg.in/groups/slinux/graphics-full-synfigstudio.directory

+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Synfig Studio
+Name[ru_RU]=Программа для создания 2D анимации Synfig Studio
+X-Alterator-PackageList=slinux/graphics-full-synfigstudio
+X-Alterator-Parent=slinux/graphics
+X-Alterator-Required=yes
+X-Alterator-Conflicts=graphics
+Categories=XFCE

pkg.in/groups/slinux/graphics.directory

+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Graphics
+X-Alterator-PackageList=zero
+X-Alterator-Required=yes
+Name[ru_RU]=Работа с графикой
+X-Alterator-Conflicts=graphics
+Categories=XFCE

pkg.in/groups/slinux/multimedia-base.directory

+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Base Components
+X-Alterator-PackageList=slinux/multimedia-base
+X-Alterator-Parent=slinux/multimedia
+X-Alterator-Required=yes
+Name[ru_RU]=Основные компоненты
+X-Alterator-Conflicts=multimedia
+Categories=XFCE

pkg.in/groups/slinux/multimedia-full-audacity.directory

+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Audacity
+Name[ru_RU]=Редактор звуковых файлов Audacity
+X-Alterator-PackageList=slinux/multimedia-full-audacity
+X-Alterator-Parent=slinux/multimedia
+X-Alterator-Required=yes
+X-Alterator-Conflicts=multimedia
+Categories=XFCE

pkg.in/groups/slinux/multimedia-full-cheese.directory

+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Cheese Webcam Booth
+Name[ru_RU]=Фотовидеобудка Cheese
+X-Alterator-PackageList=slinux/multimedia-full-cheese
+X-Alterator-Parent=slinux/multimedia
+X-Alterator-Required=yes
+X-Alterator-Conflicts=multimedia
+Categories=XFCE

pkg.in/groups/slinux/multimedia-full-pitivi.directory

+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Pitivi Video Editor
+Name[ru_RU]=Видеоредактор Pitivi
+X-Alterator-PackageList=slinux/multimedia-full-pitivi
+X-Alterator-Parent=slinux/multimedia
+X-Alterator-Required=yes
+X-Alterator-Conflicts=multimedia
+Categories=XFCE

pkg.in/groups/slinux/multimedia-full-sound-juicer.directory

+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Audio CD Extractor
+Name[ru_RU]=Программа копирования звуковых CD
+X-Alterator-PackageList=slinux/multimedia-full-sound-juicer
+X-Alterator-Parent=slinux/multimedia
+X-Alterator-Required=yes
+X-Alterator-Conflicts=multimedia
+Categories=XFCE

pkg.in/groups/slinux/multimedia.directory

+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Multimedia
+X-Alterator-PackageList=zero
+X-Alterator-Required=yes
+Name[ru_RU]=Мультимедиа
+X-Alterator-Conflicts=multimedia
+Categories=XFCE

pkg.in/groups/slinux/network-base.directory

+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Communications
+X-Alterator-PackageList=slinux/network-base
+X-Alterator-Required=yes
+Name[ru_RU]=Коммуникации
+X-Alterator-Conflicts=network
+Categories=XFCE

pkg.in/lists/slinux/emulators-full

+wine-vanilla@i586
+libwine-vanilla-gl@i586
+libwine-vanilla-twain@i586
+i586-wine-vanilla@x86_64
+i586-libwine-vanilla-gl@x86_64
+i586-libwine-vanilla-twain@x86_64
+wine-mono
+i586-xorg-dri-.*@x86_64
+cabextract
+dosbox
+#kernel-modules-virtualbox-@KERNEL@
+virtualbox

pkg.in/lists/slinux/games

-# gnome-games
-
-#gnome-games-glines
-#gnome-games-gnect
-#gnome-games-gnibbles
-#gnome-games-gnobots
-#gnome-games-quadrapassel
-gnome-games-gnomine
-gnome-games-gnotravex
-gnome-games-gnotski
-#gnome-games-gtali
-#gnome-games-iagno
-gnome-games-mahjongg
-#gnome-games-swell-foop
-gnome-games-sol
-#gnome-games-sudoku
-gnome-games-glchess

pkg.in/lists/slinux/games-base

+# tags: xfce, games, cd
+
+# gnome-games
+
+#gnome-games-glines
+#gnome-games-gnect
+#gnome-games-gnibbles
+#gnome-games-gnobots
+#gnome-games-quadrapassel
+gnome-games-gnomine
+gnome-games-gnotravex
+gnome-games-gnotski
+#gnome-games-gtali
+#gnome-games-iagno
+gnome-games-mahjongg
+#gnome-games-swell-foop
+gnome-games-sol
+# ALT bug #28998
+#gnome-games-sudoku
+gnome-games-glchess

pkg.in/lists/slinux/games-dvd → pkg.in/lists/slinux/games-full

 freeciv
-wesnoth
+#wesnoth
 ppracer
-sauerbraten
+#sauerbraten
 
 instead-launcher
 instead-cat
 
 Ri-li
 openttd
-openastromenace
+astromenace
 PokerTH
 
-celestia-gnome
+#celestia-gnome
 
 gcompris
 gcompris-voices-en

pkg.in/lists/slinux/games-full-steam

+steam@i586
+i586-steam@x86_64

pkg.in/lists/slinux/graphics

-gimp2
-gimp-plugin-gutenprint
-xsane-gimp2
-# inkscape
-gphoto2
-sane
-xsane
-
-gthumb
-yagf

pkg.in/lists/slinux/graphics-base

+gimp2
+gimp-plugin-gutenprint
+xsane-gimp2
+# inkscape
+gphoto2
+sane
+xsane
+
+ristretto
+yagf

pkg.in/lists/slinux/graphics-dvd-blender → pkg.in/lists/slinux/graphics-full-blender

 blender
-blender-plugins-yafaray
-blender-plugins-localdocs

pkg.in/lists/slinux/live

@@ -3,16 +3,15 @@ lftp-
 python-module-PyQt4-
 libqt4-test-
 libqt4-uitools-
-libqt4-xmlpatterns-
-libqt4-declarative-
+#libqt4-xmlpatterns-
+#libqt4-declarative-
 libqt4-scripttools-
 libqt4-svg-
 libqt4-help-
 libqt4-designer-
-libqt4-webkit-
+#libqt4-webkit-
 libqt4-multimedia-
-libqt4-opengl-
+#libqt4-opengl-
 libqt4-clucene-
-libqt4-script-
 libqt4-qt3support-
-libqt4-sql-
+#libqt4-sql-

pkg.in/lists/slinux/live-install

 installer-feature-simply-livecd
-livecd-setlocale

pkg.in/lists/slinux/misc → pkg.in/lists/slinux/misc-base

-strace
-pm-utils
+# Basic packages
+tzdata
+vim-console
+openssh-server
+openssh-clients
+rsync
 
+bash-completion
+inxi
 fvwm-
 fvwm-full-
+#kernel-modules-staging-@KERNEL_MOD@
 altlinux-freedesktop-menu-shallow-menu
 altlinux-freedesktop-menu-icon-theme-default
 #altlinux-freedesktop-menu-common
-#docs-simply-linux
+#branding-@BRANDING@-xfce-settings
+#branding-@BRANDING@-system-settings
+#branding-@BRANDING@-menu
 docs-linux_intro
-fonts-otf-adobe-source-code-pro
-fonts-otf-adobe-source-sans-pro
-fonts-ttf-droid
-fonts-ttf-liberation
+fonts-ttf-google-droid-.*
 fonts-ttf-ubuntu-font-family
+fonts-ttf-liberation
+fonts-ttf-dejavu
 gnome-system-monitor
 gnome-icon-theme
+gnome-icon-theme-symbolic
+gnome-keyring
+gcr
 #tango-icon-theme
 #tango-icon-theme-extras
-gdm2.20-help
-ntfsprogs-
+#ntfsprogs-
 driconf-
 
-#kde4libs-
-#kde-common-
-#kde3-menu-common-
-#kde3-menu-resources-
-#kde4-menu-common-
-#kde4-menu-resources-
+kde4libs-
+kde-common-
+kde3-menu-common-
+kde3-menu-resources-
+kde4-menu-common-
+kde4-menu-resources-
 
-firefox
-firefox-ru
+firefox-esr
+firefox-esr-ru
+firefox-esr-uk
+firefox-esr-be
+firefox-esr-kk
 #xulrunner-gnome-support
 file-roller
 unzip
@@ -37,14 +50,14 @@ unrar
 unarj
 dbus-tools-gui
 brasero
-#medit
+medit
 gcalctool
 synaptic
 synaptic-usermode
 apt-indicator
 gksu
 cups
-ghostscript-cups
+cups-filters
 cups-pdf
 avahi-daemon
 blueman
@@ -53,28 +66,56 @@ printer-drivers-base
 udev-extras
 hostname-hook-hosts
 libnss-mdns
+i586-glibc-nss@x86_64
+i586-libnss-mdns@x86_64
+i586-libnss-myhostname@x86_64
+
+pulseaudio-daemon
+pulseaudio-utils
+pavucontrol
+alsa-plugins-pulse
+# For pulseaudio support
+# in the xfce4-mixer
+gst-plugins-good
+
 fdisk
 cpufreq-simple
 attr
 rfkill
+cifs-utils
+
+# dm
+#gdm2.20
+#gdm-theme-simply
+#gdm2.20-help
+lightdm-gtk-greeter
+#gtk3-themes-xfce4
+gnome-themes-standard-data
 
 # Alterator
-alterator-x11
+alterator-browser-qt
+alterator-standalone
+
 alterator-auth
-alterator-xkb
-alterator-pkg
-alterator-packages
 alterator-datetime
-alterator-standalone
+alterator-net-pppoe
+alterator-net-pptp
+alterator-net-openvpn
+alterator-packages
+alterator-pkg
+alterator-services
 alterator-sysconfig
+alterator-users
+alterator-x11
+alterator-xkb
 
-# Additional
-#gnome-search-tool
+#additional
+tracker-search-tool
 yelp
+imagewriter
 
-# Compiz things
-compiz
-#python-module-fusion-icon-gtk
+#compiz
+python-module-fusion-icon-gtk
 compiz-gtk
 
 #aen
@@ -93,14 +134,58 @@ plymouth
 #branding-simply-linux-bootsplash
 
 # Office
-#java-1.6.0-sun
-LibreOffice-integrated
+java-1.6.0-sun
+LibreOffice
 LibreOffice-gnome
 LibreOffice-langpack-ru
-evince
+LibreOffice-langpack-uk
+LibreOffice-langpack-es
+LibreOffice-langpack-kk
+LibreOffice-langpack-pt-BR
+atril-gtk
+atril-gtk-djvu
+atril-gtk-dvi
+atril-gtk-pixbuf
+atril-gtk-xps
 stardict-gtk
 stardict-mueller7
 
-# disks
-lvm2
-mdadm
+# Owncloud
+owncloud-client
+
+# For work as guest in the virtualbox
+virtualbox-guest-additions
+xorg-drv-vboxvideo
+
+#For ALT domain
+settime-rfc867
+
+# Dirty hackaround for #28753
+alsa-set-initial-options
+udev-alsa
+
+# Fonts infinality
+libfreetype-infinality
+i586-libfreetype-infinality@x86_64
+fontconfig-infinality
+
+# For 1C installation
+#1c-preinstall
+
+# askpass
+gtk2-ssh-askpass
+
+# Systemd-specific
+systemd-analyze
+
+# Enable left mouse button by tapping by default
+xorg-conf-synaptics
+
+# Otherwise hunspell-ru  will be replace by it
+# during dist-upgrade
+hunspell-ru-lebedev
+
+# xkill is present in the live anyway somehow.
+# So explicitly add it for both live and install
+# versions.
+xkill

pkg.in/lists/slinux/misc-dvd

-#mintmenu
-homebank
-aspell-uk
-LibreOffice-langpack-ru
-stardict-slovnyk_ru-en
-stardict-slovnyk_en-uk
-stardict-slovnyk_uk-en
-stardict-slovnyk_uk-ru
-
-vlock
-
-hplip-PPDs
-
-tango-icon-theme
-tango-icon-theme-extras

pkg.in/lists/slinux/misc-full

+#mintmenu
+homebank
+homebank-help
+aspell-uk
+stardict-mueller7
+stardict-wn
+stardict-engcom
+
+# NVIDIA drivers
+#kernel-modules-nvidia-@KERNEL_MOD@
+nvidia-xconfig
+
+# ATI proprietary driver
+fglrx_glx
+fglrx-tools
+#kernel-modules-fglrx-@KERNEL_MOD@
+
+vlock
+
+hplip-PPDs
+
+tango-icon-theme
+tango-icon-theme-extras
+
+hwinfo
+
+gparted
+
+# Merged from disk-dvd list
+
+# For 1c
+haspd@i586
+i586-haspd@x86_64
+
+fonts-ttf-church
+fonts-ttf-latex-xft
+fonts-ttf-tempora
+
+clipart-openclipart-png
+ImageMagick
+
+ntfs-3g
+
+#kernel
+kernel-build-tools
+kernel-doc-std
+#kernel-headers-modules-@KERNEL@
+#kernel-headers-@KERNEL@
+#kernel-source-3.10
+
+perl-Crypt-Rijndael
+
+ffmpeg
+dvgrab
+mjpegtools
+mencoder
+transcode
+jackd
+
+osec-mailreport
+slocate
+adjtimex
+tunctl
+wireless-tools
+wodim
+
+opensc
+
+alterator-fbi
+
+^libopensync0-*
+msynctool0
+
+# wacom driver and utilities
+xorg-drv-wacom
+
+bridge-utils
+
+ocfs2-tools
+
+zsh
+
+glxgears
+
+rsync
+screen
+
+#needed for crypto
+lsb
+python-module-Crypto
+
+python-module-xmlsec
+libxmlsec1
+libxmlsec1-gnutls
+libxmlsec1-nss
+libxmlsec1-openssl
+libxerces-c28-utils
+libxerces-c28-doc
+fprintd
+pam_fprintd
+libfprint
+xprobe2
+
+xrdp
+
+apcupsd

pkg.in/lists/slinux/multimedia

-easytag
-gnome-mplayer
-gecko-mediaplayer
-audacious
-audacious-plugins

pkg.in/lists/slinux/multimedia-base

+easytag
+#gnome-mplayer
+#gecko-mediaplayer #it needed gnome-mplayer
+smplayer
+audacious
+audacious-plugins
+libva-driver-intel
+libva-driver-vdpau

pkg.in/lists/slinux/multimedia-full-cheese

+cheese

pkg.in/lists/slinux/network → pkg.in/lists/slinux/network-base

 mozilla-plugin-adobe-flash
-firefox-yandexbar
-mozilla-plugin-java-1.8.0-openjdk
-thunderbird
-thunderbird-ru
+#mozilla-plugin-java-1.6.0-sun
+#mozilla-plugin-java-1.7.0-openjdk
+thunderbird-esr
+thunderbird-esr-ru
+thunderbird-esr-enigmail
 
 pidgin
 pidgin-libnotify
@@ -12,7 +13,6 @@ aspell-ru-lebedev
 alterator-net-pptp
 alterator-net-eth
 alterator-net-pppoe
-alterator-net-general
 
 rdesktop
 telnet
@@ -21,15 +21,3 @@ remmina-plugins
 
 b43-fwcutter
 bcm43xx-fwcutter
-NetworkManager
-NetworkManager-vpnc
-NetworkManager-openvpn
-NetworkManager-pptp
-#NetworkManager-l2tp
-NetworkManager-openvpn-gnome
-NetworkManager-pptp-gnome
-NetworkManager-vpnc-gnome
-#NetworkManager-l2tp-gnome
-usb-modeswitch
-
-dialog

pkg.in/lists/slinux/not-install-full

+#kernel-image-led-ws
+#kernel-modules-.*-led-ws
+#firmware-kernel-led-ws
+
+# For steam
+i586-nvidia_glx_.*@x86_64
+i586-fglrx_glx@x86_64
+
+# Bumblebee
+bumblebee
+#kernel-modules-bbswitch-@KERNEL_MOD@
+
+# Proprietary blob
+#citrix-client
+
+# Spice client
+libspice-gtk
+python-module-spice-gtk
+#spice-client

pkg.in/lists/slinux/x86_64

-i586-glibc-core
-i586-libalsa
-i586-libXv
-i586-libXScrnSaver
-i586-libdbus
-i586-libqt4-xml
-i586-libqt4-core
-i586-libqt4-dbus
-i586-libqt4-gui
-i586-libqt4-network
-i586-libv4l
-i586-libpulseaudio
-i586-libsndfile
-i586-libwrap
-i586-libasyncns
-i586-libogg
-i586-libflac8
-i586-libvorbis
-i586-libavahi
-i586-libgcc1
-i586-libstdc++6
-i586-libXext
-i586-libX11
-i586-glib2
-i586-libpng12
-i586-zlib
-i586-libfreetype
-i586-libSM
-i586-libICE
-i586-libXi
-i586-libXrender
-i586-libXrandr
-i586-libXfixes
-i586-libXcursor
-i586-libXinerama
-i586-fontconfig
-i586-libssl10
-i586-libxcb
-i586-libpcre3
-i586-libuuid
-i586-libexpat
-i586-libkrb5
-i586-libXau
-i586-libXdmcp
-i586-libcom_err
-i586-libkeyutils
-i586-libxcbutil

pkg.in/lists/slinux/xfce → pkg.in/lists/slinux/xfce-base

@@ -3,23 +3,19 @@
 xfce4-xkb-plugin
 xfce4-appfinder
 xfce4-settings
-xfcalendar
 xfce4-mixer
+xfce4-volumed-pulse
 xfce4-minimal
 xfce4-session
 xfce4-panel
 xfce4-screenshooter
 xfconf-utils
 xfce4-power-manager
-Thunar
-Terminal
+thunar
+xfce4-terminal
 libexo
 xfce4-default
 #xfce4-full
-gvfs
-gvfs-backends
-udisks2
-ntfs-3g
 
 #xfce-additional
 #xfprint
@@ -41,7 +37,7 @@ thunar-shares-plugin
 
 xfwm4-themes
 #xfce4-dict
-xfcalendar
+orage
 xfce4-screenshooter
 xfce4-clipman-plugin
 xfce4-cpufreq-plugin