[pkg-wine-party] [wine] 03/04: Merge branch 'master' into jessie-backports-1.7.x
Jens Reyer
jreyer-guest at moszumanska.debian.org
Sat Aug 15 01:21:01 UTC 2015
This is an automated email from the git hooks/post-receive script.
jreyer-guest pushed a commit to branch jessie-backports-1.7.x
in repository wine.
commit a8b9752128b77bf0defb53959fa6af040491fc60
Merge: fb9693f 011f254
Author: jre <jre.winesim at gmail.com>
Date: Fri Aug 14 18:56:51 2015 +0200
Merge branch 'master' into jessie-backports-1.7.x
# Conflicts:
# debian/changelog
ANNOUNCE | 641 ++++----
AUTHORS | 1 +
VERSION | 2 +-
configure | 22 +-
configure.ac | 2 +
debian/changelog | 11 +
dlls/advapi32/advapi.c | 10 +
dlls/advapi32/advapi32.spec | 2 +-
dlls/avifil32/icmstream.c | 8 +-
dlls/combase/combase.spec | 4 +-
dlls/comctl32/listview.c | 6 +-
dlls/comctl32/rebar.c | 2 +-
dlls/comdlg32/itemdlg.c | 22 +-
dlls/comdlg32/tests/itemdlg.c | 18 +-
dlls/crypt32/crypt32.spec | 2 +
dlls/crypt32/main.c | 12 +
dlls/d2d1/bitmap.c | 137 +-
dlls/d2d1/brush.c | 103 +-
dlls/d2d1/d2d1_private.h | 36 +-
dlls/d2d1/factory.c | 22 +-
dlls/d2d1/geometry.c | 25 +-
dlls/d2d1/mesh.c | 12 +-
dlls/d2d1/render_target.c | 84 +-
dlls/d2d1/state_block.c | 12 +-
dlls/d2d1/stroke.c | 10 +-
dlls/d2d1/tests/Makefile.in | 2 +-
dlls/d2d1/tests/d2d1.c | 487 ++++++-
dlls/d2d1/wic_render_target.c | 16 +-
dlls/d3d10core/buffer.c | 7 +-
dlls/d3d10core/tests/device.c | 12 +
dlls/d3d10core/texture.c | 74 +-
dlls/d3d8/device.c | 2 +-
dlls/d3d8/tests/device.c | 53 +
dlls/d3d9/tests/device.c | 22 +-
dlls/d3d9/tests/visual.c | 196 ++-
dlls/d3d9/texture.c | 12 +-
dlls/d3drm/device.c | 2 +-
dlls/d3drm/tests/d3drm.c | 1450 ++++++++++++++++---
dlls/d3dx9_24/d3dx9_24.spec | 2 +-
dlls/d3dx9_25/d3dx9_25.spec | 2 +-
dlls/d3dx9_26/d3dx9_26.spec | 2 +-
dlls/d3dx9_27/d3dx9_27.spec | 2 +-
dlls/d3dx9_28/d3dx9_28.spec | 2 +-
dlls/d3dx9_29/d3dx9_29.spec | 2 +-
dlls/d3dx9_30/d3dx9_30.spec | 2 +-
dlls/d3dx9_31/d3dx9_31.spec | 2 +-
dlls/d3dx9_32/d3dx9_32.spec | 2 +-
dlls/d3dx9_33/d3dx9_33.spec | 2 +-
dlls/d3dx9_34/d3dx9_34.spec | 2 +-
dlls/d3dx9_35/d3dx9_35.spec | 2 +-
dlls/d3dx9_36/d3dx9_36.spec | 8 +-
dlls/d3dx9_36/mesh.c | 276 +++-
dlls/d3dx9_36/shader.c | 21 +
dlls/d3dx9_36/tests/mesh.c | 1079 +++++++++-----
dlls/d3dx9_37/d3dx9_37.spec | 2 +-
dlls/d3dx9_38/d3dx9_38.spec | 2 +-
dlls/d3dx9_39/d3dx9_39.spec | 2 +-
dlls/d3dx9_40/d3dx9_40.spec | 2 +-
dlls/d3dx9_41/d3dx9_41.spec | 2 +-
dlls/d3dx9_42/d3dx9_42.spec | 4 +-
dlls/d3dx9_43/d3dx9_43.spec | 2 +-
dlls/dbghelp/cpu_i386.c | 2 +-
dlls/dbghelp/dbghelp.c | 2 +-
dlls/dbghelp/dbghelp.spec | 4 +-
dlls/dbghelp/dbghelp_private.h | 2 +-
dlls/dbghelp/image_private.h | 1 +
dlls/dbghelp/macho_module.c | 98 +-
dlls/dbghelp/minidump.c | 2 +-
dlls/dbghelp/path.c | 2 +-
dlls/dbghelp/symbol.c | 63 +-
dlls/dwrite/analyzer.c | 5 -
dlls/dwrite/dwrite_private.h | 18 +-
dlls/dwrite/font.c | 490 ++++++-
dlls/dwrite/freetype.c | 170 ++-
dlls/dwrite/gdiinterop.c | 173 ++-
dlls/dwrite/main.c | 33 +-
dlls/dwrite/opentype.c | 69 +
dlls/dwrite/tests/font.c | 536 ++++++-
dlls/dxgi/device.c | 18 +-
dlls/dxgi/dxgi_private.h | 9 +-
dlls/dxgi/factory.c | 12 +-
dlls/dxgi/surface.c | 11 +-
dlls/dxgi/swapchain.c | 37 +-
dlls/dxgi/tests/device.c | 305 ++++
dlls/dxgi/utils.c | 22 +
dlls/gameux/tests/gamestatistics.c | 4 +-
dlls/gdi32/bitmap.c | 2 +-
dlls/hid/hidd.c | 4 +-
dlls/kernel32/editline.c | 28 +-
dlls/kernel32/tests/loader.c | 6 +-
dlls/kernel32/tests/process.c | 30 +
dlls/localui/localui.c | 2 +-
dlls/mfplat/main.c | 99 +-
dlls/mpr/tests/mpr.c | 4 +-
dlls/mscms/profile.c | 15 +-
dlls/mscms/tests/profile.c | 37 +
dlls/mscms/transform.c | 118 +-
dlls/mshtml/Makefile.in | 1 +
dlls/mshtml/htmlarea.c | 446 ++++++
dlls/mshtml/htmlelem.c | 2 +
dlls/mshtml/htmloption.c | 17 +-
dlls/mshtml/htmlselect.c | 33 +-
dlls/mshtml/mshtml_private.h | 3 +
dlls/mshtml/nsiface.idl | 38 +
dlls/mshtml/tests/dom.c | 51 +-
dlls/mshtml/tests/xmlhttprequest.c | 147 +-
dlls/mshtml/xmlhttprequest.c | 109 +-
dlls/msvcirt/msvcirt.c | 294 ++++
dlls/msvcirt/msvcirt.h | 12 +
dlls/msvcirt/msvcirt.spec | 86 +-
dlls/msvcirt/tests/msvcirt.c | 258 ++++
dlls/msvcp120/tests/msvcp120.c | 31 +-
dlls/msvcp60/ios.c | 6 +-
dlls/msvcp90/ios.c | 6 +-
dlls/msvcr110/msvcr110.spec | 2 +-
dlls/msvcr120/msvcr120.spec | 2 +-
dlls/msvcr120/tests/msvcr120.c | 13 +
dlls/msvcr120_app/msvcr120_app.spec | 2 +-
dlls/msvcrt/file.c | 5 +
dlls/msvcrt/lock.c | 18 +
dlls/msvcrt/mbcs.c | 2 +-
dlls/msvcrt/tests/file.c | 10 +
dlls/msvcrt20/msvcrt20.spec | 86 +-
dlls/msvcrt40/msvcrt40.spec | 86 +-
dlls/msxml3/domdoc.c | 4 +-
dlls/netprofm/list.c | 3 +-
dlls/netprofm/tests/list.c | 4 +
dlls/ntdll/signal_x86_64.c | 6 +-
dlls/ntdll/sync.c | 34 +-
dlls/ntdll/tests/info.c | 68 +
dlls/ntdll/thread.c | 40 +-
dlls/ntdll/threadpool.c | 9 +-
dlls/ntdll/time.c | 6 +-
dlls/ntdll/virtual.c | 7 +-
dlls/ntdsapi/ntdsapi.c | 26 +
dlls/ntdsapi/ntdsapi.spec | 2 +-
dlls/ntdsapi/tests/ntdsapi.c | 31 +
dlls/ole32/compobj.c | 2 +-
dlls/ole32/ole32.spec | 2 +
dlls/ole32/ole32_main.c | 18 +
dlls/ole32/storage32.c | 20 +-
dlls/ole32/tests/compobj.c | 44 +-
dlls/opencl/opencl.c | 1 +
dlls/qcap/tests/qcap.c | 5 +
dlls/qcap/tests/smartteefilter.c | 2 +-
dlls/qcap/vfwcapture.c | 68 +-
dlls/riched20/tests/richole.c | 2 +-
dlls/setupapi/devinst.c | 8 +-
dlls/shell32/ebrowser.c | 8 +-
dlls/shell32/iconcache.c | 6 +-
dlls/shell32/shell32.spec | 1 +
dlls/shell32/shell32_main.c | 10 +
dlls/shell32/tests/ebrowser.c | 28 +-
dlls/user.exe16/message.c | 8 +-
dlls/user32/misc.c | 10 +
dlls/user32/nonclient.c | 3 +-
dlls/user32/tests/cursoricon.c | 20 +-
dlls/user32/user32.spec | 1 +
dlls/vcomp/main.c | 223 ++-
dlls/vcomp/tests/vcomp.c | 408 +++++-
dlls/vcomp/vcomp.spec | 12 +-
dlls/vcomp100/vcomp100.spec | 12 +-
dlls/vcomp110/Makefile.in | 4 +
dlls/{x3daudio1_7 => vcomp110}/main.c | 16 +-
.../vcomp90.spec => vcomp110/vcomp110.spec} | 13 +-
dlls/vcomp90/vcomp90.spec | 12 +-
dlls/wbemprox/builtin.c | 42 +
dlls/wined3d/buffer.c | 13 +-
dlls/wined3d/context.c | 2 +-
dlls/wined3d/cs.c | 3 +-
dlls/wined3d/device.c | 202 +--
dlls/wined3d/directx.c | 4 +
dlls/wined3d/glsl_shader.c | 14 +-
dlls/wined3d/state.c | 25 +-
dlls/wined3d/swapchain.c | 94 +-
dlls/wined3d/texture.c | 22 +-
dlls/wined3d/utils.c | 95 ++
dlls/wined3d/wined3d.spec | 1 +
dlls/wined3d/wined3d_private.h | 3 +-
dlls/winex11.drv/mouse.c | 2 +-
dlls/winex11.drv/xdnd.c | 74 +-
dlls/winhttp/request.c | 9 +
dlls/winhttp/session.c | 29 +-
dlls/winhttp/tests/notification.c | 47 +-
dlls/winhttp/tests/url.c | 9 +-
dlls/winhttp/tests/winhttp.c | 131 +-
dlls/winhttp/url.c | 2 +
dlls/wininet/internet.c | 9 +
dlls/winmm/tests/generated.c | 1525 ++++++++++++++++++++
dlls/winspool.drv/info.c | 2 +-
dlls/wintrust/register.c | 7 +
dlls/ws2_32/socket.c | 19 +-
dlls/x3daudio1_7/main.c | 10 +
dlls/x3daudio1_7/x3daudio1_7.spec | 2 +-
dlls/xaudio2_8/Makefile.in | 5 +
dlls/xaudio2_8/xaudio2_8.spec | 1 +
dlls/xaudio2_8/xaudio_dll.c | 73 +
dlls/xmllite/reader.c | 10 +
dlls/xmllite/tests/writer.c | 19 +
dlls/xmllite/writer.c | 44 +-
dlls/xmllite/xmllite.spec | 2 +-
dlls/xmllite/xmllite_private.h | 1 +
include/Makefile.in | 3 +
include/d3dx9shader.h | 40 +
include/digitalv.h | 4 +
include/dwrite.idl | 2 +
include/mfapi.h | 10 +-
include/mfobjects.idl | 585 ++++++++
include/mmreg.h | 36 +
include/mshtmdid.h | 25 +
include/mshtml.idl | 227 +++
include/netlistmgr.idl | 22 +
include/ntdsapi.h | 4 +
include/shellapi.h | 13 +
include/shobjidl.idl | 4 +-
dlls/x3daudio1_7/main.c => include/wct.h | 25 +-
include/windows.foundation.idl | 84 ++
include/wine/server_protocol.h | 34 +-
include/wine/wined3d.h | 6 +-
include/wine/winedxgi.idl | 2 +-
loader/wine.inf.in | 29 +-
po/fi.po | 3 +-
po/sv.po | 187 +--
po/uk.po | 38 +-
programs/regsvr32/Makefile.in | 2 +-
programs/wineconsole/curses.c | 2 +-
programs/wineconsole/user.c | 2 +-
programs/wineconsole/wineconsole.c | 32 +-
server/process.c | 1 +
server/protocol.def | 20 +-
server/request.h | 25 +-
server/thread.c | 19 +-
server/thread.h | 1 +
server/trace.c | 18 +-
tools/make_specfiles | 1 +
tools/widl/header.c | 179 ++-
tools/widl/header.h | 2 +-
tools/widl/parser.l | 18 +-
tools/widl/parser.y | 160 +-
tools/widl/typegen.c | 6 +-
tools/widl/typetree.c | 75 +-
tools/widl/typetree.h | 8 +-
tools/widl/widl.c | 15 +-
tools/widl/widl.h | 3 +-
tools/widl/widl.man.in | 6 +-
tools/widl/widltypes.h | 25 +-
tools/winapi/tests.dat | 39 +
tools/winedump/README | 20 +-
tools/winedump/output.c | 4 +-
249 files changed, 12693 insertions(+), 2296 deletions(-)
diff --cc debian/changelog
index 62776b9,45508e6..f1714a9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,14 +1,22 @@@
+ wine-development (1.7.49-1) unstable; urgency=medium
+
+ * New upstream release 1.7.49, released Aug 7, 2015.
+ - DirectWrite is now good enough for rendering text in Steam.
+ - A number of Direct2D improvements.
+ - Some more OpenMP functions.
+ - Support for namespaces in the IDL compiler.
+ - Various bug fixes.
+
+ -- Michael Gilbert <mgilbert at debian.org> Sat, 08 Aug 2015 21:16:18 +0000
+
+wine-development (1.7.48-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports (closes: 793551).
+ Note: depends on backported khronos-api.
+ * Add myself to uploaders.
+
+ -- Jens Reyer <jreyer-guest at alioth.debian.org> Wed, 12 Aug 2015 00:28:36 +0200
+
wine-development (1.7.48-1) unstable; urgency=medium
* New upstream release 1.7.48, released Jul 28, 2015.
--
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