summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/lists/desktop3
-rw-r--r--config/lists/desktop-base2
-rw-r--r--config/lists/gstreamer29
-rw-r--r--config/lists/kanotix-kde-base3
-rw-r--r--config/lists/kanotix-lxde-base4
-rw-r--r--config/lists/kanotix-lxde-master3
-rw-r--r--config/lists/kanotix-lxde-min8
-rw-r--r--config/lists/wheezy-pulseaudio4
-rw-r--r--config/lists/wheezy-pulseaudio-base10
9 files changed, 32 insertions, 34 deletions
diff --git a/config/lists/desktop b/config/lists/desktop
index d7bc0c0..2d1e7fd 100644
--- a/config/lists/desktop
+++ b/config/lists/desktop
@@ -5,6 +5,3 @@
# chat, irc
pidgin
pidgin-skype
-gstreamer0.10-plugins-base
-gstreamer0.10-plugins-good
-gstreamer0.10-alsa
diff --git a/config/lists/desktop-base b/config/lists/desktop-base
index 313f901..6da526a 100644
--- a/config/lists/desktop-base
+++ b/config/lists/desktop-base
@@ -1,5 +1,7 @@
# Kanotix Desktop Packages List without pidgin
+#include <gstreamer>
+
# java, plugins
#if DISTRIBUTION squeeze
icedtea6-plugin
diff --git a/config/lists/gstreamer b/config/lists/gstreamer
new file mode 100644
index 0000000..79066b8
--- /dev/null
+++ b/config/lists/gstreamer
@@ -0,0 +1,29 @@
+# pulseaudio for wheezy-base (multiarch)
+
+pulseaudio-module-x11
+pulseaudio-module-bluetooth
+libasound2-plugins
+pavucontrol
+
+#if ARCHITECTURE amd64
+libasound2-plugins:i386
+#endif
+
+
+# gstreamer packages
+
+gstreamer0.10-plugins-base
+gstreamer0.10-plugins-good
+gstreamer0.10-alsa
+gstreamer0.10-plugins-ugly
+gstreamer0.10-pulseaudio
+#if DISTRIBUTION wheezy
+gstreamer0.10-ffmpeg
+#endif
+
+#nif DISTRIBUTION wheezy
+gstreamer1.0-plugins-good
+gstreamer1.0-plugins-ugly
+gstreamer1.0-pulseaudio
+gstreamer1.0-libav
+#endif
diff --git a/config/lists/kanotix-kde-base b/config/lists/kanotix-kde-base
index e67890e..9645e02 100644
--- a/config/lists/kanotix-kde-base
+++ b/config/lists/kanotix-kde-base
@@ -20,11 +20,8 @@ vlc
#if DISTRIBUTION squeeze
phonon-backend-xine
#endif
-gstreamer0.10-plugins-ugly
#nif DISTRIBUTION squeeze
-#include <wheezy-pulseaudio>
vlc-plugin-pulse
-gstreamer0.10-pulseaudio
phonon-backend-gstreamer
#endif
diff --git a/config/lists/kanotix-lxde-base b/config/lists/kanotix-lxde-base
index b529eb7..1597e89 100644
--- a/config/lists/kanotix-lxde-base
+++ b/config/lists/kanotix-lxde-base
@@ -53,10 +53,6 @@ alsa-utils
xterm
#endif
-#nif DISTRIBUTION squeeze
-#include <wheezy-pulseaudio-base>
-#endif
-
# other hardware
xfce4-notifyd
diff --git a/config/lists/kanotix-lxde-master b/config/lists/kanotix-lxde-master
index 7c88cf9..4472272 100644
--- a/config/lists/kanotix-lxde-master
+++ b/config/lists/kanotix-lxde-master
@@ -22,9 +22,6 @@ gdebi
# multimedia
gecko-mediaplayer
exaile
-gstreamer0.10-plugins-ugly
-gstreamer0.10-pulseaudio
-gstreamer0.10-alsa
#if ARCHITECTURE amd64
vlc
vlc-plugin-pulse
diff --git a/config/lists/kanotix-lxde-min b/config/lists/kanotix-lxde-min
index 9c51333..5a63e3a 100644
--- a/config/lists/kanotix-lxde-min
+++ b/config/lists/kanotix-lxde-min
@@ -7,6 +7,7 @@
# tools
gparted
gksu
+#include <gstreamer>
# themes
gtk2-engines
@@ -49,9 +50,6 @@ compton
# multimedia
smplayer-translations
exaile
-gstreamer0.10-plugins-ugly
-gstreamer0.10-pulseaudio
-gstreamer0.10-alsa
# network
network-manager-gnome
@@ -77,10 +75,6 @@ alsa-utils
xterm
#endif
-#nif DISTRIBUTION squeeze
-#include <wheezy-pulseaudio-base>
-#endif
-
# other hardware
# irc
diff --git a/config/lists/wheezy-pulseaudio b/config/lists/wheezy-pulseaudio
deleted file mode 100644
index e9d646c..0000000
--- a/config/lists/wheezy-pulseaudio
+++ /dev/null
@@ -1,4 +0,0 @@
-# pulseaudio for wheezy with vlc (multiarch)
-
-#include <wheezy-pulseaudio-base>
-vlc-plugin-pulse
diff --git a/config/lists/wheezy-pulseaudio-base b/config/lists/wheezy-pulseaudio-base
deleted file mode 100644
index 25e6d82..0000000
--- a/config/lists/wheezy-pulseaudio-base
+++ /dev/null
@@ -1,10 +0,0 @@
-# pulseaudio for wheezy-base (multiarch)
-
-pulseaudio-module-x11
-pulseaudio-module-bluetooth
-libasound2-plugins
-pavucontrol
-
-#if ARCHITECTURE amd64
-libasound2-plugins:i386
-#endif