diff --git a/conf.d/live.mk b/conf.d/live.mk index cf545524..22d7de05 100644 --- a/conf.d/live.mk +++ b/conf.d/live.mk @@ -53,4 +53,7 @@ distro/live-flightgear: distro/live-icewm use/live/sound use/x11/3d-proprietary @$(call add,LIVE_PACKAGES,FlightGear fgo input-utils) @$(call try,HOMEPAGE,http://www.4p8.com/eric.brasseur/flight_simulator_tutorial.html) +distro/live-simply: distro/livecd-install use/slinux use/systemd \ + use/firmware/wireless use/x11/drm use/x11/3d-proprietary; @: + endif diff --git a/features.in/slinux/README b/features.in/slinux/README new file mode 100644 index 00000000..1d16d48f --- /dev/null +++ b/features.in/slinux/README @@ -0,0 +1 @@ +Наборы пакетов для семейства дистрибутивов Simply Linux. diff --git a/features.in/slinux/config.mk b/features.in/slinux/config.mk new file mode 100644 index 00000000..b4a8a9bc --- /dev/null +++ b/features.in/slinux/config.mk @@ -0,0 +1,13 @@ +use/slinux: use/x11/xfce use/x11/gdm2.20 + @$(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/live) + @$(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,$(call tags,base l10n)) + @$(call add,THE_PACKAGES,apt-conf-sisyphus) diff --git a/features.in/x11/config.mk b/features.in/x11/config.mk index 50b8aaae..a48cf490 100644 --- a/features.in/x11/config.mk +++ b/features.in/x11/config.mk @@ -35,6 +35,9 @@ use/x11/lightdm: use/x11/runlevel5 use/x11/kdm: use/x11/runlevel5 @$(call add,THE_PACKAGES,kdebase-kdm) +use/x11/gdm2.20: use/x11/runlevel5 + @$(call add,THE_PACKAGES,gdm2.20) + use/x11/icewm: use/x11/xorg @$(call add,THE_LISTS,$(call tags,icewm desktop)) @@ -43,3 +46,6 @@ use/x11/razorqt: use/x11/xorg use/x11/tde: use/x11/xorg @$(call add,THE_LISTS,$(call tags,tde desktop)) + +use/x11/xfce: use/x11/xorg + @$(call add,THE_LISTS,$(call tags,xfce desktop)) diff --git a/pkg.in/lists/gnome-p2p b/pkg.in/lists/gnome-p2p new file mode 100644 index 00000000..5ba6d3ba --- /dev/null +++ b/pkg.in/lists/gnome-p2p @@ -0,0 +1,2 @@ +transmission-gtk +eiskaltdcpp-gtk diff --git a/pkg.in/lists/slinux/dropbox b/pkg.in/lists/slinux/dropbox new file mode 100644 index 00000000..b1b28f9b --- /dev/null +++ b/pkg.in/lists/slinux/dropbox @@ -0,0 +1,2 @@ +dropbox +thunar-dropbox-plugin diff --git a/pkg.in/lists/slinux/games b/pkg.in/lists/slinux/games new file mode 100644 index 00000000..d2d9f8e0 --- /dev/null +++ b/pkg.in/lists/slinux/games @@ -0,0 +1,17 @@ +# 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 diff --git a/pkg.in/lists/slinux/games-dvd b/pkg.in/lists/slinux/games-dvd new file mode 100644 index 00000000..3c85abb4 --- /dev/null +++ b/pkg.in/lists/slinux/games-dvd @@ -0,0 +1,18 @@ +freeciv +wesnoth +ppracer +sauerbraten + +instead-launcher +instead-cat + +Ri-li +openttd +openastromenace +PokerTH + +celestia-gnome + +gcompris +gcompris-voices-en +gcompris-voices-ru diff --git a/pkg.in/lists/slinux/graphics b/pkg.in/lists/slinux/graphics new file mode 100644 index 00000000..5890e39e --- /dev/null +++ b/pkg.in/lists/slinux/graphics @@ -0,0 +1,10 @@ +gimp2 +gimp-plugin-gutenprint +xsane-gimp2 +# inkscape +gphoto2 +sane +xsane + +gthumb +yagf diff --git a/pkg.in/lists/slinux/graphics-dvd-blender b/pkg.in/lists/slinux/graphics-dvd-blender new file mode 100644 index 00000000..34b1325d --- /dev/null +++ b/pkg.in/lists/slinux/graphics-dvd-blender @@ -0,0 +1,3 @@ +blender +blender-plugins-yafaray +blender-plugins-localdocs diff --git a/pkg.in/lists/slinux/graphics-dvd-inkscape b/pkg.in/lists/slinux/graphics-dvd-inkscape new file mode 100644 index 00000000..722759e2 --- /dev/null +++ b/pkg.in/lists/slinux/graphics-dvd-inkscape @@ -0,0 +1 @@ +inkscape diff --git a/pkg.in/lists/slinux/graphics-dvd-shotwell b/pkg.in/lists/slinux/graphics-dvd-shotwell new file mode 100644 index 00000000..a8ddde07 --- /dev/null +++ b/pkg.in/lists/slinux/graphics-dvd-shotwell @@ -0,0 +1 @@ +shotwell diff --git a/pkg.in/lists/slinux/graphics-dvd-synfigstudio b/pkg.in/lists/slinux/graphics-dvd-synfigstudio new file mode 100644 index 00000000..487919a1 --- /dev/null +++ b/pkg.in/lists/slinux/graphics-dvd-synfigstudio @@ -0,0 +1 @@ +synfigstudio diff --git a/pkg.in/lists/slinux/i586 b/pkg.in/lists/slinux/i586 new file mode 100644 index 00000000..e69de29b diff --git a/pkg.in/lists/slinux/live b/pkg.in/lists/slinux/live new file mode 100644 index 00000000..88c33925 --- /dev/null +++ b/pkg.in/lists/slinux/live @@ -0,0 +1,18 @@ +lftp- + +python-module-PyQt4- +libqt4-test- +libqt4-uitools- +libqt4-xmlpatterns- +libqt4-declarative- +libqt4-scripttools- +libqt4-svg- +libqt4-help- +libqt4-designer- +libqt4-webkit- +libqt4-multimedia- +libqt4-opengl- +libqt4-clucene- +libqt4-script- +libqt4-qt3support- +libqt4-sql- diff --git a/pkg.in/lists/slinux/live-install b/pkg.in/lists/slinux/live-install new file mode 100644 index 00000000..540c203f --- /dev/null +++ b/pkg.in/lists/slinux/live-install @@ -0,0 +1 @@ +installer-feature-simply-livecd diff --git a/pkg.in/lists/slinux/misc b/pkg.in/lists/slinux/misc new file mode 100644 index 00000000..c62e19df --- /dev/null +++ b/pkg.in/lists/slinux/misc @@ -0,0 +1,102 @@ +fvwm- +fvwm-full- +altlinux-freedesktop-menu-shallow-menu +altlinux-freedesktop-menu-icon-theme-default +#altlinux-freedesktop-menu-common +branding-simply-linux-xfce-settings +branding-simply-linux-menu +docs-simply-linux +docs-linux_intro +fonts-ttf-droid +fonts-ttf-ubuntu-font-family +fonts-ttf-liberation +fonts-ttf-dejavu +gnome-system-monitor +gnome-icon-theme +#tango-icon-theme +#tango-icon-theme-extras +gdm2.20 +gdm-theme-simply +gdm2.20-help +ntfsprogs- +driconf- + +kde4libs- +kde-common- +kde3-menu-common- +kde3-menu-resources- +kde4-menu-common- +kde4-menu-resources- + +firefox +firefox-ru +xulrunner-gnome-support +file-roller +unzip +unrar +unarj +dbus-tools-gui +brasero +medit +gcalctool +synaptic +synaptic-usermode +apt-indicator +cups +ghostscript-cups +cups-pdf +avahi-daemon +blueman +update-kernel +printer-drivers-base +udev-extras +hostname-hook-hosts +libnss-mdns +pulseaudio-daemon +pulseaudio-utils +pavucontrol +alsa-plugins-pulse +fdisk +cpufreq-simple +attr +rfkill + +# Alterator +alterator-x11 +alterator-auth +alterator-xkb +alterator-pkg +alterator-packages +alterator-datetime + +#additional +gnome-search-tool +yelp + +#compiz +#python-module-fusion-icon-gtk +#compiz-gtk + +#aen +#elinks- +rpminstall +system-config-printer +system-config-printer-udev +#krb5-ticket-watcher- +apt-repo +#krb5-ticket-watcher- +rekonq- +xdg-user-dirs +x-cursor-theme-jimmac + +plymouth +#branding-simply-linux-bootsplash + +# Office +java-1.6.0-sun +libreoffice +libreoffice-gnome +libreoffice-langpack-ru +evince +stardict-gtk +stardict-mueller7 diff --git a/pkg.in/lists/slinux/misc-dvd b/pkg.in/lists/slinux/misc-dvd new file mode 100644 index 00000000..c109266d --- /dev/null +++ b/pkg.in/lists/slinux/misc-dvd @@ -0,0 +1,24 @@ +#mintmenu +homebank +aspell-uk +libreoffice-langpack-ru +stardict-slovnyk_ru-en +stardict-slovnyk_en-uk +stardict-slovnyk_uk-en +stardict-slovnyk_uk-ru + +# NVIDIA drivers +kernel-modules-nvidia-std-def +nvidia-xconfig + +# ATI proprietary driver +fglrx_glx +fglrx-tools +kernel-modules-fglrx-std-def + +vlock + +hplip-PPDs + +tango-icon-theme +tango-icon-theme-extras diff --git a/pkg.in/lists/slinux/multimedia b/pkg.in/lists/slinux/multimedia new file mode 100644 index 00000000..51ed8b75 --- /dev/null +++ b/pkg.in/lists/slinux/multimedia @@ -0,0 +1,5 @@ +easytag +gnome-mplayer +gecko-mediaplayer +audacious +audacious-plugins diff --git a/pkg.in/lists/slinux/multimedia-dvd-audacity b/pkg.in/lists/slinux/multimedia-dvd-audacity new file mode 100644 index 00000000..480d9705 --- /dev/null +++ b/pkg.in/lists/slinux/multimedia-dvd-audacity @@ -0,0 +1 @@ +audacity diff --git a/pkg.in/lists/slinux/multimedia-dvd-pitivi b/pkg.in/lists/slinux/multimedia-dvd-pitivi new file mode 100644 index 00000000..8b7a944e --- /dev/null +++ b/pkg.in/lists/slinux/multimedia-dvd-pitivi @@ -0,0 +1 @@ +pitivi diff --git a/pkg.in/lists/slinux/multimedia-dvd-sound-juicer b/pkg.in/lists/slinux/multimedia-dvd-sound-juicer new file mode 100644 index 00000000..a1b65abf --- /dev/null +++ b/pkg.in/lists/slinux/multimedia-dvd-sound-juicer @@ -0,0 +1 @@ +sound-juicer diff --git a/pkg.in/lists/slinux/network b/pkg.in/lists/slinux/network new file mode 100644 index 00000000..258afea9 --- /dev/null +++ b/pkg.in/lists/slinux/network @@ -0,0 +1,36 @@ +mozilla-plugin-adobe-flash +firefox-yandexbar +mozilla-plugin-java-1.6.0-sun +thunderbird +thunderbird-ru + +pidgin +pidgin-libnotify +chestnut-dialer-gtk2 +aspell-ru-lebedev + +alterator-net-pptp +alterator-net-eth +alterator-net-pppoe +alterator-net-general + +rdesktop +telnet +remmina +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 + +alsa-utils +dialog diff --git a/pkg.in/lists/slinux/x86_64 b/pkg.in/lists/slinux/x86_64 new file mode 100644 index 00000000..b491237f --- /dev/null +++ b/pkg.in/lists/slinux/x86_64 @@ -0,0 +1,48 @@ +i586-glibc-core +i586-libalsa +i586-libssl7 +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 diff --git a/pkg.in/lists/slinux/xfce b/pkg.in/lists/slinux/xfce new file mode 100644 index 00000000..6617acba --- /dev/null +++ b/pkg.in/lists/slinux/xfce @@ -0,0 +1,70 @@ +#main-xfce +#xfce4-icon-theme +xfce4-xkb-plugin +xfce4-appfinder +xfce4-settings +xfcalendar +xfce4-mixer +xfce4-minimal +xfce4-session +xfce4-panel +xfce4-screenshooter +xfce-utils +xfconf-utils +xfce4-power-manager +Thunar +Terminal +libexo +xfce4-default +#xfce4-full +gvfs +gvfs-backends +udisks2 + +#xfce-additional +#xfprint +thunar-media-tags-plugin +thunar-volman-plugin +#thunar-shares-plugin +thunar-archive-plugin + +#screensaver +gnome-screensaver +#gnome-screensaver-utils + +#samba +thunar-shares-plugin + +xscreensaver- +xscreensaver-hacks-gl- +xscreensaver-modules-gl- +xfce4-wmdock-plugin- +xfce4-radio-plugin- +xfce4-genmon-plugin- + +xfwm4-themes +#xfce4-dict +xfcalendar +xfce4-screenshooter +xfce4-clipman-plugin +xfce4-cpufreq-plugin +#xfce4-globalmenu-plugin +xfce4-xkb-plugin +xfce4-timer-plugin +xfce4-datetime-plugin +xfce4-places-plugin +xfce4-quicklauncher-plugin +xfce4-time-out-plugin +xfce4-fsguard-plugin +xfce4-mailwatch-plugin +xfce4-battery-plugin +xfce4-verve-plugin +xfce4-diskperf-plugin +xfce4-eyes-plugin +xfce4-notes-plugin +xfce4-netload-plugin +xfce4-mount-plugin +#xfce4-weather-plugin +xfce4-systemload-plugin +xfce4-cpugraph-plugin +#xfce4-xfapplet-plugin diff --git a/pkg.in/lists/tagged/desktop+xfce b/pkg.in/lists/tagged/desktop+xfce new file mode 100644 index 00000000..a6ff9085 --- /dev/null +++ b/pkg.in/lists/tagged/desktop+xfce @@ -0,0 +1,13 @@ +xfce4-taskmanager +xfce4-appfinder +xfce4-settings +xfcalendar +xfce4-mixer +gst-plugins-base +xfce4-minimal +xfce4-panel +xfce4-icon-theme +xfce4-session +xfce-utils +xfconf-utils +Thunar