diff options
| author | Andreas Loibl <andreas@andreas-loibl.de> | 2012-10-11 22:31:26 +0200 |
|---|---|---|
| committer | Andreas Loibl <andreas@andreas-loibl.de> | 2012-10-11 22:31:26 +0200 |
| commit | 80cacfe57ab1a7e2be7af295ece081ca6fff94c6 (patch) | |
| tree | 53d554abc70906b7dcbedfc79d379a4ea5ead99a /config/lists | |
| parent | 82b8b80cb2a042e84c4439d8d79d12d3336e4aea (diff) | |
| download | kanotix-80cacfe57ab1a7e2be7af295ece081ca6fff94c6.zip kanotix-80cacfe57ab1a7e2be7af295ece081ca6fff94c6.tar.gz | |
various smaller changes
* removed wine-ppa-oneiric
* added hack to generate initrd only once
* added multiarch support for wheezy amd64
* updated packagelists for multiarch (wine, skype)
* removed obsolete packagelists includes
Diffstat (limited to 'config/lists')
| -rw-r--r-- | config/lists/base | 1 | ||||
| -rw-r--r-- | config/lists/kanotix-kde-base | 7 | ||||
| -rw-r--r-- | config/lists/kanotix-kde-master | 5 | ||||
| -rw-r--r-- | config/lists/kanotix-trinity-master | 2 | ||||
| -rw-r--r-- | config/lists/wheezy-skype | 10 | ||||
| -rw-r--r-- | config/lists/wheezy-wine | 17 |
6 files changed, 40 insertions, 2 deletions
diff --git a/config/lists/base b/config/lists/base index 259ed07..52dfd99 100644 --- a/config/lists/base +++ b/config/lists/base @@ -9,7 +9,6 @@ #endif #include <firmware> -#include <standard-x11> #include <base.kanotix> diff --git a/config/lists/kanotix-kde-base b/config/lists/kanotix-kde-base index a732a50..cf7c53d 100644 --- a/config/lists/kanotix-kde-base +++ b/config/lists/kanotix-kde-base @@ -12,8 +12,13 @@ apt-xapian-index gecko-mediaplayer # skype -skype pidgin-skype +#if DISTRIBUTION 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 d41b033..974a1a1 100644 --- a/config/lists/kanotix-kde-master +++ b/config/lists/kanotix-kde-master @@ -34,9 +34,14 @@ update-manager-core update-notifier-kde # wine +#if DISTRIBUTION squeeze wine1.3 wine1.3-gecko winetricks +#endif +#if DISTRIBUTION wheezy +#include <wheezy-wine> +#endif # games armagetronad diff --git a/config/lists/kanotix-trinity-master b/config/lists/kanotix-trinity-master index 723727c..72b0fd9 100644 --- a/config/lists/kanotix-trinity-master +++ b/config/lists/kanotix-trinity-master @@ -21,8 +21,10 @@ pidgin-skype khelpcenter-trinity # wine +#if DISTRIBUTION squeeze wine1.3 wine1.3-gecko +#endif # other hardware modemmanager diff --git a/config/lists/wheezy-skype b/config/lists/wheezy-skype new file mode 100644 index 0000000..08913ca --- /dev/null +++ b/config/lists/wheezy-skype @@ -0,0 +1,10 @@ +# skype for wheezy (multiarch) + +#if ARCHITECTURE i386 +skype +#endif + +#if ARCHITECTURE amd64 +skype:i386 +#endif + diff --git a/config/lists/wheezy-wine b/config/lists/wheezy-wine new file mode 100644 index 0000000..99aaec8 --- /dev/null +++ b/config/lists/wheezy-wine @@ -0,0 +1,17 @@ +# wine for wheezy (multiarch) + +wine-unstable +winetricks + +#if ARCHITECTURE i386 +libwine-alsa-unstable +libwine-gl-unstable +libwine-print-unstable +#endif + +#if ARCHITECTURE amd64 +libwine-alsa-unstable:i386 +libwine-gl-unstable:i386 +libwine-print-unstable:i386 +#endif + |