[pkg-wine-party] [wine] 01/02: Merge branch 'master' into jessie-backports-1.9.x

Jens Reyer jreyer-guest at moszumanska.debian.org
Mon Sep 12 16:32:41 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 13cf3e86512cb4f875ef0cf4e34034d2d7f12666
Merge: 5fe56cf d5aecd1
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Mon Sep 12 13:09:03 2016 +0200

    Merge branch 'master' into jessie-backports-1.9.x
    
    # Conflicts:
    #	debian/changelog

 ANNOUNCE                                           |  824 +++++++------
 AUTHORS                                            |    1 +
 VERSION                                            |    2 +-
 configure                                          |   39 +-
 configure.ac                                       |   11 +
 debian/changelog                                   |   18 +
 debian/patches/{ => binary-indep}/manpages.patch   |    0
 debian/patches/{ => binary-indep}/sfnt2fon.patch   |    0
 debian/patches/{ => debpaths}/addons.patch         |    0
 debian/patches/{ => debpaths}/makefile.patch       |   16 -
 debian/patches/disable/addons-download.patch       |    1 +
 debian/patches/disable/rerun-configure.patch       |   21 +
 debian/patches/disable/tests.patch                 |    3 +
 debian/patches/font-divbyzero.patch                |    2 +
 debian/patches/kfreebsd.patch                      |   13 -
 .../patches/manpages-wineserver-persistence.patch  |    3 +-
 debian/patches/printer-resolution.patch            |    1 +
 debian/patches/series                              |   13 +-
 dlls/advapi32/service.c                            |   65 +-
 dlls/amstream/amstream.c                           |    2 +-
 dlls/amstream/mediastreamfilter.c                  |    8 +-
 dlls/api-ms-win-core-job-l1-1-0/Makefile.in        |    1 +
 .../api-ms-win-core-job-l1-1-0.spec                |    1 +
 dlls/api-ms-win-core-job-l2-1-0/Makefile.in        |    1 +
 .../api-ms-win-core-job-l2-1-0.spec                |    6 +
 dlls/api-ms-win-core-namespace-l1-1-0/Makefile.in  |    1 +
 .../api-ms-win-core-namespace-l1-1-0.spec          |    6 +
 .../Makefile.in                                    |    1 +
 .../api-ms-win-core-normalization-l1-1-0.spec      |    5 +
 .../Makefile.in                                    |    1 +
 .../api-ms-win-core-string-obsolete-l1-1-0.spec    |   10 +
 dlls/api-ms-win-core-toolhelp-l1-1-0/Makefile.in   |    1 +
 .../api-ms-win-core-toolhelp-l1-1-0.spec           |    7 +
 .../api-ms-win-core-util-l1-1-0.spec               |    4 +-
 .../api-ms-win-crt-runtime-l1-1-0.spec             |    2 +-
 .../api-ms-win-crt-stdio-l1-1-0.spec               |    4 +-
 dlls/api-ms-win-eventlog-legacy-l1-1-0/Makefile.in |    1 +
 .../api-ms-win-eventlog-legacy-l1-1-0.spec         |    6 +
 .../Makefile.in                                    |    1 +
 .../api-ms-win-shell-shellfolders-l1-1-0.spec      |   14 +
 dlls/apphelp/apphelp.c                             |    6 +
 dlls/apphelp/apphelp.spec                          |    2 +-
 dlls/comctl32/tests/listview.c                     |    3 +
 dlls/comctl32/tests/syslink.c                      |    6 +
 dlls/comctl32/tests/tooltips.c                     |    5 +-
 dlls/comctl32/treeview.c                           |    9 +-
 dlls/crtdll/crtdll.spec                            |    2 +-
 dlls/crypt32/tests/base64.c                        |    5 +-
 dlls/d3d10/d3d10_main.c                            |   16 +-
 dlls/d3d10/d3d10_private.h                         |    4 -
 dlls/d3d10/utils.c                                 |   15 -
 dlls/d3d10core/tests/device.c                      |    9 +-
 dlls/d3d11/buffer.c                                |    8 +-
 dlls/d3d11/d3d11_main.c                            |    8 +-
 dlls/d3d11/d3d11_private.h                         |    2 +-
 dlls/d3d11/device.c                                |   83 +-
 dlls/d3d11/inputlayout.c                           |   12 +-
 dlls/d3d11/tests/d3d11.c                           |   67 +-
 dlls/d3d11/texture.c                               |    4 +-
 dlls/d3d11/utils.c                                 |    2 +-
 dlls/d3d11/view.c                                  |    6 +-
 dlls/d3d8/buffer.c                                 |   20 +-
 dlls/d3d8/device.c                                 |   45 +-
 dlls/d3d8/tests/device.c                           |  141 ++-
 dlls/d3d9/buffer.c                                 |   20 +-
 dlls/d3d9/d3d9_private.h                           |    2 +-
 dlls/d3d9/device.c                                 |   85 +-
 dlls/d3d9/surface.c                                |   25 -
 dlls/d3d9/tests/d3d9ex.c                           |  447 ++++++-
 dlls/d3d9/tests/device.c                           |    8 +-
 dlls/d3d9/texture.c                                |    6 +
 dlls/d3dcompiler_43/reflection.c                   |   29 +-
 dlls/d3dcompiler_43/utils.c                        |   62 +-
 dlls/d3dx10_43/async.c                             |   35 +
 dlls/d3dx10_43/d3dx10_43.spec                      |   10 +-
 dlls/d3dx10_43/tests/Makefile.in                   |    2 +-
 dlls/d3dx10_43/tests/d3dx10.c                      |  115 +-
 dlls/dbghelp/dbghelp_private.h                     |    2 +-
 dlls/dbghelp/module.c                              |    2 +-
 dlls/dbghelp/source.c                              |   25 +-
 dlls/ddraw/ddraw_private.h                         |    6 +-
 dlls/ddraw/device.c                                |  116 +-
 dlls/ddraw/palette.c                               |   24 +-
 dlls/ddraw/surface.c                               |    6 +-
 dlls/ddraw/tests/d3d.c                             |  275 -----
 dlls/ddraw/tests/ddraw1.c                          |  542 +++++++++
 dlls/ddraw/tests/ddraw2.c                          |  497 ++++++++
 dlls/ddraw/tests/ddraw4.c                          |  464 +++++++-
 dlls/ddraw/tests/ddraw7.c                          |    2 +-
 dlls/ddraw/vertexbuffer.c                          |   37 +-
 dlls/ddraw/viewport.c                              |   91 +-
 dlls/dinput/device.c                               |   54 +-
 dlls/dinput/effect_linuxinput.c                    |  350 ++++--
 dlls/dinput/joystick.c                             |   10 +-
 dlls/dinput/joystick_linux.c                       |   21 +-
 dlls/dinput/joystick_linuxinput.c                  |   21 +-
 dlls/dinput/joystick_osx.c                         |    2 +-
 dlls/dinput/tests/joystick.c                       |  255 +++-
 dlls/dmime/performance.c                           |    4 +-
 dlls/dmusic/clock.c                                |    2 +-
 dlls/dmusic/dmusic.c                               |    2 +-
 dlls/dwrite/font.c                                 |    4 +
 dlls/dwrite/tests/font.c                           |    5 -
 dlls/dxgi/device.c                                 |    8 +-
 dlls/dxgi/dxgi_private.h                           |    6 +-
 dlls/dxgi/output.c                                 |   67 +-
 dlls/dxgi/surface.c                                |    6 +-
 dlls/dxgi/swapchain.c                              |   31 +-
 dlls/dxgi/tests/device.c                           |  575 ++++++++-
 dlls/dxgi/utils.c                                  |   17 +-
 dlls/gdi32/dibdrv/primitives.c                     | 1225 ++++++++++++++------
 dlls/gdi32/tests/dib.c                             |   36 +-
 dlls/gdiplus/Makefile.in                           |    2 +-
 dlls/gdiplus/gdiplus_private.h                     |    1 -
 dlls/gdiplus/graphics.c                            |   18 +-
 dlls/gdiplus/image.c                               |  238 ++--
 dlls/gdiplus/imageattributes.c                     |   38 +-
 dlls/gdiplus/metafile.c                            |    1 -
 dlls/gdiplus/tests/image.c                         |   10 +-
 dlls/hidclass.sys/hid.h                            |    1 -
 dlls/hidclass.sys/main.c                           |    1 -
 dlls/hidclass.sys/pnp.c                            |   46 +-
 dlls/imm32/imm.c                                   |   97 +-
 dlls/imm32/imm32.spec                              |    2 +
 dlls/imm32/tests/imm32.c                           |   51 +-
 dlls/inetcomm/tests/mimeole.c                      |   53 +
 dlls/kernel32/kernel32.spec                        |    4 +-
 dlls/kernel32/locale.c                             |    2 +-
 dlls/kernel32/tests/locale.c                       |    8 +-
 dlls/kernel32/tests/thread.c                       |    6 +
 dlls/kernel32/time.c                               |  119 +-
 dlls/kernelbase/kernelbase.spec                    |    4 +-
 dlls/mlang/tests/mlang.c                           |   44 +-
 dlls/mmdevapi/tests/propstore.c                    |    3 +-
 dlls/msacm32/msacm32_main.c                        |    2 +
 dlls/msacm32/stream.c                              |   40 +-
 dlls/msacm32/tests/msacm.c                         |   13 +-
 dlls/mscoree/cordebug.c                            |    4 +-
 dlls/mscoree/metadata.c                            |    2 +-
 dlls/msctf/tests/inputprocessor.c                  |   26 +-
 dlls/msdaps/usrmarshal.c                           |   33 +-
 dlls/mshtml/nsio.c                                 |    3 +-
 dlls/msimtf/activeimmapp.c                         |    4 +-
 dlls/msports/Makefile.in                           |    4 +
 include/d3dx10.h => dlls/msports/main.c            |   38 +-
 dlls/msports/msports.spec                          |   11 +
 dlls/msvcr100/msvcr100.spec                        |    2 +-
 dlls/msvcr110/msvcr110.spec                        |    2 +-
 dlls/msvcr120/msvcr120.spec                        |    2 +-
 dlls/msvcr120_app/msvcr120_app.spec                |    2 +-
 dlls/msvcr70/msvcr70.spec                          |    2 +-
 dlls/msvcr71/msvcr71.spec                          |    2 +-
 dlls/msvcr80/msvcr80.spec                          |    2 +-
 dlls/msvcr90/msvcr90.spec                          |    2 +-
 dlls/msvcr90/tests/msvcr90.c                       |  167 +++
 dlls/msvcrt/except_arm.c                           |   10 +
 dlls/msvcrt/except_i386.c                          |   77 ++
 dlls/msvcrt/except_x86_64.c                        |   11 +
 dlls/msvcrt/msvcrt.h                               |  197 ++++
 dlls/msvcrt/msvcrt.spec                            |    2 +-
 dlls/msvcrt/scanf.c                                |   39 +-
 dlls/msvcrt20/msvcrt20.spec                        |    2 +-
 dlls/msvcrt40/msvcrt40.spec                        |    2 +-
 dlls/msvcrtd/msvcrtd.spec                          |    2 +-
 dlls/netcfgx/netcfg.c                              |    2 +-
 dlls/ntdll/directory.c                             |    3 +
 dlls/ntdll/ntdll.spec                              |    4 +-
 dlls/ntdll/reg.c                                   |   47 +-
 dlls/ntdll/signal_x86_64.c                         |   13 +-
 dlls/ntdll/tests/exception.c                       |  172 +++
 dlls/ntdll/tests/threadpool.c                      |  280 ++++-
 dlls/ntdll/threadpool.c                            |  159 ++-
 dlls/ntdll/version.c                               |    2 +-
 dlls/ntoskrnl.exe/Makefile.in                      |    1 +
 dlls/ntoskrnl.exe/ntoskrnl.c                       |  238 +++-
 dlls/ntoskrnl.exe/ntoskrnl.exe.spec                |    6 +-
 dlls/ole32/clipboard.c                             |    4 +-
 dlls/ole32/moniker.c                               |   59 +-
 dlls/ole32/rpc.c                                   |    2 +-
 dlls/ole32/tests/marshal.c                         |  148 ++-
 dlls/oleaut32/oleaut.c                             |    3 +-
 dlls/oleaut32/olefont.c                            |   20 +-
 dlls/oleaut32/tests/olefont.c                      |   15 +
 dlls/oleaut32/tests/olepicture.c                   |   40 +-
 dlls/oleaut32/tests/typelib.c                      |   26 +-
 dlls/oleaut32/typelib.c                            |  549 +++++----
 dlls/oleaut32/usrmarshal.c                         |  153 ++-
 dlls/qcap/qcap_main.c                              |    2 +-
 dlls/quartz/avisplit.c                             |    2 +-
 dlls/quartz/main.c                                 |   10 +-
 dlls/quartz/mpegsplit.c                            |    2 +-
 dlls/quartz/parser.c                               |    2 +-
 dlls/rpcrt4/rpc_epmap.c                            |   61 +-
 dlls/rpcrt4/tests/Makefile.in                      |    2 +-
 dlls/rpcrt4/tests/rpc.c                            |   18 +-
 dlls/rpcrt4/tests/server.c                         |   58 +-
 dlls/schedsvc/svc_main.c                           |   12 +-
 dlls/shell32/recyclebin.c                          |    8 +-
 dlls/shell32/shell32_main.h                        |   24 -
 dlls/shell32/shfldr_fs.c                           |   10 +-
 dlls/ucrtbase/ucrtbase.spec                        |    6 +-
 dlls/urlmon/usrmarshal.c                           |   32 +-
 dlls/user32/button.c                               |   25 +-
 dlls/user32/clipboard.c                            |  213 ++--
 dlls/user32/driver.c                               |   13 +-
 dlls/user32/edit.c                                 |   60 +-
 dlls/user32/message.c                              |    2 +-
 dlls/user32/misc.c                                 |    4 +
 dlls/user32/nonclient.c                            |    4 +-
 dlls/user32/tests/clipboard.c                      |  843 +++++++++++++-
 dlls/user32/tests/edit.c                           |  153 ++-
 dlls/user32/tests/msg.c                            |  136 ++-
 dlls/user32/uitools.c                              |  145 +--
 dlls/user32/user_main.c                            |    1 +
 dlls/user32/user_private.h                         |    4 +
 dlls/user32/win.c                                  |   20 +-
 dlls/user32/win.h                                  |    1 +
 dlls/uxtheme/uxtheme.spec                          |    2 +-
 dlls/webservices/msg.c                             |  502 ++++++--
 dlls/webservices/proxy.c                           |    9 +
 dlls/webservices/reader.c                          |    7 +-
 dlls/webservices/tests/msg.c                       |  354 ++++++
 dlls/webservices/tests/writer.c                    |  174 ++-
 dlls/webservices/webservices.spec                  |   12 +-
 dlls/webservices/writer.c                          |  131 ++-
 dlls/wined3d/arb_program_shader.c                  |   40 +-
 dlls/wined3d/ati_fragment_shader.c                 |    8 +-
 dlls/wined3d/buffer.c                              |    5 +-
 dlls/wined3d/cs.c                                  |  106 ++
 dlls/wined3d/device.c                              |   23 +-
 dlls/wined3d/directx.c                             |  103 ++
 dlls/wined3d/glsl_shader.c                         |   30 +-
 dlls/wined3d/resource.c                            |   74 +-
 dlls/wined3d/surface.c                             |   18 +-
 dlls/wined3d/swapchain.c                           |   86 +-
 dlls/wined3d/texture.c                             |   11 +-
 dlls/wined3d/utils.c                               |   62 +-
 dlls/wined3d/wined3d.spec                          |    3 +-
 dlls/wined3d/wined3d_gl.h                          |    1 +
 dlls/wined3d/wined3d_private.h                     |   16 +-
 dlls/winegstreamer/gstdemux.c                      |   67 +-
 dlls/winemac.drv/cocoa_window.h                    |    1 +
 dlls/winemac.drv/cocoa_window.m                    |   31 +-
 dlls/winemac.drv/macdrv_main.c                     |    8 +-
 dlls/winemac.drv/window.c                          |   49 +-
 dlls/winemac.drv/winemac.drv.spec                  |    1 +
 dlls/winex11.drv/clipboard.c                       |   30 +-
 dlls/winex11.drv/event.c                           |  117 +-
 dlls/winex11.drv/keyboard.c                        |   19 +-
 dlls/winex11.drv/mouse.c                           |   43 +-
 dlls/winex11.drv/window.c                          |    5 +-
 dlls/winex11.drv/winex11.drv.spec                  |    1 +
 dlls/winex11.drv/wintab.c                          |   18 +-
 dlls/winex11.drv/x11drv.h                          |   24 +-
 dlls/winex11.drv/x11drv_main.c                     |    8 +-
 dlls/winhttp/session.c                             |   22 +-
 dlls/winhttp/tests/url.c                           |    4 +-
 dlls/winhttp/url.c                                 |   93 +-
 dlls/winhttp/winhttp_private.h                     |   15 +
 dlls/wintrust/tests/softpub.c                      |   11 +-
 dlls/wpc/Makefile.in                               |    6 +
 dlls/wpc/tests/Makefile.in                         |    4 +
 dlls/wpc/tests/wpc.c                               |   49 +
 dlls/wpc/wpc.c                                     |  219 ++++
 dlls/wpc/wpc.spec                                  |    5 +
 include/d3dx10.h => dlls/wpc/wpc_classes.idl       |   20 +-
 dlls/ws2_32/async.c                                |   61 +-
 dlls/ws2_32/tests/sock.c                           |   23 +
 dlls/xinput1_3/tests/xinput.c                      |   79 +-
 dlls/xinput1_3/xinput1_3.spec                      |    1 +
 dlls/xinput1_3/xinput1_3_main.c                    |  118 +-
 include/Makefile.in                                |    1 +
 include/commctrl.h                                 |  132 ++-
 include/commctrl.rh                                |    3 +
 include/d3d10.idl                                  |    2 +-
 include/d3dx10.h                                   |   16 +
 include/d3dx10async.h                              |    6 +
 include/ddk/wdm.h                                  |    4 +-
 include/msvcrt/fpieee.h                            |  239 ++++
 include/rpcdce.h                                   |    2 +
 include/webservices.h                              |   30 +
 include/winbase.h                                  |    6 +-
 include/wine/rbtree.h                              |  378 +++---
 include/wine/server_protocol.h                     |  129 ++-
 include/wine/svcctl.idl                            |   10 +-
 include/wine/wined3d.h                             |    8 +-
 include/wine/winedxgi.idl                          |    2 +-
 include/winnls.h                                   |   16 +-
 include/winuser.h                                  |    2 +
 include/wpcapi.idl                                 |   14 +
 include/xinput.h                                   |   18 +
 loader/wine.inf.in                                 |   12 +-
 po/ja.po                                           |  154 ++-
 programs/reg/tests/reg.c                           |   30 +-
 programs/regedit/regedit.c                         |   14 +-
 programs/regedit/regproc.c                         |    6 -
 programs/rpcss/Makefile.in                         |    4 +-
 programs/rpcss/rpcss_main.c                        |  120 +-
 programs/services/rpc.c                            |   90 +-
 programs/services/services.c                       |  288 +++--
 programs/services/services.h                       |    4 +-
 programs/services/tests/service.c                  |   22 +-
 programs/winecfg/appdefaults.c                     |    2 +-
 programs/winedevice/device.c                       |  284 +++--
 programs/winemenubuilder/winemenubuilder.c         |   43 +-
 server/clipboard.c                                 |  265 ++++-
 server/protocol.def                                |   64 +-
 server/queue.c                                     |   33 +-
 server/request.c                                   |    6 +-
 server/request.h                                   |   50 +-
 server/sock.c                                      |    4 +-
 server/trace.c                                     |   91 +-
 server/user.h                                      |   11 +
 server/window.c                                    |    1 +
 tools/make_specfiles                               |    9 +
 315 files changed, 13359 insertions(+), 4700 deletions(-)

diff --cc debian/changelog
index ee97f9d,9c4058e..35b0b98
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,21 +1,30 @@@
+ wine-development (1.9.18-1) unstable; urgency=medium
+ 
+   [ Michael Gilbert ]
+   * New upstream release 1.9.18, released Sep 2, 2016.
+     - Support for multiple kernel drivers in a single process.
+     - More WebServices reader support.
+     - Various improvements in joystick support.
+     - Some more work towards the Direct3D command stream.
+     - GDI performance improvements.
+     - Improved IME window handling.
+     - Compatibility fixes in the clipboard support.
+     - Various bug fixes.
+ 
+   [ Jens Reyer ]
+   * Reorganize patches, drop kfreebsd.patch (applied upstream 1.9.18).
+ 
+  -- Michael Gilbert <mgilbert at debian.org>  Sun, 04 Sep 2016 18:12:32 +0000
+ 
 +wine-development (1.9.17-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * Remaining changes:
 +    - 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>  Mon, 29 Aug 2016 00:25:22 +0200
 +
  wine-development (1.9.17-1) unstable; urgency=medium
  
    * New upstream release 1.9.17, released Aug 19, 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