--- Begin Message ---
- To: submit@bugs.debian.org
- Subject: Updates to wine-1.4.1-2 -- acceptable for wheezy?
- From: Hilko Bengen <bengen@debian.org>
- Date: Wed, 12 Sep 2012 09:32:40 +0200
- Message-id: <878vcf7l2f.fsf@msgid.hilluzination.de>
Subject: Updates to wine-1.4.1-2 -- acceptable for wheezy?
Package: release.debian.org
Severity: normal
After wine_1.4.1-2 has now migrated, there are still a few non-RC but
quite annoying and user-visible bugs left that we would like to fix for
the wheezy release.
Since some of these fixes are not exactly one-line patches, I'd like to
know whether the following attached patches would be acceptable from the
release team's point of view before we push them along with a fix for
#687062 (RC: missing copyright file).
- #474289: The libnss-mdns bug can no longer be reproduced on amd64
systems, so the warning that is displayed on every invokation of
wine should be considered useless, annoying, and misleading. It
should just go away (warning.patch)
- #681595, #685196: Some programs developed display problems after
*.fon files had removed from the package because the fnt2fon
program that is used to create them did not work properly on
big-endian architectures and so architecture-dependent files had
ended up in libwine (#676443).
Upstream has already accepted a patch by me that fixes the
endianess issue in fnt2fon. Adding this patch and re-including the
*.fon files is what I consider the proper solution (font-1.patch,
font-2.patch).
- wine64-bin: It has been pointed out in some bug reports (for example
#678001) that printing the multiarch instructions to STDOUT is not
enough. wine64.patch contains a change that uses xmessage.
- #677538, #679572: Add an SVG icon so desktop environments have
something to display with the .desktop files. (icon.patch)
Cheers,
-Hilko
>From 015c816a3f24591affa20287a51726b6bc08e266 Mon Sep 17 00:00:00 2001
From: Hilko Bengen <bengen@debian.org>
Date: Sat, 7 Jul 2012 16:07:08 +0200
Subject: [PATCH] Remove libnss-mdns warning as the issue seems to have been
fixed (closes: #474289)
---
debian/winelauncher | 28 ----------------------------
1 file changed, 28 deletions(-)
mode change 100644 => 100755 debian/winelauncher
diff --git a/debian/winelauncher b/debian/winelauncher
old mode 100644
new mode 100755
index f198cee..3f9c512
--- a/debian/winelauncher
+++ b/debian/winelauncher
@@ -31,34 +31,6 @@ if [ `basename $0` = "wine-safe" ]; then
fi
fi
-# Check for known problem with amd64
-if [ "$ARCH" = "amd64" ]; then
-
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=430845
-if grep -q "^hosts:.*mdns4_minimal \[NOTFOUND=return\]" /etc/nsswitch.conf && \
- [ ! -e /usr/lib32/libnss_mdns4.so.2 ]; then
- $XMESSAGE -center \
- -title "Wine Warning" \
- "
- It appears that libnss-mdns is installed on your system,
- but lib32nss-mdns is not. Please note that Wine will not be
- able to access the Internet unless you either install
- lib32nss-mdns (or ia32-libnss-mdns), or uninstall libnss-mdns.
- " 2>/dev/null
- notify=$?
- if [ $notify -eq 1 ] ; then
- # xmessage was unable to notify the user, try tty instead
- echo "It appears that libnss-mdns is installed on your system," >&2
- echo "but lib32nss-mdns is not. Please note that Wine will not be" >&2
- echo "able to access the Internet unless you either install" >&2
- echo "lib32nss-mdns (or ia32-libnss-mdns), or uninstall libnss-mdns." >&2
- echo -n "(okay) " >&2
- read confirm
- fi
-fi # nss_mdns4
-
-fi # amd64
-
# Launch Wine
export WINELOADER="/usr/lib/wine/wine.bin"
exec "$WINELOADER" "$@"
--
1.7.10.4
>From 2f62ca012c0154e58d432c7dc69ec6f98e113621 Mon Sep 17 00:00:00 2001
From: Hilko Bengen <bengen@debian.org>
Date: Tue, 3 Jul 2012 21:09:01 +0200
Subject: [PATCH 1/2] sfnt2fnt: Fix broken .fon files on big-endian
architectures
(cherry picked from upstream commit fb16ce1fe092438216e878a9d5fad63d06100caa)
---
tools/sfnt2fnt.c | 135 +++++++++++++++++++++++++++++++++++++++++-------------
1 file changed, 102 insertions(+), 33 deletions(-)
diff --git a/tools/sfnt2fnt.c b/tools/sfnt2fnt.c
index df43ec0..07c82b1 100644
--- a/tools/sfnt2fnt.c
+++ b/tools/sfnt2fnt.c
@@ -43,6 +43,7 @@
#include "wine/unicode.h"
#include "wingdi.h"
+#include "basetsd.h"
#include "pshpack1.h"
@@ -187,11 +188,30 @@ typedef struct
} FT_Version_t;
static FT_Version_t FT_Version;
+#include "poppack.h"
+
#define GET_BE_WORD(ptr) MAKEWORD( ((BYTE *)(ptr))[1], ((BYTE *)(ptr))[0] )
#define GET_BE_DWORD(ptr) ((DWORD)MAKELONG( GET_BE_WORD(&((WORD *)(ptr))[1]), \
GET_BE_WORD(&((WORD *)(ptr))[0]) ))
-
-#include "poppack.h"
+#ifdef WORDS_BIGENDIAN
+static WORD byteswap_word(WORD x)
+{
+ return ( ( (x & 0xff) << 8) |
+ ( (x & 0xff00) >> 8) );
+}
+static DWORD byteswap_dword(DWORD x)
+{
+ return ( ( (x & 0xff) << 24) |
+ ( (x & 0xff00) << 8) |
+ ( (x & 0xff0000) >> 8) |
+ ( (x & 0xff000000) >> 24) );
+}
+# define PUT_LE_WORD(x) byteswap_word(x)
+# define PUT_LE_DWORD(x) byteswap_dword(x)
+#else
+# define PUT_LE_WORD(x) (x)
+# define PUT_LE_DWORD(x) (x)
+#endif
struct fontinfo
{
@@ -378,7 +398,7 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc,
size_table = (bitmapSizeTable_t *)(eblc + 1);
for(i = 0; i < num_sizes; i++)
{
- if(size_table->hori.ascender - size_table->hori.descender == ppem)
+ if( (signed char)size_table->hori.ascender - (signed char)size_table->hori.descender == ppem)
{
ascent = size_table->hori.ascender;
break;
@@ -570,11 +590,50 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc,
return info;
}
+static void adjust_fontinfo( FONTINFO16 * fi )
+{
+ fi->dfType = PUT_LE_WORD(fi->dfType);
+ fi->dfPoints = PUT_LE_WORD(fi->dfPoints);
+ fi->dfVertRes = PUT_LE_WORD(fi->dfVertRes);
+ fi->dfHorizRes = PUT_LE_WORD(fi->dfHorizRes);
+ fi->dfAscent = PUT_LE_WORD(fi->dfAscent);
+ fi->dfInternalLeading = PUT_LE_WORD(fi->dfInternalLeading);
+ fi->dfExternalLeading = PUT_LE_WORD(fi->dfExternalLeading);
+ fi->dfWeight = PUT_LE_WORD(fi->dfWeight);
+ fi->dfPixWidth = PUT_LE_WORD(fi->dfPixWidth);
+ fi->dfPixHeight = PUT_LE_WORD(fi->dfPixHeight);
+ fi->dfAvgWidth = PUT_LE_WORD(fi->dfAvgWidth);
+ fi->dfMaxWidth = PUT_LE_WORD(fi->dfMaxWidth);
+ fi->dfWidthBytes = PUT_LE_WORD(fi->dfWidthBytes);
+ fi->dfAspace = PUT_LE_WORD(fi->dfAspace);
+ fi->dfBspace = PUT_LE_WORD(fi->dfBspace);
+ fi->dfCspace = PUT_LE_WORD(fi->dfCspace);
+ fi->dfDevice = PUT_LE_DWORD(fi->dfDevice);
+ fi->dfFace = PUT_LE_DWORD(fi->dfFace);
+ fi->dfBitsPointer = PUT_LE_DWORD(fi->dfBitsPointer);
+ fi->dfBitsOffset = PUT_LE_DWORD(fi->dfBitsOffset);
+ fi->dfFlags = PUT_LE_DWORD(fi->dfFlags);
+ fi->dfColorPointer = PUT_LE_DWORD(fi->dfColorPointer);
+}
+
static void write_fontinfo( const struct fontinfo *info, FILE *fp )
{
- fwrite( &info->hdr, sizeof(info->hdr), 1, fp );
- fwrite( info->dfCharTable + info->hdr.fi.dfFirstChar, sizeof(*info->dfCharTable),
- ((unsigned char)info->hdr.fi.dfLastChar - (unsigned char)info->hdr.fi.dfFirstChar) + 3, fp );
+ FNT_HEADER tmp_hdr;
+ int num_chars, i;
+ CHAR_TABLE_ENTRY tmp_chartable[258];
+ memcpy(&tmp_hdr, &info->hdr, sizeof(info->hdr));
+ tmp_hdr.dfVersion = PUT_LE_WORD(tmp_hdr.dfVersion);
+ tmp_hdr.dfSize = PUT_LE_DWORD(tmp_hdr.dfSize);
+ adjust_fontinfo(&(tmp_hdr.fi));
+ fwrite( &tmp_hdr, sizeof(info->hdr), 1, fp );
+ num_chars = ((unsigned char)info->hdr.fi.dfLastChar - (unsigned char)info->hdr.fi.dfFirstChar) + 3;
+
+ memcpy(&tmp_chartable, info->dfCharTable + info->hdr.fi.dfFirstChar, num_chars * sizeof(CHAR_TABLE_ENTRY));
+ for (i=0; i < num_chars; ++i) {
+ tmp_chartable[i].width = PUT_LE_WORD(tmp_chartable[i].width);
+ tmp_chartable[i].offset = PUT_LE_DWORD(tmp_chartable[i].offset);
+ }
+ fwrite( tmp_chartable, sizeof(CHAR_TABLE_ENTRY), num_chars, fp );
fwrite( info->data, info->hdr.dfSize - info->hdr.fi.dfBitsOffset, 1, fp );
}
@@ -630,6 +689,7 @@ int main(int argc, char **argv)
struct fontinfo **info;
char *input_file;
char **args;
+ short tmp16;
args = parse_options( argc, argv );
@@ -696,21 +756,21 @@ int main(int argc, char **argv)
non_resident_name_off = sizeof(MZ_hdr) + module_ref_off + sizeof(align);
memset(&NE_hdr, 0, sizeof(NE_hdr));
- NE_hdr.ne_magic = 0x454e;
+ NE_hdr.ne_magic = PUT_LE_WORD(0x454e);
NE_hdr.ne_ver = 5;
NE_hdr.ne_rev = 1;
- NE_hdr.ne_flags = NE_FFLAGS_LIBMODULE | NE_FFLAGS_GUI;
- NE_hdr.ne_cbnrestab = non_resident_name_len;
- NE_hdr.ne_segtab = sizeof(NE_hdr);
- NE_hdr.ne_rsrctab = sizeof(NE_hdr);
- NE_hdr.ne_restab = resident_name_off;
- NE_hdr.ne_modtab = module_ref_off;
- NE_hdr.ne_imptab = module_ref_off;
+ NE_hdr.ne_flags = PUT_LE_WORD(NE_FFLAGS_LIBMODULE | NE_FFLAGS_GUI);
+ NE_hdr.ne_cbnrestab = PUT_LE_WORD(non_resident_name_len);
+ NE_hdr.ne_segtab = PUT_LE_WORD(sizeof(NE_hdr));
+ NE_hdr.ne_rsrctab = PUT_LE_WORD(sizeof(NE_hdr));
+ NE_hdr.ne_restab = PUT_LE_WORD(resident_name_off);
+ NE_hdr.ne_modtab = PUT_LE_WORD(module_ref_off);
+ NE_hdr.ne_imptab = PUT_LE_WORD(module_ref_off);
NE_hdr.ne_enttab = NE_hdr.ne_modtab;
- NE_hdr.ne_nrestab = non_resident_name_off;
- NE_hdr.ne_align = 4;
+ NE_hdr.ne_nrestab = PUT_LE_DWORD(non_resident_name_off);
+ NE_hdr.ne_align = PUT_LE_WORD(4);
NE_hdr.ne_exetyp = NE_OSFLAGS_WINDOWS;
- NE_hdr.ne_expver = 0x400;
+ NE_hdr.ne_expver = PUT_LE_WORD(0x400);
fontdir_off = (non_resident_name_off + non_resident_name_len + 15) & ~0xf;
font_off = (fontdir_off + fontdir_len + 15) & ~0x0f;
@@ -749,34 +809,34 @@ int main(int argc, char **argv)
fwrite(MZ_hdr, sizeof(MZ_hdr), 1, ofp);
fwrite(&NE_hdr, sizeof(NE_hdr), 1, ofp);
- align = 4;
+ align = PUT_LE_WORD(4);
fwrite(&align, sizeof(align), 1, ofp);
- rc_type.type_id = NE_RSCTYPE_FONTDIR;
- rc_type.count = 1;
+ rc_type.type_id = PUT_LE_WORD(NE_RSCTYPE_FONTDIR);
+ rc_type.count = PUT_LE_WORD(1);
rc_type.resloader = 0;
fwrite(&rc_type, sizeof(rc_type), 1, ofp);
- rc_name.offset = fontdir_off >> 4;
- rc_name.length = (fontdir_len + 15) >> 4;
- rc_name.flags = NE_SEGFLAGS_MOVEABLE | NE_SEGFLAGS_PRELOAD;
- rc_name.id = resident_name_off - sizeof("FONTDIR") - NE_hdr.ne_rsrctab;
+ rc_name.offset = PUT_LE_WORD(fontdir_off >> 4);
+ rc_name.length = PUT_LE_WORD((fontdir_len + 15) >> 4);
+ rc_name.flags = PUT_LE_WORD(NE_SEGFLAGS_MOVEABLE | NE_SEGFLAGS_PRELOAD);
+ rc_name.id = PUT_LE_WORD(resident_name_off - sizeof("FONTDIR") - sizeof(NE_hdr));
rc_name.handle = 0;
rc_name.usage = 0;
fwrite(&rc_name, sizeof(rc_name), 1, ofp);
- rc_type.type_id = NE_RSCTYPE_FONT;
- rc_type.count = num_files;
+ rc_type.type_id = PUT_LE_WORD(NE_RSCTYPE_FONT);
+ rc_type.count = PUT_LE_WORD(num_files);
rc_type.resloader = 0;
fwrite(&rc_type, sizeof(rc_type), 1, ofp);
for(res = first_res | 0x8000, i = 0; i < num_files; i++, res++) {
int len = (info[i]->hdr.dfSize + 15) & ~0xf;
- rc_name.offset = font_off >> 4;
- rc_name.length = len >> 4;
- rc_name.flags = NE_SEGFLAGS_MOVEABLE | NE_SEGFLAGS_SHAREABLE | NE_SEGFLAGS_DISCARDABLE;
- rc_name.id = res;
+ rc_name.offset = PUT_LE_WORD(font_off >> 4);
+ rc_name.length = PUT_LE_WORD(len >> 4);
+ rc_name.flags = PUT_LE_WORD(NE_SEGFLAGS_MOVEABLE | NE_SEGFLAGS_SHAREABLE | NE_SEGFLAGS_DISCARDABLE);
+ rc_name.id = PUT_LE_WORD(res);
rc_name.handle = 0;
rc_name.usage = 0;
fwrite(&rc_name, sizeof(rc_name), 1, ofp);
@@ -812,12 +872,21 @@ int main(int argc, char **argv)
fputc(0x00, ofp);
/* FONTDIR resource */
- fwrite(&num_files, sizeof(num_files), 1, ofp);
+ tmp16 = PUT_LE_WORD(num_files);
+ fwrite(&tmp16, sizeof(tmp16), 1, ofp);
for(res = first_res, i = 0; i < num_files; i++, res++) {
+ FNT_HEADER tmp_hdr;
+ int sz;
const char *name = get_face_name( info[i] );
- fwrite(&res, sizeof(res), 1, ofp);
- fwrite(&info[i]->hdr, FIELD_OFFSET(FNT_HEADER,fi.dfBitsOffset), 1, ofp);
+ tmp16 = PUT_LE_WORD(res);
+ fwrite(&tmp16, sizeof(tmp16), 1, ofp);
+ sz = FIELD_OFFSET(FNT_HEADER,fi.dfBitsOffset);
+ memcpy(&tmp_hdr, &info[i]->hdr, sz);
+ tmp_hdr.dfVersion = PUT_LE_WORD(tmp_hdr.dfVersion);
+ tmp_hdr.dfSize = PUT_LE_DWORD(tmp_hdr.dfSize);
+ adjust_fontinfo(&(tmp_hdr.fi));
+ fwrite(&tmp_hdr, FIELD_OFFSET(FNT_HEADER,fi.dfBitsOffset), 1, ofp);
fputc(0x00, ofp);
fwrite(name, strlen(name) + 1, 1, ofp);
}
--
1.7.10.4
>From 1cf813bd128b899442f424e09b1b51e4fc6b9204 Mon Sep 17 00:00:00 2001
From: Hilko Bengen <bengen@debian.org>
Date: Tue, 3 Jul 2012 21:09:38 +0200
Subject: [PATCH 2/2] No longer remove *.fon files (affects: #680421)
---
debian/rules | 3 ---
1 file changed, 3 deletions(-)
diff --git a/debian/rules b/debian/rules
index 7df4710..fc82cd0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -365,9 +365,6 @@ binary-arch: install-arch-stamp
# We don't need symbols for the build tools...
rm -rf debian/libwine-dbg$(VERSUFFIX)/usr/lib/debug/usr/bin
- # exclude architecture-specific bitmap font files (closes: bug #676443)
- rm -rf debian/libwine/usr/share/wine/fonts/*.fon
-
# install reportbug control files
for fn in debian/*.bugcontrol; do \
sfn="`basename "$$fn" .bugcontrol`"; \
--
1.7.10.4
>From db2226793c56a3db3a236d25c98e81b270617918 Mon Sep 17 00:00:00 2001
From: Hilko Bengen <bengen@debian.org>
Date: Sat, 7 Jul 2012 17:12:14 +0200
Subject: [PATCH] wine64-bin: Use xmessage (with fallback to console) for
multiarch instructions
---
debian/control.in | 2 ++
debian/wine64.sh | 61 ++++++++++++++++++++++++++++++++++-------------------
2 files changed, 41 insertions(+), 22 deletions(-)
mode change 100644 => 100755 debian/wine64.sh
diff --git a/debian/control.in b/debian/control.in
index ba4a915..bf4e56c 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -84,6 +84,8 @@ Description: Windows API implementation - binary loader
Package: wine64-bin
Architecture: any-amd64
+Depends: ${misc:Depends},
+ x11-utils,
Conflicts:
wine-bin,
Description: Windows API implementation - binary loader
diff --git a/debian/wine64.sh b/debian/wine64.sh
old mode 100644
new mode 100755
index f3d0d84..95db67e
--- a/debian/wine64.sh
+++ b/debian/wine64.sh
@@ -1,24 +1,41 @@
#!/bin/sh
-arch=$(dpkg --print-architecture | sed s/amd64/i386/)
-
-echo "This is the wine64-bin helper package, which does not provide wine itself,"
-echo "but instead exists solely to provide the following information about"
-echo "enabling multiarch on your system in order to be able to install and run"
-echo "the 32-bit wine packages."
-echo ""
-echo "The following commands should be issued as root or via sudo in order to"
-echo "enable multiarch (the last command installs 32-bit wine):"
-echo ""
-echo " # dpkg --add-architecture $arch"
-echo " # apt-get update"
-echo " # apt-get install wine-bin:$arch"
-echo ""
-echo "Depending on which Debian release is present on this system, the development"
-echo "version of wine may be available, which if available can be installed with:"
-echo ""
-echo " # apt-get install wine-bin-unstable:$arch"
-echo ""
-echo "Note that this package (wine64-bin) will be removed in the process. For"
-echo "more information on the multiarch conversion, see:"
-echo "http://wiki.debian.org/Multiarch/HOWTO";
+XMESSAGE=/usr/bin/xmessage
+ARCH="`dpkg --print-architecture`"
+ARCH_I386="`echo $ARCH | sed s,amd64,i386,`"
+
+TITLE="Debian / Wine: Multiarch Instructions"
+
+I386_MSG=\
+"This is the wine64-bin helper package, which does not provide wine itself,
+but instead exists solely to provide the following information about
+enabling multiarch on your system in order to be able to install and run
+the 32-bit wine packages.
+
+The following commands should be issued as root or via sudo in order to
+enable multiarch (the last command installs 32-bit wine):
+
+ # dpkg --add-architecture ${ARCH_I386}
+ # apt-get update
+ # apt-get install wine-bin:${ARCH_I386}
+
+Be very careful as spaces matter above. Note that this package
+(wine64-bin) will be removed in the process. For more information on
+the multiarch conversion, see: http://wiki.debian.org/Multiarch/HOWTO";
+
+$XMESSAGE -center \
+ -buttons ok:0 -default ok \
+ -title "$TITLE" \
+ "$I386_MSG" 2>/dev/null
+notify=$?
+if [ $notify -eq 1 ] ; then
+ # xmessage was unable to notify the user, try tty instead
+ echo "** $TITLE **"
+ echo "" >&2
+ echo "$I386_MSG" >&2
+ echo "" >&2
+ echo -n "(okay) " >&2
+ read confirm
+fi
+
+exit 1
--
1.7.10.4
>From 74d69f64e6a7641830737d8d4a6c3ab3e3aecf74 Mon Sep 17 00:00:00 2001
From: Hilko Bengen <bengen@debian.org>
Date: Tue, 11 Sep 2012 22:37:20 +0200
Subject: [PATCH] Added SVG icon (Closes: #677538, #679572)
---
debian/maint/cleanup-logo.sed | 4 ++++
debian/uninstaller.desktop | 2 +-
debian/wine-bin.install-common | 1 +
debian/wine.svg | 34 ++++++++++++++++++++++++++++++++++
debian/winecfg.desktop | 2 +-
5 files changed, 41 insertions(+), 2 deletions(-)
create mode 100644 debian/maint/cleanup-logo.sed
create mode 100644 debian/wine.svg
diff --git a/debian/maint/cleanup-logo.sed b/debian/maint/cleanup-logo.sed
new file mode 100644
index 0000000..ca5888f
--- /dev/null
+++ b/debian/maint/cleanup-logo.sed
@@ -0,0 +1,4 @@
+# Remove bitmaps
+/image\/png/d
+s/height="329" width="611"/height="329" width="210"/
+s/with Inkscape (.*)/from programs\/winecfg\/logo.svg using debian\/maint\/cleanup-logo.sed/
diff --git a/debian/uninstaller.desktop b/debian/uninstaller.desktop
index 102d818..dfe8873 100644
--- a/debian/uninstaller.desktop
+++ b/debian/uninstaller.desktop
@@ -5,6 +5,6 @@ Name=Wine Uninstaller
Comment=Uninstall Windows programs
Comment[ca]=Desinstaŀla programes de Windows
Exec=wine uninstaller
-Icon=/usr/share/pixmaps/wine.xpm
+Icon=wine
Terminal=false
Categories=Application;System;
diff --git a/debian/wine-bin.install-common b/debian/wine-bin.install-common
index 13c71fd..719de48 100644
--- a/debian/wine-bin.install-common
+++ b/debian/wine-bin.install-common
@@ -3,6 +3,7 @@ debian/tmp/usr/share/mime-info
debian/tmp/usr/share/applications/wine.desktop
debian/tmp/usr/share/wine/wine.inf
debian/tmp/usr/share/wine/l_intl.nls
+debian/wine.svg usr/share/pixmaps
debian/uninstaller.desktop usr/share/applications
debian/winecfg.desktop usr/share/applications
debian/tmp/usr/share/man/man1/winedbg32.1
diff --git a/debian/wine.svg b/debian/wine.svg
new file mode 100644
index 0000000..b212969
--- /dev/null
+++ b/debian/wine.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created from programs/winecfg/logo.svg using debian/maint/cleanup-logo.sed -->
+<svg xmlns="http://www.w3.org/2000/svg"; height="329" width="210" version="1.0" xmlns:xlink="http://www.w3.org/1999/xlink";>
+ <defs id="defs4">
+ <filter id="filter10933" color-interpolation-filters="sRGB">
+ <feGaussianBlur id="feGaussianBlur10935" stdDeviation="1.30068"/>
+ </filter>
+ <radialGradient id="radialGradient2896" gradientUnits="userSpaceOnUse" cy="8.3155" cx="11.947" gradientTransform="matrix(0.18962778,-2.8444735,0.97153919,0.06476798,1.6026509,66.548371)" r="28.634">
+ <stop id="stop3849" stop-opacity="0.99215686" stop-color="#f1f1f1" offset="0"/>
+ <stop id="stop3851" stop-opacity="0.98431373" stop-color="#cfcfcf" offset="1"/>
+ </radialGradient>
+ <radialGradient id="radialGradient2898" gradientUnits="userSpaceOnUse" cy="-119.36" cx="73.077" gradientTransform="matrix(-1.0984108,0.2943179,-0.86637889,-3.23337,49.933906,-352.62446)" r="64.761">
+ <stop id="stop2975" stop-opacity="0.99215686" stop-color="#f1f1f1" offset="0"/>
+ <stop id="stop2977" stop-color="#cfcfcf" offset="1"/>
+ </radialGradient>
+ <radialGradient id="radialGradient2900" gradientUnits="userSpaceOnUse" cy="-92.025" cx="89.905" gradientTransform="matrix(1.1076647,-0.29679787,0.49462864,1.8459792,35.83864,324.94279)" r="52.051">
+ <stop id="stop3841" stop-color="#c10112" offset="0"/>
+ <stop id="stop3843" stop-color="#5e0513" offset="1"/>
+ </radialGradient>
+ <radialGradient id="radialGradient2902" gradientUnits="userSpaceOnUse" cy="27.659" cx="130.88" gradientTransform="matrix(2.5590945,0,3.3150639e-6,4.5137433,-204.0605,138.51923)" r="13.818">
+ <stop id="stop3857" stop-color="#cfcfcf" offset="0"/>
+ <stop id="stop3859" stop-color="#c1c1c1" offset="1"/>
+ </radialGradient>
+ </defs>
+ <g id="g2992" transform="translate(8,7.999996)">
+ <path id="ellipse9968" d="m35.331,80.275c-9.6003,1.8985-17.005,5.3965-16.528,7.808,0.47689,2.4116,8.6555,2.828,18.256,0.92949,9.6003-1.8985,17.005-5.3965,16.528-7.808-0.477-2.411-8.655-2.827-18.256-0.929zm-0.27189,3.4246c1.962-0.44,4.752-2.048,5.979-3.904-7.449-2.939-7.684-10.908-8.686-17.022l0.09316-1.4319c0.4151-1.9839,2.4566-6.4055,3.6946-8.5496,5.734-9.93,0.012-29.792-4.297-46.694-4.71-4.2941-25.074,0.3183-28.884,6.6915,3.0326,11.411,7.2395,34.224,16.802,43.211,2.1452,2.0163,5.2021,2.8029,8.1146,6.3175l0.6879,1.1573c2.2174,6.1909,5.0839,14.147,0.4529,18.696,1.5984,1.2193,4.0831,1.973,6.0435,1.5293z" fill-opacity="0.50196078" transform="matrix(3.4014139,0,0,3.4014139,0.55162226,-4.43821)" filter="url(#filter10933)" fill="#000"/>
+ <ellipse id="ellipse9861" d="M 28.634001,0 C 28.634001,62.954937 15.814122,113.99 0,113.99 -15.814122,113.99 -28.634001,62.954937 -28.634001,0 c 0,-62.954937 12.819879,-113.99 28.634001,-113.99 15.814122,0 28.634001,51.035063 28.634001,113.99 z" rx="28.634" ry="113.99" transform="matrix(-0.10262566,-0.5189629,-0.5189629,0.10262566,127.53236,278.74732)" cy="0" cx="0" stroke-miterlimit="79.84" fill="url(#radialGradient2896)"/>
+ <path id="path9863" d="m123.67,275.54c6.6724-1.4982,16.161-6.965,20.336-13.28-25.338-9.9973-26.137-37.103-29.545-57.899l0.31688-4.8706c1.4119-6.7481,8.3558-21.788,12.567-29.081,19.505-33.778,0.0402-101.33-14.615-158.83-16.034-14.609-85.299,1.08-98.257,22.757,10.316,38.815,24.626,116.41,57.148,146.98,7.2967,6.8581,17.694,9.5339,27.601,21.488l2.3398,3.9364c7.5421,21.058,17.292,48.12,1.5405,63.593,5.4367,4.1475,13.888,6.7111,20.556,5.2018z" style="marker-start:none;marker-end:none;" stroke-miterlimit="79.84031677" fill="url(#radialGradient2898)"/>
+ <path id="path9865" d="M119.84,52.694c-34.284-16.065-23.988,65.046-90.685,30.443,23.9,90.575,44.907,102.5,75.911,113.22,9.5767-8.7425,48.312-37.499,14.774-143.66z" style="marker-start:none;marker-end:none;" stroke-miterlimit="79.84031677" fill="url(#radialGradient2900)"/>
+ <path id="path11024" d="m105.02,201.56,3.037-0.30371c4.0704,14.85,10.413,49.894,24.6,62.562-6.0108,4.8235-13.381,5.8405-21.411,5.011,7.013-21.462-1.5549-51.162-6.2258-67.269z" fill="url(#radialGradient2902)" fill-rule="evenodd"/>
+ <path id="path11022" d="m143.21,263.44,3.1888,2.8851c30.836-5.0817,36.692,1.0325,23.992,12.376,15.903-5.3607,24.724-23.162-27.181-15.261z" fill="#c2c2c2" fill-rule="evenodd"/>
+ </g>
+ <rect id="icon:193-24" height="313" width="193" y="8" x="8" fill="none"/>
+</svg>
diff --git a/debian/winecfg.desktop b/debian/winecfg.desktop
index 5434d13..aac6b89 100644
--- a/debian/winecfg.desktop
+++ b/debian/winecfg.desktop
@@ -3,7 +3,7 @@ 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
+Icon=wine
Terminal=false
Type=Application
Encoding=UTF-8
--
1.7.10.4
--- End Message ---