other wine stuff
Too bad amd64 support in wine was rejected, but let's forget that. There's
some other wine stuff I'd like to get in the release.
I'm attaching a few patches. They all are backports from the version
currently in sid. I'd appreciate if you can tell what's your stance on
each of them.
Here's a list, with some explanation and my own opinion on them:
desktop_integration.diff
- Quite important. Makes wine actualy usable without knowing
anything about command-line (fixes MIME file association, and
adds a menu option to run winecfg, which is mandatory in many
cases).
enable_executable_stack.diff
- Very important. Considerably increases the number of (legacy
win32) applications wine can run when your system disables executable
stack (which we do by default when CPU supports it).
galician_translation.diff
- Well, that :-)
improve_README.Debian.diff
- Can't comment on this (Ove?), except saying that
remove_wineinstall_and_skel_stuff.diff is documented here.
move_explorer_and_winecfg_from_wine-utils_to_wine.diff
- Quite important. Without it, menu option for winecfg (see
desktop_integration.diff) is not very useful unless user
figured out that she needs wine-utils.
remove_wineinstall_and_skel_stuff.diff
- Sounds like package maintainance cleanup that etch users can
live without. Ove, is that right?
TIA
--
Robert Millan
My spam trap is honeypot@aybabtu.com. Note: this address is only intended
for spam harvesters. Writing to it will get you added to my black list.
* Added winecfg.desktop from Robert Millan. Closes: #404227.
diff -Nur wine-0.9.25.old/debian/rules wine-0.9.25/debian/rules
--- wine-0.9.25.old/debian/rules 2007-02-21 23:05:03.000000000 +0100
+++ wine-0.9.25/debian/rules 2007-02-21 23:05:30.000000000 +0100
@@ -169,6 +177,7 @@
install tools/fnt2bdf debian/wine-utils/usr/bin
install tools/font_convert.sh debian/wine-utils/usr/bin
cp tools/winedump/README debian/wine-utils/usr/share/doc/wine-utils/README.winedump
+ cp debian/winecfg.desktop debian/wine-utils/usr/share/applications/winecfg.desktop
# split up libwine
ifeq ($(DEB_HOST_GNU_SYSTEM), linux-gnu)
diff -Nur wine-0.9.25.old/debian/winecfg.desktop wine-0.9.25/debian/winecfg.desktop
--- wine-0.9.25.old/debian/winecfg.desktop 1970-01-01 01:00:00.000000000 +0100
+++ wine-0.9.25/debian/winecfg.desktop 2007-02-21 23:05:30.000000000 +0100
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Wine configuration
+Comment=Setup the compatibility layer for Windows programs
+Comment[ca]=Configura la capa de compatibilitat per a programes de Windows
+Exec=winecfg
+Icon=/usr/share/pixmaps/wine.xpm
+Terminal=false
+Type=Application
+Encoding=UTF-8
+Categories=Application;System;
diff -Nur wine-0.9.25.old/debian/wine.desktop wine-0.9.25/debian/wine.desktop
--- wine-0.9.25.old/debian/wine.desktop 2007-02-21 23:05:03.000000000 +0100
+++ wine-0.9.25/debian/wine.desktop 2007-02-21 23:05:30.000000000 +0100
@@ -2,7 +2,7 @@
Type=Application
Encoding=UTF-8
Name=WINE
-GenericName=Win32 API Emulator
+GenericName=Wine Win32 API Emulator
GenericName[ru]=Эмулятор Win32 API
Comment=Launch your windows programs
Comment[ru]=Программа для запуска приложений для ОС Windows
@@ -11,5 +11,5 @@
Exec=wine %f
Terminal=false
Categories=Emulator;
-MimeType=application/x-ms-dos-executable
+MimeType=application/x-ms-dos-executable;application/x-msdos-program;application/x-msdownload;application/exe;application/x-exe;application/dos-exe;vms/exe;application/x-winexe;application/msdos-windows;application/x-msdos-program;application/x-zip-compressed
Icon=wine
diff -Nur wine-0.9.25.old/debian/wine-utils.dirs wine-0.9.25/debian/wine-utils.dirs
--- wine-0.9.25.old/debian/wine-utils.dirs 2007-02-21 23:05:03.000000000 +0100
+++ wine-0.9.25/debian/wine-utils.dirs 2007-02-21 23:05:30.000000000 +0100
@@ -1,3 +1,4 @@
usr/share
usr/share/doc
usr/share/doc/wine-utils
+usr/share/applications
* Applied patch to mark stack executable. Closes: #401562.
diff -Nur wine-0.9.25.old/configure.ac wine-0.9.25/configure.ac
--- wine-0.9.25.old/configure.ac 2007-02-21 23:05:03.000000000 +0100
+++ wine-0.9.25/configure.ac 2007-02-21 23:05:30.000000000 +0100
@@ -938,6 +938,18 @@
fi
fi
+AC_SUBST(EXECSTACK,"")
+saved_LDFLAGS="$LDFLAGS"
+LDFLAGS="$LDFLAGS -z execstack"
+AC_CACHE_CHECK([for -z execstack], ac_cv_z_execstack,
+ AC_TRY_LINK([],[int main(void) {return 0;}],
+ ac_cv_z_execstack=yes,ac_cv_z_execstack=no))
+if test $ac_cv_z_execstack
+then
+ EXECSTACK="-z execstack"
+fi
+LDFLAGS="$saved_LDFLAGS"
+
dnl **** Check how to define a function in assembly code ****
AC_CACHE_CHECK([how to define a function in assembly code], ac_cv_asm_func_def,
diff -Nur wine-0.9.25.old/loader/Makefile.in wine-0.9.25/loader/Makefile.in
--- wine-0.9.25.old/loader/Makefile.in 2007-01-25 16:53:50.000000000 +0100
+++ wine-0.9.25/loader/Makefile.in 2007-02-21 23:05:30.000000000 +0100
@@ -35,18 +35,19 @@
LIBPTHREAD = @LIBPTHREAD@
LDEXECFLAGS = @LDEXECFLAGS@
+EXECSTACK = @EXECSTACK@
wine-glibc: glibc.o Makefile.in
$(CC) -o $@ glibc.o $(LIBWINE_LDFLAGS) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS)
wine-preloader: preloader.o Makefile.in
- $(CC) -o $@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c000000 preloader.o $(LIBPORT) $(LDFLAGS)
+ $(CC) -o $@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c000000 preloader.o $(LIBPORT) $(LDFLAGS) $(EXECSTACK)
wine-kthread: $(KTHREAD_OBJS) Makefile.in
- $(CC) -o $@ $(LDEXECFLAGS) $(KTHREAD_OBJS) $(LIBWINE_LDFLAGS) $(LIBPORT) $(EXTRALIBS) $(LDFLAGS)
+ $(CC) -o $@ $(LDEXECFLAGS) $(KTHREAD_OBJS) $(LIBWINE_LDFLAGS) $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) $(EXECSTACK)
wine-pthread: $(PTHREAD_OBJS) Makefile.in
- $(CC) -o $@ $(LDEXECFLAGS) $(PTHREAD_OBJS) $(LIBWINE_LDFLAGS) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS)
+ $(CC) -o $@ $(LDEXECFLAGS) $(PTHREAD_OBJS) $(LIBWINE_LDFLAGS) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(EXECSTACK)
$(MODULE): $(MAIN_BINARY)
$(RM) $(MODULE) && $(LN_S) $(MAIN_BINARY) $(MODULE)
diff -Nur wine-0.9.25.old/debian/libwine.templates wine-0.9.25/debian/libwine.templates
--- wine-0.9.25.old/debian/libwine.templates 2007-02-21 23:05:03.000000000 +0100
+++ wine-0.9.25/debian/libwine.templates 2007-02-21 23:05:30.000000000 +0100
@@ -18,6 +18,8 @@
La antigua ubicación predeterminada de la Unidad C en /usr/share/wine contradecía el Estándar de la Jerarquía del Sistema de Ficheros (FHS), por lo que se ha cambiado a /var/lib/wine. Su /etc/wine.conf debería actualizarse automáticamente, pero si tiene algún fichero .winerc o scripts que dependan de la ubicación anterior, tendrá que modificarlos por su cuenta.
Description-fr.UTF-8: Déplacement de /usr/share/wine/drivec vers /var/lib/wine/drivec
Placer le pseudo-disque C dans /usr/share/wine violait la norme de hiérarchie du système de fichiers (FHS : « Filesystem Hierarchy Standard »). Il a donc été déplacé vers /var/lib/wine. Votre fichier /etc/wine.conf devrait être mis à jour automatiquement. Cependant, si vous avez des fichiers .winerc ou bien si vous avez écrit des scripts qui dépendent de l'ancien emplacement, vous devrez les mettre à jour vous-même.
+Description-gl5A.UTF-8: A trasladar /usr/share/wine/drivec a /var/lib/wine/drivec
+ A ubicación antiga por defecto da unidade C en /usr/share/wine viola o estándar FHS, e, polo tanto, estase a trasladar a /var/lib/wine. Hase actualizar o seu ficheiro /etc/wine.conf automaticamente, pero se ten un ficheiro winerc ou escribiu scripts que dependen da ubicación antiga ten que os actualizar vostede mesmo.
Description-it.UTF-8: Sposto /usr/share/wine/drivec in /var/lib/wine/drivec
La precedente posizione di default del Drive C in /usr/share/wine viola il Filesystem Hierarchy Standard, quindi viene spostato in /var/lib/wine. Il tuo /etc/wine.conf dovrebbe essere aggiornato in automatico, ma se hai un .winerc o hai scritto degli script che dipendono dalla vecchia posizione, dovrai aggiornarli da solo.
Description-ja.UTF-8: /usr/share/wine/drivec を /var/lib/wine/drivec に移動しています
diff -Nur wine-0.9.25.old/debian/po/gl.po wine-0.9.25/debian/po/gl.po
--- wine-0.9.25.old/debian/po/gl.po 1970-01-01 01:00:00.000000000 +0100
+++ wine-0.9.25/debian/po/gl.po 2007-02-21 23:05:30.000000000 +0100
@@ -0,0 +1,92 @@
+# Galician translation of wine's debconf templates
+# This file is distributed under the same license as the wine package.
+# Jacobo Tarrio <jtarrio@debian.org>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: wine\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-01-13 20:29+0100\n"
+"PO-Revision-Date: 2007-01-17 10:45+0100\n"
+"Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
+"Language-Team: Galician <proxecto@trasno.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../libwine.templates.master:1001
+msgid "Moving /usr/share/wine/drivec to /var/lib/wine/drivec"
+msgstr "A trasladar /usr/share/wine/drivec a /var/lib/wine/drivec"
+
+#. Type: note
+#. Description
+#: ../libwine.templates.master:1001
+msgid ""
+"The previous default Drive C location in /usr/share/wine violates the "
+"Filesystem Hierarchy Standard and is thus being relocated to /var/lib/wine. "
+"Your /etc/wine.conf should be updated automatically, but if you have a ."
+"winerc or have written scripts that depend on the old location, you must "
+"update these yourself."
+msgstr ""
+"A ubicación antiga por defecto da unidade C en /usr/share/wine viola o "
+"estándar FHS, e, polo tanto, estase a trasladar a /var/lib/wine. Hase "
+"actualizar o seu ficheiro /etc/wine.conf automaticamente, pero se ten un "
+"ficheiro winerc ou escribiu scripts que dependen da ubicación antiga ten que "
+"os actualizar vostede mesmo."
+
+#. Type: boolean
+#. Description
+#: ../wine.templates.master:1001
+msgid "Old wine.conf detected, remove it?"
+msgstr "Detectouse un ficheiro wine.conf antigo, ¿eliminalo?"
+
+#. Type: boolean
+#. Description
+#: ../wine.templates.master:1001
+msgid ""
+"Wine no longer tries to load /etc/wine.conf by default. Thus, users that "
+"don't have a ~/.winerc (or ~/.wine/config) file will not be able to run "
+"Wine, unless they set up a ~/.wine/config file for themselves. This is "
+"easily done with the winesetup tool, found in the winesetuptk package (or "
+"else each user can copy the old /etc/wine.conf to ~/.winerc and let wine "
+"convert it). If you remove the /etc/wine.conf file, then winesetup will "
+"launch automatically for users that don't have a config file, instead of "
+"requiring the users to do any of the above themselves."
+msgstr ""
+"Wine xa non tenta cargar /etc/wine.conf por defecto. Polo tanto, os usuarios "
+"que non teñan un ficheiro ~/.winerc (ou ~/.wine/config) non han poder "
+"executar Wine, a menos que configuren un ficheiro ~/.wine/config eles "
+"mesmos. Isto faise de xeito doado coa ferramenta winesetup, que está no "
+"paquete winesetuptk (ou cada usuario pode copiar o antigo ficheiro /etc/wine."
+"conf a ~/.winerc e deixar que wine o convirta). Se elimina o ficheiro /etc/"
+"wine.conf, winesetup hase lanzar automaticamente para os usuarios que non "
+"teñan un ficheiro de configuración, no canto de obrigalos a facer eles o de "
+"enriba."
+
+#. Type: select
+#. Choices
+#: ../wine.templates.master:2001
+msgid "Autodetect, Existing-Windows, No-Windows, Skip"
+msgstr "Autodetectar, Windows-existente, Sen-windows, Omitir"
+
+#. Type: select
+#. Description
+#: ../wine.templates.master:2002
+msgid "What kind of Wine configuration do you want?"
+msgstr "¿Que tipo de configuración de Wine quere?"
+
+#. Type: select
+#. Description
+#: ../wine.templates.master:2002
+msgid ""
+"Wine is able to use an existing Windows installation if you have one mounted "
+"(preferably with write permissions), but if you don't have one (or don't "
+"want to use it), Wine can also run completely Microsoft-free. Choose the "
+"setup most appropriate for you."
+msgstr ""
+"Wine pode empregar unha instalación existente de Windows se ten unha montada "
+"(preferiblemente con permisos de escritura), pero se non a ten (ou non a "
+"quere empregar), Wine tamén pode funcionar totalmente libre de Microsoft. "
+"Escolla a configuración que lle sexa máis axeitada."
diff -Nur wine-0.9.25.old/debian/wine.templates wine-0.9.25/debian/wine.templates
--- wine-0.9.25.old/debian/wine.templates 2007-02-21 23:05:03.000000000 +0100
+++ wine-0.9.25/debian/wine.templates 2007-02-21 23:05:30.000000000 +0100
@@ -22,6 +22,8 @@
Wine ya no carga /etc/wine.conf por defecto. Por tanto, los usuarios que no tengan un fichero ~/.winerc (o ~/.wine/config) no podrán ejecutar Wine, a menos que configuren un fichero ~/.wine/config. Esto puede hacerse fácilmente con la herramienta winesetup, que se encuentra en el paquete winesetuptk, o bien cada usuario puede copiar el fichero /etc/wine.conf en ~/.winerc y dejar que wine lo convierta. Si borra el fichero /etc/wine.conf, winesetup se lanzará automáticamente para los usuarios que no tengan fichero de configuración, en vez de obligarle a hacer por su cuenta algo de lo anterior.
Description-fr.UTF-8: Un fichier wine.conf obsolète a été trouvé, souhaitez-vous l'effacer ?
Wine n'utilise plus /etc/wine.conf par défaut. Aussi, les utilisateurs qui n'ont pas créé de fichier ~/.winerc (ou ~/.wine/config) ne pourront pas démarrer Wine, tant qu'ils n'auront pas créé ce fichier. Cette création est simplifiée par l'outil winesetup qui se trouve dans le paquet winesetuptk. Les utilisateurs peuvent également copier le fichier /etc/wine.conf vers ~/.winerc et laisser Wine effectuer la conversion. Si vous supprimez /etc/wine.conf, winesetup démarrera automatiquement pour les utilisateurs qui n'ont pas de fichier de configuration, ce qui leur évitera d'avoir à faire eux-mêmes les opérations décrites ci-dessus.
+Description-gl.UTF-8: Detectouse un ficheiro wine.conf antigo, ¿eliminalo?
+ Wine xa non tenta cargar /etc/wine.conf por defecto. Polo tanto, os usuarios que non teñan un ficheiro ~/.winerc (ou ~/.wine/config) non han poder executar Wine, a menos que configuren un ficheiro ~/.wine/config eles mesmos. Isto faise de xeito doado coa ferramenta winesetup, que está no paquete winesetuptk (ou cada usuario pode copiar o antigo ficheiro /etc/wine.conf a ~/.winerc e deixar que wine o convirta). Se elimina o ficheiro /etc/wine.conf, winesetup hase lanzar automaticamente para os usuarios que non teñan un ficheiro de configuración, no canto de obrigalos a facer eles o de enriba.
Description-it.UTF-8: Individuato un vecchio wine.conf, rimuoverlo?
Wine non prova più a caricare /etc/wine.conf di default. Quindi, gli utenti che non hannno un file ~/.winerc (o ~/.wine/config) non saranno in grado di eseguire Wine, a meno che non creino un file ~/.wine/conf da soli. Si può farlo facilmente usando il tool winesetup, che si trova nel pacchetto winesetuptk; in alternativa ogni utente può copiare il vecchio /etc/wine.conf in ~/.winerc e lasciare che Wine lo converta. Se rimuovi il file /etc/wine.conf, winesetup verrà lanciato in automatico per gli utenti che non hanno un file di configurazione, senza che l'utente debba fare nessuna delle operazioni citate sopra.
Description-ja.UTF-8: 古い wine.conf が検出されました。削除しますか?
@@ -49,6 +51,7 @@
Choices-de.UTF-8: Automatische Erkennung, Vorhandenes Windows, Kein Windows, Abbrechen
Choices-es.UTF-8: Autodectar, Con Windows, Sin Windows, Saltar
Choices-fr.UTF-8: Auto-détection, Windows existant, Pas de Windows, Passer
+Choices-gl.UTF-8: Autodetectar, Windows-existente, Sen-windows, Omitir
Choices-it.UTF-8: Rilevamento automatico, Installazione di Windows esistente, Nessuna installazione di Windows, Salta
Choices-ja.UTF-8: 自動検出, 既存のWindows, Windowsなし, スキップ
Choices-nl.UTF-8: Automatisch detecteren, Bestaande Windows, Geen Windows, Overslaan
@@ -76,6 +79,8 @@
Wine ofrece la posibilidad de usar una instalación existente de Windows (preferiblemente con permiso de escritura), pero si no tiene una o no quiere usarla, Wine puede ejecutarse perfectamente sin ella. Escoja la opción que considere más apropiada.
Description-fr.UTF-8: Quel type de configuration voulez-vous pour Wine ?
Wine peut utiliser une installation Windows existante, si elle est accessible (de préférence avec les droits d'écriture). Mais si vous n'en avez pas (ou ne souhaitez pas l'utiliser), Wine peut aussi fonctionner sans le moindre logiciel Microsoft. Veuillez choisir la configuration que vous souhaitez.
+Description-gl.UTF-8: ¿Que tipo de configuración de Wine quere?
+ Wine pode empregar unha instalación existente de Windows se ten unha montada (preferiblemente con permisos de escritura), pero se non a ten (ou non a quere empregar), Wine tamén pode funcionar totalmente libre de Microsoft. Escolla a configuración que lle sexa máis axeitada.
Description-it.UTF-8: Che tipo di configurazione vuoi per Wine?
Wine può usare un'installazione esistente di Windows se ne hai una montata (preferibilmente con permessi in scrittura), ma se non ne hai una, o non vuoi usarla, Wine può funzionare anche in maniera totalmente Microsoft-free. Scegli la configurazione più adatta a te.
Description-ja.UTF-8: 行いたい Wine 設定はどの種類ですか?
* Removed wineinstall and any /usr/share/wine/skel stuff
from the package, it's not used anymore anyway.
Rewrote parts of README.Debian to say how it works now.
* Removed mention of winesetuptk from README.Debian.
* Documented some reasons for Debian packaging decisions,
such as package split, in README.Debian. Closes: #407052.
diff -Nur wine-0.9.25.old/debian/README.Debian wine-0.9.25/debian/README.Debian
--- wine-0.9.25.old/debian/README.Debian 2007-02-21 23:05:03.000000000 +0100
+++ wine-0.9.25/debian/README.Debian 2007-02-21 23:05:30.000000000 +0100
@@ -20,7 +20,30 @@
libwine-dev (Winelib development headers and tools)
wine-utils (extra binaries)
wine-doc (documentation in HTML and DocBook format)
-winesetuptk (CodeWeavers' winesetup tool)
+
+The reason for this split is that Wine has a lot of dependencies
+and functionality that not all users need and want to spend disk
+space on; thus, it is a general theme in Debian to split up big
+packages like this. Make sure you install the ones you need.
+
+Also note that Wine for Debian is set up to use the winelauncher
+wrapper by default. This is both for convenience (it asks you to
+run winecfg), and because I've installed some Wine components
+that users aren't supposed to run directly into /usr/lib/wine
+instead of /usr/bin, and the script is needed to tell Wine
+where to find them. Also, it warns you if Wine is invoked from
+your mail reader or web browser, to help you avoid trojans,
+viruses, and worms.
+
+The libwine-gl split was requested in Debian bug #304815.
+The libwine-print/libwine-sane split was requested in #148479.
+
+Newer developments in Wine, such as dynamic loading of CUPS,
+may make it possible to merge libwine-print back into libwine
+proper at some future date, though.
+
+Other resources
+===============
If (i.e. when) you have problems, the Wine Troubleshooting Guide
can be found at http://www.winehq.com/Trouble/
@@ -43,37 +66,37 @@
but are usually newer and more bleeding edge.
-Update for Wine 20010112
-========================
-wine.conf is no longer recognized as a config file! There's
-currently no global config file at all (though we hope to get
-one again soon). I've removed /etc/wine.conf from the package,
-and it should probably be deleted from your system. If you (or
-your users) still don't have a ~/.wine/config, you can either
-copy the old /etc/wine.conf to ~/.winerc to have Wine convert it
-for you, or you can just delete it and configure wine with the
-winesetup tool instead (in the winesetuptk package).
+Configuration
+=============
+The best way to configure Wine right now is to run winecfg;
+the winelauncher will ask you to do so the first time you
+start Wine.
-I've also enabled the winelauncher wrapper, so that when you type
-"wine", then you're actually starting the winelauncher. If a
-~/.wine/config doesn't exist (and you've deleted /etc/wine.conf),
-then it'll automatically try to start winesetup.
-
-Configuring Wine without Windows (without winesetup)
-====================================================
-Simply copy the tree at /usr/share/wine/skel into ~/.wine, i.e.
+If you need to configure Wine manually, without winecfg:
- mkdir ~/.wine
- cp -r /usr/share/wine/skel/* ~/.wine
+As of Wine release 20040408, the Wine authors introduced a
+"wineprefixcreate" script. It will create a basic ~/.wine
+directory in your home directory. You can then add drive
+or device mappings by adding symlinks, and you can edit
+the settings in the registry to suit you. Refer to any
+available documentation about these settings.
-I may get winelauncher to do this automatically someday.
+winebrowser
+===========
+To make winebrowser launch the web browser of your choice when an
+application wants to show you a web page, and it doesn't already,
+you must edit ~/.wine/system.reg and find the [Software\\Wine\\WineBrowser]
+key, where the "Browser" option resides. I've now patched winebrowser
+to set this to Debian's "sensible-browser" if it doesn't exist already,
+but if you have an existing Wine installation where it already does exist
+with an inappropriate setting, this is how to fix it.
Updating the registry
=====================
The way to install an updated default registry was changed as of
Wine release 20040309. You should now do something like:
- wine /usr/lib/wine/rundll32.exe.so setupapi.dll,InstallHinfSection \
+ wine rundll32.exe setupapi.dll,InstallHinfSection \
DefaultInstall 128 /usr/share/wine/wine.inf
(which must probably be done per-user for now.)
@@ -82,27 +105,18 @@
and load it from there, as there are sometimes bugs with using full
Unix paths in Winelib apps (but which should get fixed eventually).
-The wineinstall script
-======================
-You can also try using the customized wineinstall script in
-/usr/share/wine/wineinstall to configure Wine or update the registry,
-but I do not guarantee that this works properly. Feel free to submit
-bug reports, though.
-
-The wineprefixcreate script
-===========================
-As of Wine release 20040408, the Wine authors introduced a
-"wineprefixcreate" script. It looks like this is intended to eventually
-supersede the wineinstall script, and become the official way to set up
-a default Wine configuration (but must still be done per-user). It's
-still experimental, I think, but should work.
+Update for Wine 20010112
+========================
+wine.conf is no longer recognized as a config file! There's
+currently no global config file at all (though we hope to get
+one again soon). I've removed /etc/wine.conf from the package,
+and it should probably be deleted from your system. If you (or
+your users) still don't have a ~/.wine/config, you can either
+copy the old /etc/wine.conf to ~/.winerc to have Wine convert it
+for you, or you can just delete it and configure wine with the
+winecfg tool instead.
-winebrowser
-===========
-To make winebrowser launch the web browser of your choice when an
-application wants to show you a web page, and it doesn't already,
-you must edit ~/.wine/system.reg and find the [Software\\Wine\\WineBrowser]
-key, where the "Browser" option resides. I've now patched winebrowser
-to set this to Debian's "sensible-browser" if it doesn't exist already,
-but if you have an existing Wine installation where it already does exist
-with an inappropriate setting, this is how to fix it.
+I've also enabled the winelauncher wrapper, so that when you type
+"wine", then you're actually starting the winelauncher. If a
+~/.wine/config doesn't exist (and you've deleted /etc/wine.conf),
+then it'll automatically try to start winesetup.
* Moved explorer and winecfg from wine-utils to wine.
diff -ur wine-0.9.25.old/debian/control wine-0.9.25/debian/control
--- wine-0.9.25.old/debian/control 2007-02-21 23:30:59.000000000 +0100
+++ wine-0.9.25/debian/control 2007-02-21 23:37:22.000000000 +0100
@@ -29,7 +29,7 @@
Recommends: wine-utils, msttcorefonts
Suggests: wine-doc, binfmt-support
Conflicts: binfmt-support (<< 1.1.2)
-Replaces: libwine (<< 0.0.20010216), wine-utils (<< 0.0.20050419)
+Replaces: libwine (<< 0.0.20010216), wine-utils (<< 0.9.25-3)
Description: Windows API Implementation (Binary Loader)
This is a BETA release of Wine, the free MS-Windows API implementation.
This is still a work in progress and many applications may still not work.
diff -ur wine-0.9.25.old/debian/wine.files wine-0.9.25/debian/wine.files
--- wine-0.9.25.old/debian/wine.files 2007-02-21 23:30:59.000000000 +0100
+++ wine-0.9.25/debian/wine.files 2007-02-21 23:35:21.000000000 +0100
@@ -4,21 +4,24 @@
usr/bin/wineprefixcreate
usr/bin/wineshelllink
usr/bin/wineconsole
+usr/bin/msiexec
usr/bin/regedit
usr/bin/regsvr32
-usr/bin/msiexec
+usr/bin/winecfg
usr/lib/wine/wineboot.exe.so
usr/lib/wine/winebrowser.exe.so
usr/lib/wine/wineconsole.exe.so
usr/lib/wine/eject.exe.so
usr/lib/wine/winevdm.exe.so
usr/lib/wine/expand.exe.so
+usr/lib/wine/explorer.exe.so
usr/lib/wine/msiexec.exe.so
usr/lib/wine/regedit.exe.so
usr/lib/wine/regsvr32.exe.so
usr/lib/wine/rpcss.exe.so
usr/lib/wine/rundll32.exe.so
usr/lib/wine/start.exe.so
+usr/lib/wine/winecfg.exe.so
usr/lib/wine/winemenubuilder.exe.so
usr/share/man/man1/wine.1
usr/share/man/man1/wineprefixcreate.1
diff -ur wine-0.9.25.old/debian/wine-utils.files wine-0.9.25/debian/wine-utils.files
--- wine-0.9.25.old/debian/wine-utils.files 2007-02-21 23:30:59.000000000 +0100
+++ wine-0.9.25/debian/wine-utils.files 2007-02-21 23:35:21.000000000 +0100
@@ -1,7 +1,6 @@
usr/bin/notepad
usr/bin/progman
usr/bin/uninstaller
-usr/bin/winecfg
usr/bin/winedbg
usr/bin/winedump
usr/bin/winefile
@@ -11,14 +10,12 @@
usr/bin/winhelp
usr/lib/wine/cmd.exe.so
usr/lib/wine/control.exe.so
-usr/lib/wine/explorer.exe.so
usr/lib/wine/iexplore.exe.so
usr/lib/wine/notepad.exe.so
usr/lib/wine/oleview.exe.so
usr/lib/wine/progman.exe.so
usr/lib/wine/taskmgr.exe.so
usr/lib/wine/uninstaller.exe.so
-usr/lib/wine/winecfg.exe.so
usr/lib/wine/winedbg.exe.so
usr/lib/wine/winefile.exe.so
usr/lib/wine/winemine.exe.so
* Removed wineinstall and any /usr/share/wine/skel stuff
from the package, it's not used anymore anyway.
diff -ur wine-0.9.25.old/debian/rules wine-0.9.25/debian/rules
--- wine-0.9.25.old/debian/rules 2007-02-21 23:30:59.000000000 +0100
+++ wine-0.9.25/debian/rules 2007-02-21 23:33:18.000000000 +0100
@@ -190,41 +190,6 @@
mv debian/libwine/usr/lib/wine/winenas* debian/libwine-nas/usr/lib/wine
mv debian/libwine/usr/lib/wine/wineps* debian/libwine-print/usr/lib/wine
- # create a default wine configuration in /usr/share/wine/skel
- # create directories that dh_installdirs didn't create
- mkdir -p "debian/wine/usr/share/wine/skel/c/windows/Profiles/Administrator"
- mkdir -p "debian/wine/usr/share/wine/skel/c/windows/Start Menu/Programs/Startup"
- mkdir -p "debian/wine/usr/share/wine/skel/c/Program Files/Common Files"
- # install default registry
- ln -s ../c debian/wine/usr/share/wine/skel/dosdevices/c:
- ln -s ../../../../../../.. debian/wine/usr/share/wine/skel/dosdevices/d:
- ln -s /tmp debian/wine/usr/share/wine/skel/dosdevices/e:
- (WINEPREFIX=`pwd`/debian/wine/usr/share/wine/skel \
- programs/rundll32/rundll32 setupapi.dll,InstallHinfSection \
- DefaultInstall 128 tools/wine.inf >/dev/null) \
- || true
- rm -f debian/wine/usr/share/wine/skel/cachedmetrics.*
- rm -rf debian/wine/usr/share/wine/skel/wineserver-*
- rm -f debian/wine/usr/share/wine/skel/*.ini
- rm -f debian/wine/usr/share/wine/skel/dosdevices/*
- rm -rf debian/wine/usr/share/wine/skel/c/windows/Profiles/root
- # install default drive mappings
- ln -s /floppy debian/wine/usr/share/wine/skel/dosdevices/a:
- ln -s ../c debian/wine/usr/share/wine/skel/dosdevices/c:
- ln -s /cdrom debian/wine/usr/share/wine/skel/dosdevices/d:
- ln -s /tmp debian/wine/usr/share/wine/skel/dosdevices/e:
- ln -s ../.. debian/wine/usr/share/wine/skel/dosdevices/f:
- ln -s / debian/wine/usr/share/wine/skel/dosdevices/z:
- # install default devices
- ln -s /dev/ttyS0 debian/wine/usr/share/wine/skel/dosdevices/com1
- ln -s /dev/ttyS1 debian/wine/usr/share/wine/skel/dosdevices/com2
- ln -s /dev/ttyS2 debian/wine/usr/share/wine/skel/dosdevices/com3
- ln -s /dev/modem debian/wine/usr/share/wine/skel/dosdevices/com4
- ln -s /dev/lp0 debian/wine/usr/share/wine/skel/dosdevices/lpt1
-
- # install wineinstall tool
- install tools/wineinstall debian/wine/usr/share/wine
-
ifeq ($(PO2DEBCONF),yes)
po2debconf -e utf8 debian/wine.templates.master > debian/wine.templates
po2debconf -e utf8 debian/libwine.templates.master > debian/libwine.templates
diff -ur wine-0.9.25.old/debian/wine.dirs wine-0.9.25/debian/wine.dirs
--- wine-0.9.25.old/debian/wine.dirs 2007-02-21 23:30:59.000000000 +0100
+++ wine-0.9.25/debian/wine.dirs 2007-02-21 23:32:38.000000000 +0100
@@ -11,12 +11,3 @@
usr/share/binfmts
usr/share/pixmaps
usr/share/wine
-usr/share/wine/skel
-usr/share/wine/skel/c
-usr/share/wine/skel/c/windows
-usr/share/wine/skel/c/windows/system
-usr/share/wine/skel/c/windows/system32
-usr/share/wine/skel/c/windows/command
-usr/share/wine/skel/c/windows/Fonts
-usr/share/wine/skel/c/windows/Profiles
-usr/share/wine/skel/dosdevices
Reply to: