diff options
| author | Joerg Schirottke <master@kanotix.com> | 2014-08-22 22:52:46 +0200 |
|---|---|---|
| committer | Holger Paradies <retabell@gmx.de> | 2014-08-24 09:06:11 +0200 |
| commit | 7729238e7fc841b597ccd97c96aa3e1be6676881 (patch) | |
| tree | 19a88b1f963f03ea48992bb83dc42b97895b851d | |
| parent | c1225340d5dc9006c1aef8ebd2fc777ee0ffd7fa (diff) | |
| download | kanotix-7729238e7fc841b597ccd97c96aa3e1be6676881.zip kanotix-7729238e7fc841b597ccd97c96aa3e1be6676881.tar.gz | |
wine-development hotfix
| -rwxr-xr-x | config/chroot_local-hooks/wine-unstable-hotfix | 10 | ||||
| -rw-r--r-- | config/lists/jessie-wine | 13 | ||||
| -rw-r--r-- | config/lists/kanotix-kde-master | 10 | ||||
| -rw-r--r-- | config/lists/kanotix-lxde-full | 10 |
4 files changed, 27 insertions, 16 deletions
diff --git a/config/chroot_local-hooks/wine-unstable-hotfix b/config/chroot_local-hooks/wine-unstable-hotfix index 09f2713..5081465 100755 --- a/config/chroot_local-hooks/wine-unstable-hotfix +++ b/config/chroot_local-hooks/wine-unstable-hotfix @@ -1,5 +1,7 @@ #!/bin/sh -if [ -x /usr/bin/wine-unstable -a ! -x /usr/bin/wine ]; then - printf '#!/bin/sh\nwine-unstable "$@"\n' > /usr/bin/wine - chmod +x /usr/bin/wine -fi +for w in wine-unstable wine-development; do + if [ -x /usr/bin/$w -a ! -x /usr/bin/wine ]; then + printf '#!/bin/sh\n'$w' "$@"\n' > /usr/bin/wine + chmod +x /usr/bin/wine + fi +done diff --git a/config/lists/jessie-wine b/config/lists/jessie-wine new file mode 100644 index 0000000..7cd5b23 --- /dev/null +++ b/config/lists/jessie-wine @@ -0,0 +1,13 @@ +# wine for jessie (multiarch) + +winetricks + +#if ARCHITECTURE i386 +wine-development +#endif + +#if ARCHITECTURE amd64 +wine-development:i386 +libncurses5:i386 +libxtst6:i386 +#endif diff --git a/config/lists/kanotix-kde-master b/config/lists/kanotix-kde-master index 6a71833..be6dce5 100644 --- a/config/lists/kanotix-kde-master +++ b/config/lists/kanotix-kde-master @@ -39,14 +39,12 @@ update-manager-core update-notifier-kde # wine -#if DISTRIBUTION squeeze -wine1.3 -wine1.3-gecko -winetricks -#endif -#nif DISTRIBUTION squeeze +#if DISTRIBUTION wheezy #include <wheezy-wine> #endif +#nif DISTRIBUTION wheezy +#include <jessie-wine> +#endif # games armagetronad diff --git a/config/lists/kanotix-lxde-full b/config/lists/kanotix-lxde-full index e10c546..78d2bd4 100644 --- a/config/lists/kanotix-lxde-full +++ b/config/lists/kanotix-lxde-full @@ -21,14 +21,12 @@ sane icedove-l10n-de # wine -#if DISTRIBUTION squeeze -wine1.3 -wine1.3-gecko -winetricks -#endif -#nif DISTRIBUTION squeeze +#if DISTRIBUTION wheezy #include <wheezy-wine> #endif +#nif DISTRIBUTION wheezy +#include <jessie-wine> +#endif # games |