diff options
author | Andreas Loibl <andreas@andreas-loibl.de> | 2013-02-11 00:24:47 +0100 |
---|---|---|
committer | Andreas Loibl <andreas@andreas-loibl.de> | 2013-02-11 00:24:47 +0100 |
commit | df8d551db217cc5e115538f1c7c573df79b25552 (patch) | |
tree | 9029eb051852e0a16d48cb305f56d45fa5565e2d | |
parent | 506817b8e681f68951a652b99812146255eaa9c9 (diff) | |
download | kanotix-df8d551db217cc5e115538f1c7c573df79b25552.zip kanotix-df8d551db217cc5e115538f1c7c573df79b25552.tar.gz |
package list update, removed acritox-kde48 repo
-rwxr-xr-x | auto/config | 2 | ||||
-rw-r--r-- | config/lists/base | 1 | ||||
-rw-r--r-- | config/lists/kanotix-kde-base | 6 | ||||
-rw-r--r-- | config/lists/kanotix-lxde-base | 5 | ||||
-rw-r--r-- | config/lists/kde48 | 5 | ||||
-rw-r--r-- | config/repositories/acritox-kde48 | 3 |
6 files changed, 8 insertions, 14 deletions
diff --git a/auto/config b/auto/config index c307036..8638704 100755 --- a/auto/config +++ b/auto/config @@ -67,8 +67,6 @@ esac [ "$LB_BOOTLOADER" = "burg" ] && LB_REPOSITORIES+=" burg" [ "$LB_BOOTLOADER" = "grub2" ] && LB_REPOSITORIES+=" grub2" -# kde4.8 is in wheezy now, no need for backport repository anymore -# grep -wq kde48 <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" acritox-kde48" grep -wq trinity <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" trinity" grep -wq -e virtualbox -e vbox <<<"$LB_PACKAGES $LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" vbox" grep -wq -e opera <<<"$LB_PACKAGES $LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" opera" diff --git a/config/lists/base b/config/lists/base index 3df18c5..2ead090 100644 --- a/config/lists/base +++ b/config/lists/base @@ -23,6 +23,7 @@ gfxoverlay # multimedia sox alsa-oss +alsa-utils # chat, irc weechat diff --git a/config/lists/kanotix-kde-base b/config/lists/kanotix-kde-base index e8b13c7..d8d07c0 100644 --- a/config/lists/kanotix-kde-base +++ b/config/lists/kanotix-kde-base @@ -11,6 +11,12 @@ apt-xapian-index # multimedia gecko-mediaplayer mplayerthumbs +vlc +phonon-backend-vlc +#nif DISTRIBUTION squeeze +#include <wheezy-pulseaudio> +vlc-plugin-pulse +#endif # skype pidgin-skype diff --git a/config/lists/kanotix-lxde-base b/config/lists/kanotix-lxde-base index 7830c81..52ec1b6 100644 --- a/config/lists/kanotix-lxde-base +++ b/config/lists/kanotix-lxde-base @@ -63,10 +63,6 @@ alsa-utils xterm #endif -#nif DISTRIBUTION squeeze -#include <wheezy-pulseaudio> -#endif - # multimedia gecko-mediaplayer me-tv @@ -76,6 +72,7 @@ gstreamer0.10-plugins-ugly gstreamer0.10-ffmpeg vlc #nif DISTRIBUTION squeeze +#include <wheezy-pulseaudio> vlc-plugin-pulse #endif diff --git a/config/lists/kde48 b/config/lists/kde48 deleted file mode 100644 index ce807c9..0000000 --- a/config/lists/kde48 +++ /dev/null @@ -1,5 +0,0 @@ -# additional packages needed for KDE4.8 from acritox-kde48 backport repository -phonon-backend-vlc -vlc -konsole -libicu48 diff --git a/config/repositories/acritox-kde48 b/config/repositories/acritox-kde48 deleted file mode 100644 index edd89d8..0000000 --- a/config/repositories/acritox-kde48 +++ /dev/null @@ -1,3 +0,0 @@ -# KDE4.8 (backported by acritox) -deb http://kanotix.acritox.com/debian dragonfire kde-backport -deb-src http://kanotix.acritox.com/debian dragonfire kde-backport |