diff options
| author | Andreas Loibl <andreas@andreas-loibl.de> | 2013-08-26 21:28:38 +0200 |
|---|---|---|
| committer | Andreas Loibl <andreas@andreas-loibl.de> | 2013-08-27 06:46:21 +0200 |
| commit | 3b0a401d4eaa4c961c6a07c3a98c3d40b0a3e031 (patch) | |
| tree | a0d5c539f2e8679234550df0e48c27082e83476d /config/lists | |
| parent | eed584b30c1d4b96e0be8dcf6781acb0aa30c37a (diff) | |
| download | kanotix-3b0a401d4eaa4c961c6a07c3a98c3d40b0a3e031.zip kanotix-3b0a401d4eaa4c961c6a07c3a98c3d40b0a3e031.tar.gz | |
added some optional proprietary packages/ repositories and hooks
Diffstat (limited to 'config/lists')
| -rw-r--r-- | config/lists/acrobat | 1 | ||||
| -rw-r--r-- | config/lists/dropbox | 1 | ||||
| -rw-r--r-- | config/lists/hangouts | 1 | ||||
| -rw-r--r-- | config/lists/kanotix-kde-base | 9 | ||||
| -rw-r--r-- | config/lists/kanotix-kde-master | 3 | ||||
| -rw-r--r-- | config/lists/kanotix-lxde-master | 7 | ||||
| -rw-r--r-- | config/lists/skype (renamed from config/lists/wheezy-skype) | 2 | ||||
| -rw-r--r-- | config/lists/spotify | 1 | ||||
| -rw-r--r-- | config/lists/squeeze-skype | 11 | ||||
| -rw-r--r-- | config/lists/teamviewer | 1 | ||||
| -rw-r--r-- | config/lists/virtualbox | 1 | ||||
| -rw-r--r-- | config/lists/xbmc | 1 |
12 files changed, 13 insertions, 26 deletions
diff --git a/config/lists/acrobat b/config/lists/acrobat new file mode 100644 index 0000000..0d8ed06 --- /dev/null +++ b/config/lists/acrobat @@ -0,0 +1 @@ +# dummy list that is only used to enable a chroot-hook diff --git a/config/lists/dropbox b/config/lists/dropbox new file mode 100644 index 0000000..c9fe58e --- /dev/null +++ b/config/lists/dropbox @@ -0,0 +1 @@ +dropbox diff --git a/config/lists/hangouts b/config/lists/hangouts new file mode 100644 index 0000000..d8f506e --- /dev/null +++ b/config/lists/hangouts @@ -0,0 +1 @@ +google-talkplugin diff --git a/config/lists/kanotix-kde-base b/config/lists/kanotix-kde-base index db29fc3..d89bd53 100644 --- a/config/lists/kanotix-kde-base +++ b/config/lists/kanotix-kde-base @@ -28,15 +28,6 @@ gstreamer0.10-pulseaudio phonon-backend-gstreamer #endif -# skype -pidgin-skype -#if DISTRIBUTION squeeze -#include <squeeze-skype> -#endif -#if DISTRIBUTION wheezy -#include <wheezy-skype> -#endif - # other hardware modemmanager diff --git a/config/lists/kanotix-kde-master b/config/lists/kanotix-kde-master index e89262a..92e2309 100644 --- a/config/lists/kanotix-kde-master +++ b/config/lists/kanotix-kde-master @@ -23,6 +23,9 @@ gwenview openvpn network-manager-openvpn +# skype +#include <skype> + # kde khelpcenter4 diff --git a/config/lists/kanotix-lxde-master b/config/lists/kanotix-lxde-master index 2cc616f..9f633de 100644 --- a/config/lists/kanotix-lxde-master +++ b/config/lists/kanotix-lxde-master @@ -42,12 +42,7 @@ ncdu xzdec # skype -#if DISTRIBUTION squeeze -#include <squeeze-skype> -#endif -#if DISTRIBUTION wheezy -#include <wheezy-skype> -#endif +#include <skype> # games mahjongg diff --git a/config/lists/wheezy-skype b/config/lists/skype index 08913ca..bf254a4 100644 --- a/config/lists/wheezy-skype +++ b/config/lists/skype @@ -1,5 +1,7 @@ # skype for wheezy (multiarch) +pidgin-skype + #if ARCHITECTURE i386 skype #endif diff --git a/config/lists/spotify b/config/lists/spotify new file mode 100644 index 0000000..0d8ed06 --- /dev/null +++ b/config/lists/spotify @@ -0,0 +1 @@ +# dummy list that is only used to enable a chroot-hook diff --git a/config/lists/squeeze-skype b/config/lists/squeeze-skype deleted file mode 100644 index b6b92bb..0000000 --- a/config/lists/squeeze-skype +++ /dev/null @@ -1,11 +0,0 @@ -# skype for squeeze -skype - -#if ARCHITECTURE i386 -libv4l-0 -#endif - -#if ARCHITECTURE amd64 -lib32v4l-0 -#endif - diff --git a/config/lists/teamviewer b/config/lists/teamviewer new file mode 100644 index 0000000..0d8ed06 --- /dev/null +++ b/config/lists/teamviewer @@ -0,0 +1 @@ +# dummy list that is only used to enable a chroot-hook diff --git a/config/lists/virtualbox b/config/lists/virtualbox new file mode 100644 index 0000000..4d9adfb --- /dev/null +++ b/config/lists/virtualbox @@ -0,0 +1 @@ +virtualbox-4.2 diff --git a/config/lists/xbmc b/config/lists/xbmc new file mode 100644 index 0000000..9ddd246 --- /dev/null +++ b/config/lists/xbmc @@ -0,0 +1 @@ +xbmc |