[pkg-wine-party] [wine] 01/02: Merge branch 'master' into jessie-backports-1.9.x
Jens Reyer
jreyer-guest at moszumanska.debian.org
Sun Jan 1 14:07:47 UTC 2017
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 387fe518068444793dcf5c7ab0f2121c43615952
Merge: 3cbaae3 0ce60e3
Author: Jens Reyer <jre.winesim at gmail.com>
Date: Thu Dec 29 20:40:01 2016 +0100
Merge branch 'master' into jessie-backports-1.9.x
# Conflicts:
# debian/changelog
ANNOUNCE | 341 ++--
AUTHORS | 4 +
MAINTAINERS | 1 +
VERSION | 2 +-
configure | 18 +-
debian/changelog | 19 +
debian/copyright | 1 +
debian/patches/font-divbyzero.patch | 2 +-
debian/patches/generate/fonts.patch | 19 +
debian/patches/generate/request.patch | 6 +-
debian/patches/series | 1 +
debian/watch | 4 +-
dlls/advapi32/advapi32.spec | 2 +-
dlls/advapi32/cred.c | 1 +
dlls/advapi32/eventlog.c | 10 -
.../api-ms-win-core-processthreads-l1-1-0.spec | 6 +-
.../api-ms-win-core-processthreads-l1-1-1.spec | 6 +-
.../api-ms-win-core-processthreads-l1-1-2.spec | 6 +-
.../api-ms-win-crt-utility-l1-1-0.spec | 2 +-
dlls/appwiz.cpl/addons.c | 4 +-
dlls/appwiz.cpl/appwiz.c | 8 +-
dlls/bcrypt/tests/bcrypt.c | 606 ++++++--
dlls/comctl32/tests/tooltips.c | 2 +-
dlls/comctl32/tests/trackbar.c | 46 +-
dlls/comctl32/tests/treeview.c | 31 +-
dlls/comctl32/trackbar.c | 1 +
dlls/comctl32/treeview.c | 11 +-
dlls/comdlg32/itemdlg.c | 4 +-
dlls/crypt32/tests/chain.c | 463 +++---
dlls/d2d1/d2d1_private.h | 34 +-
dlls/d2d1/geometry.c | 325 ++--
dlls/d2d1/render_target.c | 30 +-
dlls/d2d1/tests/d2d1.c | 329 ++--
dlls/d3d10_1/tests/d3d10_1.c | 3 +
dlls/d3d10core/tests/device.c | 485 +++++-
dlls/d3d11/device.c | 52 +-
dlls/d3d11/tests/d3d11.c | 1629 +++++++++++++++++++-
dlls/d3d11/view.c | 29 +-
dlls/d3d8/directx.c | 2 +-
dlls/d3d8/tests/visual.c | 153 ++
dlls/d3d9/directx.c | 3 +-
dlls/d3d9/tests/device.c | 39 +-
dlls/d3d9/tests/visual.c | 158 +-
dlls/ddraw/ddraw_private.h | 2 +-
dlls/dpnet/tests/Makefile.in | 3 +-
dlls/dpnet/tests/address.c | 34 +
dlls/dpnet/tests/client.c | 449 +++++-
dlls/dpnet/tests/peer.c | 312 ----
dlls/dpnet/tests/server.c | 216 ++-
dlls/dsound/dsound.c | 4 +-
dlls/dwrite/dwrite_private.h | 6 +-
dlls/dwrite/font.c | 45 +-
dlls/dwrite/gdiinterop.c | 77 +-
dlls/dwrite/opentype.c | 41 +-
dlls/dwrite/tests/font.c | 469 ++++--
dlls/gdi32/enhmfdrv/init.c | 2 +-
dlls/gdi32/freetype.c | 41 +-
dlls/gdiplus/font.c | 27 +-
dlls/gdiplus/tests/pen.c | 23 +
dlls/hid/hidp.c | 7 +-
dlls/hidclass.sys/descriptor.c | 75 +-
dlls/hidclass.sys/device.c | 94 +-
dlls/hlink/hlink_main.c | 2 +-
dlls/imaadp32.acm/imaadp32.c | 14 +-
dlls/iphlpapi/iphlpapi_main.c | 27 +-
dlls/iphlpapi/tests/iphlpapi.c | 3 +
dlls/kernel32/editline.c | 5 +-
dlls/kernel32/kernel32.spec | 6 +-
dlls/kernel32/process.c | 120 ++
dlls/kernel32/tests/file.c | 182 ++-
dlls/kernel32/tests/pipe.c | 8 +
dlls/kernel32/tests/process.c | 123 ++
dlls/kernelbase/kernelbase.spec | 6 +-
dlls/localspl/provider.c | 11 +-
dlls/msacm32/pcmconverter.c | 320 +++-
dlls/msacm32/tests/Makefile.in | 2 +-
dlls/msacm32/tests/msacm.c | 166 ++
dlls/mscoree/mscoree_main.c | 2 +-
dlls/msctf/threadmgr.c | 4 +-
dlls/msg711.acm/msg711.c | 4 -
dlls/mshtml/navigate.c | 4 +-
dlls/msi/msi.c | 10 +-
dlls/msi/registry.c | 15 +-
dlls/msi/tests/package.c | 109 ++
dlls/msvcr100/msvcr100.spec | 2 +-
dlls/msvcr110/msvcr110.spec | 2 +-
dlls/msvcr120/msvcr120.spec | 2 +-
dlls/msvcr120_app/msvcr120_app.spec | 2 +-
dlls/msvcr80/msvcr80.spec | 2 +-
dlls/msvcr90/msvcr90.spec | 2 +-
dlls/msvcrt/misc.c | 26 +
dlls/msvcrt/msvcrt.spec | 2 +-
dlls/msvcrt/tests/misc.c | 72 +
dlls/msvfw32/msvideo_main.c | 3 -
dlls/ntdll/file.c | 3 +-
dlls/ntdll/misc.c | 10 +
dlls/ntdll/ntdll.spec | 3 +-
dlls/ntdll/rtl.c | 5 +-
dlls/ntdll/server.c | 10 +-
dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 3 +-
dlls/quartz/filtergraph.c | 6 +-
dlls/quartz/tests/filtergraph.c | 215 +++
dlls/rpcrt4/rpc_message.c | 3 +
dlls/rpcrt4/rpc_server.c | 49 +-
dlls/rpcrt4/tests/Makefile.in | 3 +-
dlls/rpcrt4/tests/rpc.c | 306 +++-
dlls/rpcrt4/tests/rpc_protseq.c | 205 ---
dlls/rpcrt4/tests/server.c | 144 ++
dlls/scrrun/dictionary.c | 37 +-
dlls/scrrun/filesystem.c | 110 +-
dlls/scrrun/scrrun.c | 73 +-
dlls/scrrun/scrrun_private.h | 8 +
dlls/scrrun/tests/dictionary.c | 33 +
dlls/scrrun/tests/filesystem.c | 42 +
dlls/secur32/wrapper.c | 2 +-
dlls/setupapi/devinst.c | 10 +
dlls/setupapi/setupapi.spec | 2 +-
dlls/setupapi/tests/devinst.c | 405 ++---
dlls/shell32/cpanelfolder.c | 2 +-
dlls/shell32/dragdrophelper.c | 158 +-
dlls/shell32/enumidlist.c | 249 ++-
dlls/shell32/pidl.c | 13 +-
dlls/shell32/shell32_classes.idl | 6 +
dlls/shell32/shell32_main.c | 23 +-
dlls/shell32/shell32_main.h | 18 +-
dlls/shell32/shellitem.c | 171 +-
dlls/shell32/shellole.c | 1 +
dlls/shell32/shellpath.c | 142 +-
dlls/shell32/shfldr.h | 2 +-
dlls/shell32/shfldr_desktop.c | 81 +-
dlls/shell32/shfldr_fs.c | 16 +-
dlls/shell32/shfldr_mycomp.c | 22 +-
dlls/shell32/shfldr_netplaces.c | 13 +-
dlls/shell32/shlfolder.c | 5 +-
dlls/shell32/shlview.c | 4 +-
dlls/shell32/tests/ebrowser.c | 11 +
dlls/shell32/tests/shelldispatch.c | 6 +
dlls/shell32/tests/shellole.c | 26 +
dlls/shell32/tests/shellpath.c | 6 +
dlls/shlwapi/tests/url.c | 49 +-
dlls/shlwapi/url.c | 5 +-
dlls/strmbase/video.c | 157 +-
dlls/ucrtbase/ucrtbase.spec | 2 +-
dlls/user32/menu.c | 14 +-
dlls/user32/painting.c | 76 +-
dlls/user32/resources/ocr_pen.cur | Bin 0 -> 326 bytes
dlls/user32/tests/dce.c | 6 +
dlls/user32/tests/win.c | 83 +-
dlls/user32/user32.rc | 3 +
dlls/wbemdisp/locator.c | 8 +-
dlls/windowscodecs/converter.c | 2 +-
dlls/windowscodecs/main.c | 37 +-
dlls/windowscodecs/pngformat.c | 63 +-
dlls/windowscodecs/propertybag.c | 14 +-
dlls/windowscodecs/tests/converter.c | 19 +-
dlls/winebus.sys/bus_udev.c | 42 +-
dlls/wined3d/arb_program_shader.c | 22 +
dlls/wined3d/buffer.c | 2 +-
dlls/wined3d/context.c | 47 +-
dlls/wined3d/device.c | 12 +-
dlls/wined3d/directx.c | 33 +-
dlls/wined3d/glsl_shader.c | 354 +++--
dlls/wined3d/shader.c | 171 +-
dlls/wined3d/shader_sm1.c | 2 +-
dlls/wined3d/shader_sm4.c | 143 +-
dlls/wined3d/state.c | 48 +-
dlls/wined3d/stateblock.c | 14 +-
dlls/wined3d/surface.c | 10 +-
dlls/wined3d/swapchain.c | 17 +-
dlls/wined3d/texture.c | 13 +-
dlls/wined3d/utils.c | 388 ++---
dlls/wined3d/vertexdeclaration.c | 4 +-
dlls/wined3d/view.c | 223 +--
dlls/wined3d/wined3d_gl.h | 3 +
dlls/wined3d/wined3d_private.h | 80 +-
dlls/winegstreamer/gstdemux.c | 11 +-
dlls/winemac.drv/clipboard.c | 2 +-
dlls/winemac.drv/cocoa_app.m | 22 +
dlls/winemac.drv/event.c | 5 +
dlls/winemac.drv/ime.c | 7 +-
dlls/winemac.drv/macdrv.h | 2 +
dlls/winemac.drv/macdrv_cocoa.h | 3 +-
dlls/winemac.drv/window.c | 45 +-
dlls/wineqtdecoder/qtsplitter.c | 4 +
dlls/winex11.drv/ime.c | 8 +-
dlls/winhttp/net.c | 47 +-
dlls/winhttp/tests/winhttp.c | 29 +-
dlls/wininet/http.c | 28 +-
dlls/wininet/tests/http.c | 25 +-
dlls/winmm/winmm.c | 9 +-
dlls/winspool.drv/info.c | 55 +-
dlls/wintrust/tests/softpub.c | 13 +-
dlls/ws2_32/socket.c | 219 ++-
dlls/ws2_32/tests/sock.c | 128 ++
dlls/xinput1_1/Makefile.in | 3 -
dlls/xinput1_1/xinput1_1_main.c | 37 -
dlls/xinput1_2/Makefile.in | 3 -
dlls/xinput1_2/xinput1_2_main.c | 37 -
dlls/xinput1_3/tests/xinput.c | 100 +-
dlls/xinput1_4/Makefile.in | 3 -
dlls/xinput1_4/xinput1_4_main.c | 37 -
dlls/xinput9_1_0/Makefile.in | 3 -
dlls/xinput9_1_0/xinput9_1_0_main.c | 37 -
dlls/xmllite/reader.c | 427 ++++-
dlls/xmllite/tests/reader.c | 138 +-
dlls/xmllite/writer.c | 14 +-
include/bcrypt.h | 17 +
include/d3d11.idl | 7 +
include/gdiplusflat.h | 1 +
include/msacmdrv.h | 1 +
include/shobjidl.idl | 203 ++-
include/tapi.h | 5 +
include/winbase.h | 41 +
include/wincodec.idl | 11 +
include/wincrypt.h | 22 +
include/wine/server_protocol.h | 40 +-
include/wine/wined3d.h | 56 +-
include/winnls.h | 1 +
include/wintrust.h | 44 +
include/winuser.h | 1 +
include/winuser.rh | 1 +
include/ws2tcpip.h | 2 +
loader/wine.inf.in | 1 +
po/ja.po | 30 +-
po/zh_CN.po | 586 +++----
programs/cmd/builtins.c | 50 +-
programs/cmd/tests/test_builtins.cmd | 134 +-
programs/cmd/tests/test_builtins.cmd.exp | 83 +-
programs/explorer/desktop.c | 1 +
programs/reg/tests/reg.c | 209 ++-
programs/regedit/tests/regedit.c | 102 +-
programs/winecfg/winecfg.c | 22 +-
programs/wscript/tests/run.js | 4 +-
server/async.c | 148 +-
server/change.c | 8 +-
server/console.c | 3 +-
server/device.c | 102 +-
server/fd.c | 31 +-
server/file.c | 3 +-
server/file.h | 23 +-
server/mailslot.c | 11 +-
server/mapping.c | 3 +-
server/named_pipe.c | 16 +-
server/process.c | 3 +
server/process.h | 1 +
server/protocol.def | 19 +-
server/request.c | 3 +-
server/request.h | 13 +-
server/serial.c | 5 +-
server/signal.c | 3 +-
server/sock.c | 24 +-
server/thread.c | 3 +-
server/trace.c | 29 +-
253 files changed, 12154 insertions(+), 4384 deletions(-)
diff --cc debian/changelog
index 345bd44,7143440..ef983b8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,22 +1,29 @@@
+ wine-development (2.0~rc2-1) unstable; urgency=medium
+
+ * New upstream release 2.0-rc2, released Dec 16, 2016.
+ - Fixes wineconsole emacs mode crash when yanking a line (closes: #844412).
+ * Remove ttf files from the upstream tarball.
+ * Use xz compression for the upstream tarball.
+
+ -- Michael Gilbert <mgilbert at debian.org> Sun, 18 Dec 2016 18:42:24 +0000
+
+ wine-development (2.0~rc1-1) unstable; urgency=medium
+
+ * New upstream release 2.0-rc1, released Dec 9, 2016.
+ - Support for IDN name resolution.
+ - Many more Shader Model 5 operations.
+ - Still more fixes in the regression tests.
+ - Various bug fixes.
+
+ -- Michael Gilbert <mgilbert at debian.org> Sun, 11 Dec 2016 06:11:01 +0000
+
+wine-development (1.9.24-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+ * No changes.
+
+ -- Jens Reyer <jre.winesim at gmail.com> Thu, 01 Dec 2016 16:02:56 +0100
+
wine-development (1.9.24-1) unstable; urgency=medium
[ Michael Gilbert ]
--
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