[pkg-wine-party] [wine] 01/02: Merge branch 'master' into jessie-backports-1.9.x
Jens Reyer
jreyer-guest at moszumanska.debian.org
Fri Aug 19 12:34:34 UTC 2016
This is an automated email from the git hooks/post-receive script.
jreyer-guest pushed a commit to branch jessie-backports-1.9.x
in repository wine.
commit 42bc173e25f36c54b39adceb3ab5f20401a3b426
Merge: 2839f83 3c6d5e9
Author: Jens Reyer <jre.winesim at gmail.com>
Date: Tue Aug 16 02:34:16 2016 +0200
Merge branch 'master' into jessie-backports-1.9.x
# Conflicts:
# debian/changelog
ANNOUNCE | 764 +++---
AUTHORS | 4 +
VERSION | 2 +-
configure | 23 +-
configure.ac | 4 +-
debian/NEWS | 14 +
debian/README.debian | 33 +-
debian/bug-script | 7 +
debian/changelog | 24 +
debian/control.in | 19 +-
.../winemenubuilder.patch | 0
debian/patches/development/winegcc.patch | 53 -
debian/patches/font-divbyzero.patch | 2 +-
debian/patches/generate/request.patch | 4 +-
debian/patches/generate/unicode.patch | 2 +-
debian/patches/makefile.patch | 2 +-
debian/patches/series | 3 +-
debian/patches/sfnt2fon.patch | 4 +-
debian/wineVERSION.postinst | 76 +
debian/wineVERSION.prerm | 13 +
debian/wineVERSION.triggers | 10 +
dlls/amstream/audiodata.c | 118 +-
dlls/amstream/tests/amstream.c | 269 ++
.../api-ms-win-crt-math-l1-1-0.spec | 1 +
.../api-ms-win-crt-private-l1-1-0.spec | 4 +-
.../api-ms-win-crt-runtime-l1-1-0.spec | 6 +-
.../api-ms-win-crt-stdio-l1-1-0.spec | 20 +-
dlls/cabinet/cabinet_main.c | 2 +-
dlls/cabinet/fdi.c | 6 +-
dlls/comctl32/dsa.c | 3 +
dlls/comctl32/imagelist.c | 4 +-
dlls/comctl32/listview.c | 21 +-
dlls/comctl32/monthcal.c | 18 +-
dlls/comctl32/rebar.c | 2 +-
dlls/comctl32/status.c | 4 +-
dlls/comctl32/tab.c | 14 +-
dlls/comctl32/tests/listview.c | 118 +-
dlls/comctl32/tests/tooltips.c | 4 +-
dlls/comctl32/tests/trackbar.c | 4 +-
dlls/comctl32/trackbar.c | 7 +-
dlls/comctl32/treeview.c | 46 +-
dlls/comdlg32/itemdlg.c | 12 +-
dlls/comdlg32/tests/itemdlg.c | 15 +
dlls/cryptui/main.c | 8 +-
dlls/d3d10core/tests/device.c | 608 ++++-
dlls/d3d11/d3d11_private.h | 1 +
dlls/d3d11/device.c | 8 +-
dlls/d3d11/state.c | 20 +-
dlls/d3d11/tests/d3d11.c | 578 ++++-
dlls/d3d8/d3d8_private.h | 2 +
dlls/d3d8/device.c | 8 +-
dlls/d3d8/vertexdeclaration.c | 4 +-
dlls/d3d9/d3d9_private.h | 2 +
dlls/d3d9/device.c | 8 +-
dlls/d3d9/tests/visual.c | 108 +-
dlls/d3d9/vertexdeclaration.c | 4 +-
dlls/d3drm/d3drm.c | 91 +-
dlls/d3drm/d3drm_private.h | 9 +-
dlls/d3drm/device.c | 12 +-
dlls/d3drm/frame.c | 4 +-
dlls/d3drm/tests/d3drm.c | 649 ++++-
dlls/d3drm/viewport.c | 179 +-
dlls/d3dx10_43/async.c | 2 +-
dlls/d3dx10_43/d3dx10_43.spec | 6 +-
dlls/d3dx10_43/d3dx10_43_main.c | 38 +-
dlls/d3dx11_43/async.c | 2 +-
dlls/d3dx9_24/d3dx9_24.spec | 8 +-
dlls/d3dx9_25/d3dx9_25.spec | 8 +-
dlls/d3dx9_26/d3dx9_26.spec | 8 +-
dlls/d3dx9_27/d3dx9_27.spec | 8 +-
dlls/d3dx9_28/d3dx9_28.spec | 8 +-
dlls/d3dx9_29/d3dx9_29.spec | 8 +-
dlls/d3dx9_30/d3dx9_30.spec | 8 +-
dlls/d3dx9_31/d3dx9_31.spec | 8 +-
dlls/d3dx9_32/d3dx9_32.spec | 8 +-
dlls/d3dx9_33/d3dx9_33.spec | 8 +-
dlls/d3dx9_34/d3dx9_34.spec | 8 +-
dlls/d3dx9_35/d3dx9_35.spec | 8 +-
dlls/d3dx9_36/d3dx9_36.spec | 8 +-
dlls/d3dx9_36/mesh.c | 1 -
dlls/d3dx9_36/shader.c | 267 ++
dlls/d3dx9_36/tests/effect.c | 11 +-
dlls/d3dx9_36/tests/mesh.c | 1 -
dlls/d3dx9_36/tests/texture.c | 242 ++
dlls/d3dx9_36/texture.c | 18 +
dlls/d3dx9_37/d3dx9_37.spec | 8 +-
dlls/d3dx9_38/d3dx9_38.spec | 8 +-
dlls/d3dx9_39/d3dx9_39.spec | 8 +-
dlls/d3dx9_40/d3dx9_40.spec | 8 +-
dlls/d3dx9_41/d3dx9_41.spec | 8 +-
dlls/d3dx9_42/d3dx9_42.spec | 8 +-
dlls/d3dx9_43/d3dx9_43.spec | 8 +-
dlls/dbghelp/dwarf.c | 6 +
dlls/ddraw/ddraw.c | 3 +-
dlls/ddraw/ddraw_private.h | 2 +-
dlls/ddraw/main.c | 2 +-
dlls/ddraw/surface.c | 2 +-
dlls/ddraw/tests/d3d.c | 2 +-
dlls/ddraw/viewport.c | 6 +-
dlls/dinput/device.c | 2 +-
dlls/dinput/joystick_linux.c | 64 +-
dlls/dinput/joystick_linuxinput.c | 25 +-
dlls/dinput/joystick_osx.c | 48 +-
dlls/dinput/tests/dinput.c | 7 +-
dlls/dinput8/tests/device.c | 15 +-
dlls/dinput8/tests/dinput.c | 22 +-
dlls/dmime/performance.c | 2 +-
dlls/dmusic/clock.c | 2 +-
dlls/dmusic/dmusic.c | 2 +-
dlls/dmusic/port.c | 9 +-
dlls/dplayx/dplayx_global.c | 2 +-
dlls/dsound/sound3d.c | 8 +-
dlls/dwrite/analyzer.c | 48 +-
dlls/dwrite/font.c | 5 +-
dlls/dwrite/layout.c | 152 +-
dlls/dwrite/tests/font.c | 12 +-
dlls/dwrite/tests/layout.c | 102 +-
dlls/dxgi/dxgi_private.h | 9 +
dlls/dxgi/factory.c | 16 +-
dlls/dxgi/swapchain.c | 132 +-
dlls/dxgi/tests/device.c | 1105 +++++++-
dlls/dxgi/utils.c | 64 +
dlls/explorerframe/explorerframe_main.h | 3 -
dlls/explorerframe/tests/nstc.c | 3 -
dlls/gdi32/bitblt.c | 29 +-
dlls/gdi32/brush.c | 10 +-
dlls/gdi32/clipping.c | 6 +-
dlls/gdi32/dc.c | 109 +-
dlls/gdi32/dib.c | 6 +-
dlls/gdi32/dibdrv/bitblt.c | 25 +-
dlls/gdi32/dibdrv/dibdrv.h | 2 +-
dlls/gdi32/dibdrv/graphics.c | 159 +-
dlls/gdi32/dibdrv/objects.c | 83 +-
dlls/gdi32/driver.c | 4 +-
dlls/gdi32/enhmfdrv/dc.c | 16 +-
dlls/gdi32/enhmfdrv/graphics.c | 38 +-
dlls/gdi32/enhmfdrv/objects.c | 8 +-
dlls/gdi32/font.c | 115 +-
dlls/gdi32/freetype.c | 4 +-
dlls/gdi32/gdi_private.h | 32 +-
dlls/gdi32/mapping.c | 178 +-
dlls/gdi32/painting.c | 60 +-
dlls/gdi32/palette.c | 3 +-
dlls/gdi32/path.c | 131 +-
dlls/gdi32/tests/brush.c | 19 +
dlls/gdi32/tests/font.c | 9 +-
dlls/gdiplus/brush.c | 2 +-
dlls/gdiplus/gdiplus_private.h | 2 +
dlls/gdiplus/graphics.c | 18 +
dlls/gdiplus/image.c | 20 +-
dlls/gdiplus/metafile.c | 71 +
dlls/gdiplus/region.c | 2 +-
dlls/gdiplus/tests/font.c | 2 +-
dlls/gdiplus/tests/graphics.c | 4 +-
dlls/gdiplus/tests/image.c | 7 +-
dlls/gdiplus/tests/metafile.c | 152 ++
dlls/hlink/browse_ctx.c | 5 +-
dlls/hnetcfg/apps.c | 1 +
dlls/hnetcfg/hnetcfg.c | 5 +
dlls/hnetcfg/hnetcfg.idl | 8 +
dlls/hnetcfg/hnetcfg_private.h | 2 +
dlls/hnetcfg/policy.c | 331 +++
dlls/hnetcfg/tests/Makefile.in | 5 +
dlls/hnetcfg/tests/policy.c | 90 +
dlls/imm32/imm.c | 36 +-
dlls/imm32/tests/imm32.c | 30 +-
dlls/joy.cpl/main.c | 2 +-
dlls/jscript/compile.c | 537 +++-
dlls/jscript/dispex.c | 5 +-
dlls/jscript/engine.c | 722 ++++--
dlls/jscript/engine.h | 31 +-
dlls/jscript/function.c | 187 +-
dlls/jscript/global.c | 4 +-
dlls/jscript/jscript.c | 4 +-
dlls/jscript/jsregexp.c | 1 +
dlls/jscript/jsutils.c | 8 +-
dlls/jscript/parser.h | 1 +
dlls/jscript/tests/lang.js | 118 +
dlls/jscript/tests/run.c | 2 +
dlls/kernel32/tests/loader.c | 145 +-
dlls/kernel32/tests/virtual.c | 491 ++--
dlls/kernel32/thread.c | 38 +-
dlls/krnl386.exe16/local.c | 2 +-
dlls/mcicda/mcicda.c | 59 +-
dlls/mmdevapi/devenum.c | 2 +-
dlls/mmdevapi/tests/capture.c | 4 +-
dlls/mmsystem.dll16/mmsystem.c | 2 +-
dlls/mshtml/editor.c | 2 +-
dlls/mshtml/nsembed.c | 64 +-
dlls/mshtml/nsiface.idl | 46 +-
dlls/mshtml/nsio.c | 56 +-
dlls/mshtml/view.c | 2 +-
dlls/msscript.ocx/msscript.c | 97 +-
dlls/msscript.ocx/tests/msscript.c | 150 +-
dlls/msvcirt/msvcirt.c | 389 ++-
dlls/msvcirt/msvcirt.spec | 120 +-
dlls/msvcirt/tests/msvcirt.c | 320 +++
dlls/msvcp100/msvcp100.spec | 34 +-
dlls/msvcp110/msvcp110.spec | 50 +-
dlls/msvcp120/msvcp120.spec | 50 +-
dlls/msvcp120_app/msvcp120_app.spec | 50 +-
dlls/msvcp140/Makefile.in | 14 +
.../msvcp120.spec => msvcp140/msvcp140.spec} | 2677 ++++++++++----------
dlls/msvcp90/ios.c | 10 +
dlls/msvcp90/misc.c | 10 +
dlls/msvcp90/msvcp90.h | 8 +
dlls/msvcp90/msvcp_main.c | 64 +
dlls/msvcrt/cpp.c | 96 +-
dlls/msvcrt/data.c | 54 +
dlls/msvcrt/wcs.c | 120 +-
dlls/msvcrt20/msvcrt20.spec | 72 +-
dlls/msvcrt40/msvcrt40.spec | 72 +-
dlls/msxml3/tests/xmlparser.c | 3 +
dlls/msxml3/xmlparser.c | 6 +-
dlls/ntdll/loader.c | 9 +
dlls/ntdll/nt.c | 19 -
dlls/ntdll/ntdll.spec | 6 +-
dlls/ntdll/path.c | 2 +-
dlls/ntdll/signal_x86_64.c | 95 +-
dlls/ntdll/sync.c | 2 +-
dlls/ntdll/tests/path.c | 9 +-
dlls/ntdll/threadpool.c | 2 +-
dlls/ntdll/virtual.c | 120 +-
dlls/ntoskrnl.exe/ntoskrnl.c | 159 +-
dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +-
dlls/oleaut32/tests/typelib.c | 90 +-
dlls/oleaut32/tests/vartype.c | 20 +
dlls/oleaut32/variant.c | 6 +
dlls/quartz/avidec.c | 2 +-
dlls/riched20/richole.c | 36 +-
dlls/rpcrt4/ndr_stubless.c | 5 +
dlls/rpcrt4/rpcrt4.spec | 2 +-
dlls/shell32/shellpath.c | 6 +-
dlls/shell32/tests/shelllink.c | 2 +-
dlls/shlwapi/url.c | 2 +-
dlls/strmbase/mediatype.c | 11 +-
dlls/ucrtbase/Makefile.in | 1 +
dlls/ucrtbase/tests/cpp.c | 61 +
dlls/ucrtbase/tests/misc.c | 44 +
dlls/ucrtbase/tests/printf.c | 56 +
dlls/ucrtbase/ucrtbase.spec | 31 +-
dlls/urlmon/tests/protocol.c | 4 +-
dlls/urlmon/tests/url.c | 8 +-
dlls/user32/combo.c | 2 +-
dlls/user32/edit.c | 2 +-
dlls/user32/sysparams.c | 4 +-
dlls/user32/tests/msg.c | 6 +-
dlls/uxtheme/draw.c | 12 +-
dlls/vcruntime140/vcruntime140.spec | 4 +-
dlls/wined3d/Makefile.in | 1 -
dlls/wined3d/arb_program_shader.c | 4 +-
dlls/wined3d/buffer.c | 26 +-
dlls/wined3d/context.c | 10 +-
dlls/wined3d/cs.c | 86 +-
dlls/wined3d/device.c | 147 +-
dlls/wined3d/directx.c | 8 +
dlls/wined3d/drawprim.c | 27 +-
dlls/wined3d/glsl_shader.c | 91 +-
dlls/wined3d/query.c | 259 +-
dlls/wined3d/sampler.c | 4 +-
dlls/wined3d/shader.c | 24 +-
dlls/wined3d/shader_sm4.c | 2 +
dlls/wined3d/state.c | 74 +-
dlls/wined3d/stateblock.c | 2 +-
dlls/wined3d/surface.c | 34 +-
dlls/wined3d/swapchain.c | 217 +-
dlls/wined3d/texture.c | 402 ++-
dlls/wined3d/utils.c | 13 +-
dlls/wined3d/volume.c | 292 ---
dlls/wined3d/wined3d.spec | 10 +-
dlls/wined3d/wined3d_gl.h | 1 +
dlls/wined3d/wined3d_private.h | 46 +-
dlls/winejoystick.drv/joystick_osx.c | 55 +-
dlls/winepulse.drv/mmdevdrv.c | 57 +-
dlls/wininet/http.c | 302 ++-
dlls/wininet/tests/http.c | 41 +
dlls/wininet/tests/url.c | 20 +-
dlls/ws2_32/socket.c | 20 +
dlls/ws2_32/tests/sock.c | 19 +-
dlls/ws2_32/ws2_32.spec | 1 +
dlls/xaudio2_7/compat.c | 2 +
dlls/xaudio2_7/x3daudio.c | 2 +
dlls/xinput1_3/xinput1_3.spec | 2 +-
dlls/xinput1_4/xinput1_4.spec | 2 +-
include/Makefile.in | 1 +
include/commctrl.h | 1 +
include/commctrl.rh | 1 +
include/d3dx10.h | 1 +
include/d3dx10core.idl | 3 +
include/{d3dx10.h => d3dx10math.h} | 35 +-
include/d3dx10tex.h | 2 +
include/d3dx9core.h | 2 +-
include/d3dx9effect.h | 2 +-
include/d3dx9math.h | 4 +-
include/d3dx9mesh.h | 2 +-
include/d3dx9tex.h | 11 +-
include/icftypes.idl | 29 +
include/netfw.idl | 227 ++
include/winbase.h | 33 +-
include/wine/server_protocol.h | 32 +-
include/wine/wined3d.h | 41 +-
include/winnt.h | 5 +-
po/fi.po | 59 +-
programs/cmd/tests/test_builtins.cmd.exp | 2 +-
programs/reg/tests/reg.c | 62 +-
programs/winedevice/device.c | 176 +-
programs/winetest/gui.c | 3 +-
programs/winetest/send.c | 1 +
server/mapping.c | 128 +-
server/protocol.def | 29 +-
server/request.h | 14 +-
server/trace.c | 32 +-
tools/make_specfiles | 1 +
313 files changed, 14051 insertions(+), 5567 deletions(-)
diff --cc debian/changelog
index d4c5b20,8406d7a..353db24
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,27 +1,36 @@@
+ wine-development (1.9.16-1) unstable; urgency=medium
+
+ [ Michael Gilbert ]
+ * New upstream release 1.9.16, released Aug 5, 2016.
+ - Performance improvements in JavaScript.
+ - More progress towards the Direct3D command stream.
+ - More shader instructions in Direct3D.
+ - Performance improvements in GDI.
+ - Various bug fixes.
+
+ [ Jens Reyer ]
+ * Add removal instructions for binfmt support to README.debian.
+ * Add Recommends g++ or g++-multilib to the -tools (see: #832041).
+ * Implement the Debian alternatives system (closes: #758291).
+ - Drop now obsolete development/winegcc.patch.
+ - Add breaks older src:wine packages before the alternatives system.
+ - Let the -tools packages recommend wineVERSION.
+ - Add bug script to show the target of the /usr/bin/wine link.
+ - Add provides: wine to wine-development.
+ * Bump versioned dependency on unicode-data to >= 9.0.
+ * Refresh patches.
+
+ -- Michael Gilbert <mgilbert at debian.org> Sun, 07 Aug 2016 04:59:32 +0000
+
+wine-development (1.9.15-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+ * Remaining diff to stretch:
+ - Revert "Drop alternative depends on perl:any (now handled by debhelper)."
+ - debhelper in backports doesn't support this yet.
+
+ -- Jens Reyer <jre.winesim at gmail.com> Fri, 29 Jul 2016 21:07:39 +0200
+
wine-development (1.9.15-1) unstable; urgency=medium
* New upstream release 1.9.15, released Jul 22, 2016.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git
More information about the pkg-wine-party
mailing list