please unblock wine_0.9.25-2.1
Hi,
Would you please unblock wine_0.9.25-2.1 (from t-p-u) ? Most of the changes
in it have already been approved before upload, see:
http://lists.debian.org/debian-release/2007/02/msg01008.html
In addition, I backported other changes that are similar in nature to those
you approved before. None of them changes any code:
[ documentation ]
* Updated README.Debian to explain how winelauncher is set up,
in case anyone actually needs to know (they shouldn't, but
someone misinterpreted my note that says that the package is
using winelauncher as some kind of instruction for the *user*
to use it, so maybe this helps). Closes: #409556.
.
[ l10n ]
* Catalan debconf translation update. Closes: #412306.
.
[ other ]
* The wine package now suggests antivirus packages. Closes: #411761.
* Added uninstaller.desktop to wine-utils. Closes: #412315.
A complete (well, except I editted 'configure' out for readability purposes)
debdiff is attached. You can find the granular set of patches in the thread
referenced above.
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.
diff -u wine-0.9.25/configure.ac wine-0.9.25/configure.ac
--- wine-0.9.25/configure.ac
+++ wine-0.9.25/configure.ac
@@ -941,6 +941,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 -u wine-0.9.25/debian/changelog wine-0.9.25/debian/changelog
--- wine-0.9.25/debian/changelog
+++ wine-0.9.25/debian/changelog
@@ -1,3 +1,31 @@
+wine (0.9.25-2.1) testing-proposed-updates; urgency=low
+
+ * NMU with maintainer's permission.
+ * Backport some fixes/improvements from sid. Closes: #414254
+
+ [ documentation ]
+ * Removed mention of winesetuptk from README.Debian.
+ * Documented some reasons for Debian packaging decisions,
+ such as package split, in README.Debian. Closes: #407052.
+ * Updated README.Debian to explain how winelauncher is set up,
+ in case anyone actually needs to know (they shouldn't, but
+ someone misinterpreted my note that says that the package is
+ using winelauncher as some kind of instruction for the *user*
+ to use it, so maybe this helps). Closes: #409556.
+
+ [ l10n ]
+ * Added Galician debconf translation. Closes: #407269.
+ * Catalan debconf translation update. Closes: #412306.
+
+ [ other ]
+ * Added winecfg.desktop from Robert Millan. Closes: #404227.
+ * Applied patch to mark stack executable. Closes: #401562.
+ * Moved explorer and winecfg from wine-utils to wine.
+ * The wine package now suggests antivirus packages. Closes: #411761.
+ * Added uninstaller.desktop to wine-utils. Closes: #412315.
+
+ -- Robert Millan <rmh@aybabtu.com> Tue, 20 Mar 2007 23:16:22 +0100
+
wine (0.9.25-1) unstable; urgency=low
* New upstream release 0.9.25.
diff -u wine-0.9.25/debian/wine-utils.files wine-0.9.25/debian/wine-utils.files
--- wine-0.9.25/debian/wine-utils.files
+++ wine-0.9.25/debian/wine-utils.files
@@ -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
diff -u wine-0.9.25/debian/README.Debian wine-0.9.25/debian/README.Debian
--- wine-0.9.25/debian/README.Debian
+++ wine-0.9.25/debian/README.Debian
@@ -20,7 +20,31 @@
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 (/usr/bin/wine is a shell script that starts
+the real Wine binary, which is in /usr/lib/wine). 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 +67,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.)
@@ -85,24 +109,15 @@
-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.
diff -u wine-0.9.25/debian/control wine-0.9.25/debian/control
--- wine-0.9.25/debian/control
+++ wine-0.9.25/debian/control
@@ -27,9 +27,9 @@
Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
Depends: ${debconf-depends}, libwine (= ${Source-Version}), xbase-clients (>= 4.0) | xcontrib
Recommends: wine-utils, msttcorefonts
-Suggests: wine-doc, binfmt-support
+Suggests: wine-doc, binfmt-support, avscan | klamav | clamav
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 -u wine-0.9.25/debian/rules wine-0.9.25/debian/rules
--- wine-0.9.25/debian/rules
+++ wine-0.9.25/debian/rules
@@ -169,6 +169,8 @@
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/uninstaller.desktop debian/wine-utils/usr/share/applications/uninstaller.desktop
+ cp debian/winecfg.desktop debian/wine-utils/usr/share/applications/winecfg.desktop
# split up libwine
ifeq ($(DEB_HOST_GNU_SYSTEM), linux-gnu)
diff -u wine-0.9.25/debian/wine.files wine-0.9.25/debian/wine.files
--- wine-0.9.25/debian/wine.files
+++ wine-0.9.25/debian/wine.files
@@ -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 -u wine-0.9.25/debian/wine-utils.dirs wine-0.9.25/debian/wine-utils.dirs
--- wine-0.9.25/debian/wine-utils.dirs
+++ wine-0.9.25/debian/wine-utils.dirs
@@ -3,0 +4 @@
+usr/share/applications
diff -u wine-0.9.25/debian/wine.templates wine-0.9.25/debian/wine.templates
--- wine-0.9.25/debian/wine.templates
+++ wine-0.9.25/debian/wine.templates
@@ -10,8 +10,8 @@
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.
-Description-ca.UTF-8: S'ha detectat un /etc/wine.conf antic. L'esborro?
- Wine ja no carrega el /etc/wine.conf per defecte. De manera els usuaris que no tinguin un fitxer ~/.winerc (o un ~/.wine/config) no podran executar el Wine a menys de que configurin un fitxer ~/.wine/config. Això pot fer-se fàcilment amb la utilitat winesetup, que es troba en el paquet winesetuptk (o també, cada usuari pot copiar l'antic /etc/wine.conf en ~/.winerc i deixar que el wine el converteixi). Si esborreu el fitxer /etc/wine.conf, el winesetup s'executarà automàticament per als usuaris que no tinguin un fitxer de configuració, en comptes de requerir als usuaris que facin res del descrit anteriorment.
+Description-ca.UTF-8: S'ha detectat un /etc/wine.conf antic. Voleu esborrar-lo?
+ Wine ja no carrega el /etc/wine.conf per defecte. Els usuaris que no tinguin un fitxer ~/.winerc (o un ~/.wine/config) no podran executar el Wine a menys que configurin un fitxer ~/.wine/config. Això pot fer-se fàcilment amb la utilitat winesetup, que es troba al paquet winesetuptk (o altrament, cada usuari pot copiar l'antic /etc/wine.conf a ~/.winerc i deixar que el wine el converteixi). Si esborreu el fitxer /etc/wine.conf, winesetup s'executarà automàticament per als usuaris que no tinguin un fitxer de configuració, en comptes de requerir als usuaris que facin res del descrit anteriorment.
Description-cs.UTF-8: Nalezen starý wine.conf. Odstranit?
Wine se již implicitně nesnaží načít /etc/wine.conf. To znamená, že uživatelé, kteří nemají soubor ~/.winerc (nebo ~/.wine/config), nebudou moci wine spustit, dokud soubor nevytvoří. Toho mohou dosáhnout tak, že si spustí nástroj winesetup z balíčku winesetuptk, nebo že si zkopírují starý /etc/wine.conf do ~/.winerc a nechají wine, aby jej převedl do nového formátu. Pokud soubor /etc/wine.conf odstraníte, tak se winesetup spustí automaticky každému uživateli, který ještě nemá konfigurační soubor (a tím uživatele zbavíte starostí popsaných na předchozích řádcích).
Description-da.UTF-8: Fandt gammel wine.conf. Skal den fjernes?
@@ -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 が検出されました。削除しますか?
@@ -44,11 +46,13 @@
Template: wine/install_type
Type: select
Choices: Autodetect, Existing-Windows, No-Windows, Skip
+Choices-ca.UTF-8: Detecció automàtica, Windows ja existent, Sense Windows, Ometre
Choices-cs.UTF-8: Rozpoznat, Stávající-Windows, Bez-Windows, Přeskočit
Choices-da.UTF-8: Automatisk søgning, Eksisterende windows, Ikke windows, Spring over
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
@@ -65,7 +69,7 @@
don't want to use it), Wine can also run completely Microsoft-free. Choose
the setup most appropriate for you.
Description-ca.UTF-8: Quin tipus de configuració del Wine desitgeu?
- Wine pot usar una instal·lació ja existent del Windows, si aquesta és accessible (preferiblement amb permisos d'escriptura), però si no fos així (o no desitgeu usar-la), el Wine també pot executar-se perfectament lliure de Microsoft. Escolliu la configuració que us sigui més apropiada.
+ Wine pot utilitzar una instal·lació ja existent del Windows, si aquesta és accessible (preferiblement amb permisos d'escriptura), però si no fos així (o no desitgeu utilitzar-la), Wine també pot executar-se perfectament lliure de Microsoft. Escolliu la configuració que us sigui més apropiada.
Description-cs.UTF-8: Jakým způsobem chcete Wine používat?
Wine umí využít stávající instalaci Windows (nejlépe připojenou v režimu i pro zápis), ale pokud žádnou nemáte, nebo ji nechcete použít, umí Wine běžet úplně samostatně. Zvolte si pro vás nejvhodnější nastavení.
Description-da.UTF-8: Hvilken slags Wine-opsætning ønsker du?
@@ -76,6 +80,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 設定はどの種類ですか?
diff -u wine-0.9.25/debian/wine.desktop wine-0.9.25/debian/wine.desktop
--- wine-0.9.25/debian/wine.desktop
+++ wine-0.9.25/debian/wine.desktop
@@ -4,12 +4,12 @@
Name=WINE
-GenericName=Win32 API Emulator
+GenericName=Wine Win32 API Emulator
GenericName[ru]=Эмулятор Win32 API
-Comment=Launch your windows programs
+Comment=Launch your Windows programs
Comment[ru]=Программа для запуска приложений для ОС Windows
NoDisplay=true
TryExec=wine
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 -u wine-0.9.25/debian/libwine.templates wine-0.9.25/debian/libwine.templates
--- wine-0.9.25/debian/libwine.templates
+++ wine-0.9.25/debian/libwine.templates
@@ -6,8 +6,8 @@
/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.
-Description-ca.UTF-8: Mouré /usr/share/wine/drivec a /var/lib/wine/drivec
- L'anterior localització per defecte de Drive C en /usr/share/wine viola la Jerarquia estàndard del sistema de fitxers (FHS) i serà mogut a /var/lib/wine. El vostre /etc/wine.conf serà actualitzat automàticament, però si teniu un .winerc o heu escrit scripts que depenguin de l'antiga localització, els haureu de posar al dia vosaltres mateixos.
+Description-ca.UTF-8: S'està movent /usr/share/wine/drivec a /var/lib/wine/drivec
+ L'anterior ubicació predeterminada de la unitat «C» a /usr/share/wine viola la Jerarquia estàndard del sistema de fitxers (FHS), i és per això que es mourà a /var/lib/wine. El vostre /etc/wine.conf s'actualitzarà automàticament, però si teniu un .winerc o heu escrit scripts que depenguin de l'antiga ubicació, els haureu de posar al dia vosaltres mateixos.
Description-cs.UTF-8: Přesunuji /usr/share/wine/drivec do /var/lib/wine/drivec
Předchozí implicitní umístění disku C v /usr/share/wine porušuje Filesystem Hierarchy Standard a je tedy přesunuto do /var/lib/wine. Váš /etc/wine.conf se aktualizuje automaticky, ale pokud máte vlastní .winerc nebo pokud jste si napsali skripty, které závisí na staré cestě, budete je muset upravit sami.
Description-da.UTF-8: Flytter /usr/share/wine/drivec til /var/lib/wine/drivec
@@ -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-gl.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 -u wine-0.9.25/debian/po/ca.po wine-0.9.25/debian/po/ca.po
--- wine-0.9.25/debian/po/ca.po
+++ wine-0.9.25/debian/po/ca.po
@@ -1,38 +1,32 @@
#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
+# Catalan translation for wine package.
+# Copyright (C) 2007 Ove Kaaven.
+# This file is distributed under the same license as the wine package.
#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# Antoni Bella Perez <bella5@teleline.es>, 2002.
+# Jordà Polo <jorda@ettin.org>, 2007.
#
-# Developers do not need to manually edit POT or PO files.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-11-15 23:40+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Project-Id-Version: 0.9.30-1\n"
+"Report-Msgid-Bugs-To: ovek@arcticnet.no\n"
+"POT-Creation-Date: 2007-02-08 04:33+0100\n"
+"PO-Revision-Date: 2007-02-21 23:02+0100\n"
+"Last-Translator: Jordà Polo <jorda@ettin.org>\n"
+"Language-Team: Català <debian-l10n-catalan@lists.debian.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. Type: note
#. Description
-#: ../libwine.templates.master:3
+#: ../libwine.templates.master:1001
msgid "Moving /usr/share/wine/drivec to /var/lib/wine/drivec"
-msgstr "Mour�usr/share/wine/drivec a /var/lib/wine/drivec"
+msgstr "S'està movent /usr/share/wine/drivec a /var/lib/wine/drivec"
#. Type: note
#. Description
-#: ../libwine.templates.master:3
+#: ../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. "
@@ -40,21 +34,21 @@
"winerc or have written scripts that depend on the old location, you must "
"update these yourself."
msgstr ""
-"L'anterior localitzaci�r defecte de Drive C en /usr/share/wine viola la "
-"Jerarquia est�ard del sistema de fitxers (FHS) i ser�ogut a /var/lib/"
-"wine. El vostre /etc/wine.conf ser�ctualitzat autom�cament, per� "
-"teniu un .winerc o heu escrit scripts que depenguin de l'antiga "
-"localitzaci�ls haureu de posar al dia vosaltres mateixos."
+"L'anterior ubicació predeterminada de la unitat «C» a /usr/share/wine viola "
+"la Jerarquia estàndard del sistema de fitxers (FHS), i és per això que es "
+"mourà a /var/lib/wine. El vostre /etc/wine.conf s'actualitzarà "
+"automàticament, però si teniu un .winerc o heu escrit scripts que depenguin "
+"de l'antiga ubicació, els haureu de posar al dia vosaltres mateixos."
#. Type: boolean
#. Description
-#: ../wine.templates.master:4
+#: ../wine.templates.master:1001
msgid "Old wine.conf detected, remove it?"
-msgstr "S'ha detectat un /etc/wine.conf antic. L'esborro?"
+msgstr "S'ha detectat un /etc/wine.conf antic. Voleu esborrar-lo?"
#. Type: boolean
#. Description
-#: ../wine.templates.master:4
+#: ../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 "
@@ -68,35 +62,34 @@
-"Wine ja no carrega el /etc/wine.conf per defecte. De manera els usuaris que "
-"no tinguin un fitxer ~/.winerc (o un ~/.wine/config) no podran executar el "
-"Wine a menys de que configurin un fitxer ~/.wine/config. Aix�t fer-se "
-"f�lment amb la utilitat winesetup, que es troba en el paquet winesetuptk "
-"(o tamb�cada usuari pot copiar l'antic /etc/wine.conf en ~/.winerc i "
-"deixar que el wine el converteixi). Si esborreu el fitxer /etc/wine.conf, el "
-"winesetup s'executar�utom�cament per als usuaris que no tinguin un "
-"fitxer de configuraci�n comptes de requerir als usuaris que facin res del "
-"descrit anteriorment."
+"Wine ja no carrega el /etc/wine.conf per defecte. Els usuaris que no tinguin "
+"un fitxer ~/.winerc (o un ~/.wine/config) no podran executar el Wine a menys "
+"que configurin un fitxer ~/.wine/config. Això pot fer-se fàcilment amb la "
+"utilitat winesetup, que es troba al paquet winesetuptk (o altrament, cada "
+"usuari pot copiar l'antic /etc/wine.conf a ~/.winerc i deixar que el wine el "
+"converteixi). Si esborreu el fitxer /etc/wine.conf, winesetup s'executarà "
+"automàticament per als usuaris que no tinguin un fitxer de configuració, en "
+"comptes de requerir als usuaris que facin res del descrit anteriorment."
#. Type: select
#. Choices
-#: ../wine.templates.master:16
+#: ../wine.templates.master:2001
msgid "Autodetect, Existing-Windows, No-Windows, Skip"
-msgstr ""
+msgstr "Detecció automàtica, Windows ja existent, Sense Windows, Ometre"
#. Type: select
#. Description
-#: ../wine.templates.master:18
+#: ../wine.templates.master:2002
msgid "What kind of Wine configuration do you want?"
-msgstr "Quin tipus de configuraci�l Wine desitgeu?"
+msgstr "Quin tipus de configuració del Wine desitgeu?"
#. Type: select
#. Description
-#: ../wine.templates.master:18
+#: ../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 pot usar una instal�laci� existent del Windows, si aquesta �"
-"accessible (preferiblement amb permisos d'escriptura), per� no fos aix�
-"(o no desitgeu usar-la), el Wine tamb�ot executar-se perfectament lliure "
-"de Microsoft. Escolliu la configuraci�e us sigui m�apropiada."
+"Wine pot utilitzar una instal·lació ja existent del Windows, si aquesta és "
+"accessible (preferiblement amb permisos d'escriptura), però si no fos així "
+"(o no desitgeu utilitzar-la), Wine també pot executar-se perfectament lliure "
+"de Microsoft. Escolliu la configuració que us sigui més apropiada."
only in patch2:
unchanged:
--- wine-0.9.25.orig/debian/winecfg.desktop
+++ wine-0.9.25/debian/winecfg.desktop
@@ -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;
only in patch2:
unchanged:
--- wine-0.9.25.orig/debian/uninstaller.desktop
+++ wine-0.9.25/debian/uninstaller.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=Wine Uninstaller
+Comment=Uninstall Windows programs
+Comment[ca]=Desinstaŀla programes de Windows
+Exec=uninstaller
+Icon=/usr/share/pixmaps/wine.xpm
+Terminal=false
+Categories=Application;System;
only in patch2:
unchanged:
--- wine-0.9.25.orig/debian/po/gl.po
+++ wine-0.9.25/debian/po/gl.po
@@ -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."
only in patch2:
unchanged:
--- wine-0.9.25.orig/loader/Makefile.in
+++ wine-0.9.25/loader/Makefile.in
@@ -28,18 +28,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)
Reply to: