From 0b40eddf61a9051d0d3f35a3058b0a038a8da363 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 27 Jul 2014 03:52:57 +0200 Subject: [PATCH 1/2] README.md: Add additional information about how to use wine-compholio. --- README.md | 86 +++++++++++++++++++++++++++++++++++++++ debian/tools/README.md.in | 86 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 172 insertions(+) diff --git a/README.md b/README.md index c8ebdbc8..95945601 100644 --- a/README.md +++ b/README.md @@ -241,6 +241,92 @@ sudo urpmi.update -a sudo urpmi wine-compholio ``` +Using wine-compholio +==================== + +Since we don't want to duplicate a lot of information here, we recommend to take a +look at the [official Wine FAQ](http://wiki.winehq.org/FAQ) for general information +about how to use Wine. The following part will mainly concentrate on the differences +between wine and wine-compholio. + + +Running wine-compholio +---------------------- + +**Using multiple Wine versions:*** Unless you specify a special `WINEPREFIX` environment +variable, wine-compholio will use the same wineprefix `~/.wine` (in your home directory) +like regular wine. This allows you to use your already installed programs directly, +without much effort or reinstalling them. Often you have both regular wine and wine-compholio +installed at the same time, which is *absolutely no problem* - by typing in either `wine` +(=regular wine) or `/opt/wine-compholio/bin/wine` you can decide, which wine version you +want to run. You can switch between versions as often as you like - just make sure that all +Windows programs have terminated before starting them with a different version. + +To run wine-compholio always type `/opt/wine-compholio/bin/wine`, for example: +```bash +cd ~/.wine/drive_c// +/opt/wine-compholio/bin/wine game.exe +``` + +You also have to add `/opt/wine-compholio/bin/` when running other wine related programs, +here are some additional example: +```bash +# Initialize the wine prefix +/opt/wine-compholio/bin/wineboot + +# Open the wine configuration +/opt/wine-compholio/bin/winecfg + +# Run winepath to convert paths +/opt/wine-compholio/bin/winepath --unix 'c:\Windows' + +# Kill the running wineserver instance +/opt/wine-compholio/bin/wineserver -k + +... +``` + +If you're an experienced user, and always want to use wine-compholio, you can also add +`/opt/wine-compholio/bin` to your bash profile. We will not go into detail here, because +such a setup has the big disadvantage, that it hides which version you're using - which +is very important for getting support or reporting bugs. + + +Submitting bugs +--------------- + +**Warning: Do not submit bug reports at bugs.winehq.org when using this version!** + +If you encounter any issues, the first thing you should do is to try it with regular wine. +We're only a very small developer team, and although we would like to do that, we probably +cannot really solve all your Wine bugs. When it turns out that the official Wine version also +doesn't work, you can file a bugreport at the official [Wine bugtracker](http://bugs.winehq.org/). +Feel free to mention that you also tested with wine-compholio, but all bugreport related +information (logs, crashdumps, ...) should concentrate only on upstream wine. + +If it turns out, that it works with upstream wine, but not with wine-compholio, then it +might be a regression caused by our patches. We would like you to report this issue to us, +so we can fix it in future versions. You can also report issues, when testing with upstream +Wine is impossible or it crashes with a different error (for example much earlier). + +When submitting a application related bug here on github, please make sure to include at least +the following information. Generally its always a good idea to provide as much information as +possible, since this will significantly increase chances to provide support and to fix it. + +1. **Which application triggers the bug** + * Application name + * Version number (if available) + * Download URL (if available) +2. **WINEPREFIX settings** + * *Recommended:* Test it in a new wine prefix, and report if this works + * Did you install any overrides? (for examples by using `winetricks`) + * Did you change any settings by running `winecfg`? +3. **Information about your wine-compholio version** + * *Recommended:* Test with regular wine, and report if this works + * Version number (`/opt/wine-compholio/bin/wine --version`) + * Patches in your build (`/opt/wine-compholio/bin/wine --patches`) + * Installed optional libraries (`/opt/wine-compholio/bin/wine --check-libs`) + Compiling wine-compholio ======================== diff --git a/debian/tools/README.md.in b/debian/tools/README.md.in index f3f73e05..97fac7d7 100644 --- a/debian/tools/README.md.in +++ b/debian/tools/README.md.in @@ -215,6 +215,92 @@ sudo urpmi.update -a sudo urpmi wine-compholio ``` +Using wine-compholio +==================== + +Since we don't want to duplicate a lot of information here, we recommend to take a +look at the [official Wine FAQ](http://wiki.winehq.org/FAQ) for general information +about how to use Wine. The following part will mainly concentrate on the differences +between wine and wine-compholio. + + +Running wine-compholio +---------------------- + +**Using multiple Wine versions:*** Unless you specify a special `WINEPREFIX` environment +variable, wine-compholio will use the same wineprefix `~/.wine` (in your home directory) +like regular wine. This allows you to use your already installed programs directly, +without much effort or reinstalling them. Often you have both regular wine and wine-compholio +installed at the same time, which is *absolutely no problem* - by typing in either `wine` +(=regular wine) or `/opt/wine-compholio/bin/wine` you can decide, which wine version you +want to run. You can switch between versions as often as you like - just make sure that all +Windows programs have terminated before starting them with a different version. + +To run wine-compholio always type `/opt/wine-compholio/bin/wine`, for example: +```bash +cd ~/.wine/drive_c// +/opt/wine-compholio/bin/wine game.exe +``` + +You also have to add `/opt/wine-compholio/bin/` when running other wine related programs, +here are some additional example: +```bash +# Initialize the wine prefix +/opt/wine-compholio/bin/wineboot + +# Open the wine configuration +/opt/wine-compholio/bin/winecfg + +# Run winepath to convert paths +/opt/wine-compholio/bin/winepath --unix 'c:\Windows' + +# Kill the running wineserver instance +/opt/wine-compholio/bin/wineserver -k + +... +``` + +If you're an experienced user, and always want to use wine-compholio, you can also add +`/opt/wine-compholio/bin` to your bash profile. We will not go into detail here, because +such a setup has the big disadvantage, that it hides which version you're using - which +is very important for getting support or reporting bugs. + + +Submitting bugs +--------------- + +**Warning: Do not submit bug reports at bugs.winehq.org when using this version!** + +If you encounter any issues, the first thing you should do is to try it with regular wine. +We're only a very small developer team, and although we would like to do that, we probably +cannot really solve all your Wine bugs. When it turns out that the official Wine version also +doesn't work, you can file a bugreport at the official [Wine bugtracker](http://bugs.winehq.org/). +Feel free to mention that you also tested with wine-compholio, but all bugreport related +information (logs, crashdumps, ...) should concentrate only on upstream wine. + +If it turns out, that it works with upstream wine, but not with wine-compholio, then it +might be a regression caused by our patches. We would like you to report this issue to us, +so we can fix it in future versions. You can also report issues, when testing with upstream +Wine is impossible or it crashes with a different error (for example much earlier). + +When submitting a application related bug here on github, please make sure to include at least +the following information. Generally its always a good idea to provide as much information as +possible, since this will significantly increase chances to provide support and to fix it. + +1. **Which application triggers the bug** + * Application name + * Version number (if available) + * Download URL (if available) +2. **WINEPREFIX settings** + * *Recommended:* Test it in a new wine prefix, and report if this works + * Did you install any overrides? (for examples by using `winetricks`) + * Did you change any settings by running `winecfg`? +3. **Information about your wine-compholio version** + * *Recommended:* Test with regular wine, and report if this works + * Version number (`/opt/wine-compholio/bin/wine --version`) + * Patches in your build (`/opt/wine-compholio/bin/wine --patches`) + * Installed optional libraries (`/opt/wine-compholio/bin/wine --check-libs`) + Compiling wine-compholio ======================== From 3d582c05b67124c6f1065af07067584d2774547f Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 27 Jul 2014 04:04:48 +0200 Subject: [PATCH 2/2] README.md: Reorder ArchLinux instructions, to make them more similar to all other distros. --- README.md | 17 ++++++++--------- debian/tools/README.md.in | 17 ++++++++--------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 709bc075..f72aad1d 100644 --- a/README.md +++ b/README.md @@ -70,20 +70,19 @@ sudo apt-get install --install-recommends wine-compholio ![alt text](http://cdn.fds-team.de/misc/images/arch.png) Arch Linux ------------------------------------------------------------------------- -In order to add our repository, you have to add the following lines to your -`/etc/pacman.conf`: -``` -[compholio] -Server = http://cdn.fds-team.de/stable/arch/$arch -``` - -Afterwards you have to import the key for our repository, and set the trust level to -trusted: +As a first step you have to import the key for our repository, and set the trust level +to trusted: ```bash sudo pacman-key -r E49CC0415DC2D5CA sudo pacman-key --lsign-key E49CC0415DC2D5CA ``` +Afterwards you have to add the following lines to `/etc/pacman.conf`: +``` +[compholio] +Server = http://cdn.fds-team.de/stable/arch/$arch +``` + Now you can install wine-compholio directly using `pacman`: ```bash sudo pacman -Sy wine-compholio diff --git a/debian/tools/README.md.in b/debian/tools/README.md.in index 97fac7d7..411526f0 100644 --- a/debian/tools/README.md.in +++ b/debian/tools/README.md.in @@ -43,20 +43,19 @@ sudo apt-get install --install-recommends wine-compholio ![alt text](http://cdn.fds-team.de/misc/images/arch.png) Arch Linux ------------------------------------------------------------------------- -In order to add our repository, you have to add the following lines to your -`/etc/pacman.conf`: -``` -[compholio] -Server = http://cdn.fds-team.de/stable/arch/$arch -``` - -Afterwards you have to import the key for our repository, and set the trust level to -trusted: +As a first step you have to import the key for our repository, and set the trust level +to trusted: ```bash sudo pacman-key -r E49CC0415DC2D5CA sudo pacman-key --lsign-key E49CC0415DC2D5CA ``` +Afterwards you have to add the following lines to `/etc/pacman.conf`: +``` +[compholio] +Server = http://cdn.fds-team.de/stable/arch/$arch +``` + Now you can install wine-compholio directly using `pacman`: ```bash sudo pacman -Sy wine-compholio