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

Jens Reyer jreyer-guest at moszumanska.debian.org
Sun Aug 28 23:56:52 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 a5796115ce63b5f10509f67ee5e7dd012a2fdac8
Merge: 4cf383c a07d04c
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Mon Aug 29 00:22:36 2016 +0200

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

 ANNOUNCE                                           |  857 ++++++-------
 AUTHORS                                            |    7 +
 VERSION                                            |    2 +-
 configure                                          |   27 +-
 configure.ac                                       |    6 +
 debian/NEWS                                        |   10 +-
 debian/changelog                                   |   19 +
 debian/control.in                                  |    2 +-
 debian/patches/font-divbyzero.patch                |    2 +-
 debian/patches/generate/request.patch              |    6 +-
 debian/patches/sfnt2fon.patch                      |    4 +-
 debian/wineVERSION.prerm                           |    2 +-
 dlls/advapi32/service.c                            |   88 +-
 dlls/api-ms-win-core-console-l2-1-0/Makefile.in    |    1 +
 .../api-ms-win-core-console-l2-1-0.spec            |   38 +
 .../api-ms-win-crt-convert-l1-1-0.spec             |    4 +-
 .../api-ms-win-crt-locale-l1-1-0.spec              |    2 +-
 .../api-ms-win-crt-math-l1-1-0.spec                |    6 +-
 .../api-ms-win-crt-stdio-l1-1-0.spec               |    2 +-
 .../api-ms-win-crt-time-l1-1-0.spec                |    4 +-
 dlls/avifil32/getframe.c                           |    2 +-
 dlls/cfgmgr32/cfgmgr32.spec                        |    2 +-
 dlls/comctl32/listview.c                           |   54 +-
 dlls/comctl32/tests/toolbar.c                      |    5 +-
 dlls/comctl32/tests/treeview.c                     |   25 +
 dlls/comctl32/treeview.c                           |   69 +-
 dlls/concrt140/Makefile.in                         |    1 +
 dlls/concrt140/concrt140.spec                      |  533 ++++++++
 dlls/d3d10core/tests/device.c                      |  117 ++
 dlls/d3d11/d3d11_private.h                         |    1 +
 dlls/d3d11/device.c                                |   12 +
 dlls/d3d11/shader.c                                |   89 +-
 dlls/d3d11/tests/d3d11.c                           |  357 +++++-
 dlls/d3d11/utils.c                                 |   12 +
 dlls/d3d8/buffer.c                                 |    4 +-
 dlls/d3d8/tests/visual.c                           |  177 +++
 dlls/d3d8/texture.c                                |    6 +-
 dlls/d3d9/buffer.c                                 |    4 +-
 dlls/d3d9/surface.c                                |    2 +-
 dlls/d3d9/tests/d3d9ex.c                           |   68 +-
 dlls/d3d9/tests/device.c                           |  116 +-
 dlls/d3d9/tests/visual.c                           |  177 +++
 dlls/d3d9/texture.c                                |    6 +-
 dlls/d3drm/device.c                                |   17 +-
 dlls/d3drm/frame.c                                 |   42 +-
 dlls/d3drm/tests/d3drm.c                           |  696 +++++++++++
 dlls/d3drm/viewport.c                              |   79 +-
 dlls/d3dx10_43/async.c                             |   24 +
 dlls/d3dx10_43/d3dx10_43.spec                      |    4 +-
 dlls/d3dx11_42/d3dx11_42.spec                      |    6 +-
 dlls/d3dx11_43/async.c                             |   34 +
 dlls/d3dx11_43/d3dx11_43.spec                      |    6 +-
 dlls/ddraw/device.c                                |    2 +-
 dlls/ddraw/tests/ddraw1.c                          |   34 +-
 dlls/ddraw/tests/ddraw2.c                          |  244 +++-
 dlls/ddraw/tests/ddraw4.c                          |  260 +++-
 dlls/ddraw/tests/ddraw7.c                          |  240 +++-
 dlls/dinput/dinput_main.c                          |   37 +-
 dlls/dinput/effect_linuxinput.c                    |    3 +
 dlls/dinput/joystick.c                             |   28 +-
 dlls/dinput/joystick_linux.c                       |  119 +-
 dlls/dinput/joystick_linuxinput.c                  |   49 +-
 dlls/dinput/tests/joystick.c                       |   37 +-
 dlls/dinput8/tests/dinput.c                        |   16 +
 dlls/dsound/primary.c                              |   45 +-
 dlls/dwrite/font.c                                 |    1 +
 dlls/dwrite/opentype.c                             |    7 +-
 dlls/dwrite/tests/analyzer.c                       |    4 +-
 dlls/dwrite/tests/font.c                           |   59 +-
 dlls/dwrite/tests/layout.c                         |   28 +-
 dlls/dxgi/swapchain.c                              |    4 +-
 dlls/dxgi/tests/device.c                           |  307 ++---
 dlls/dxgi/utils.c                                  |   12 +
 dlls/fusion/asmname.c                              |    2 +-
 dlls/fusion/tests/asmenum.c                        |    2 +-
 dlls/fusion/tests/asmname.c                        |    2 +-
 dlls/gdi32/freetype.c                              |  102 +-
 dlls/gdi32/region.c                                |   34 +-
 dlls/gdiplus/gdiplus_private.h                     |   15 +
 dlls/gdiplus/graphics.c                            |  119 +-
 dlls/gdiplus/image.c                               |    1 +
 dlls/gdiplus/metafile.c                            |  460 ++++++-
 dlls/gdiplus/tests/graphics.c                      |   58 +
 dlls/gdiplus/tests/metafile.c                      |  446 ++++++-
 dlls/hal/hal.c                                     |    5 +
 dlls/hal/hal.spec                                  |    2 +-
 dlls/hidclass.sys/device.c                         |    2 +
 dlls/hidclass.sys/pnp.c                            |  118 +-
 dlls/ieframe/tests/webbrowser.c                    |   35 +-
 dlls/inetcomm/inetcomm.spec                        |    2 +-
 dlls/inetcomm/mimeole.c                            |    8 +
 dlls/kernel32/console.c                            |   35 +-
 dlls/kernel32/kernel32.spec                        |    2 +-
 dlls/kernel32/lcformat.c                           |   19 +
 dlls/kernel32/path.c                               |   27 +-
 dlls/kernel32/sync.c                               |   37 +-
 dlls/kernel32/tests/console.c                      |  104 ++
 dlls/kernel32/tests/fiber.c                        |   26 +-
 dlls/kernel32/tests/file.c                         |   15 +-
 dlls/kernel32/tests/loader.c                       |  168 ++-
 dlls/kernel32/tests/locale.c                       |  185 +++
 dlls/kernel32/tests/path.c                         |   43 +-
 dlls/kernel32/tests/thread.c                       |  225 ++--
 dlls/kernel32/tests/virtual.c                      |    5 +-
 dlls/kernelbase/kernelbase.spec                    |    2 +-
 dlls/mmdevapi/devenum.c                            |    1 +
 dlls/mmdevapi/tests/capture.c                      |   10 +-
 dlls/mmdevapi/tests/propstore.c                    |    6 +-
 dlls/mpr/wnet.c                                    |  165 ++-
 dlls/mshtml/script.c                               |    8 +-
 dlls/msi/automation.c                              |    7 +-
 dlls/msi/msipriv.h                                 |    1 -
 dlls/msi/package.c                                 |    2 +-
 dlls/msvcirt/msvcirt.c                             |  556 +++++++--
 dlls/msvcirt/msvcirt.spec                          |  144 +--
 dlls/msvcirt/tests/msvcirt.c                       | 1295 +++++++++++++++++++-
 dlls/msvcp140/msvcp140.spec                        |   54 +-
 dlls/msvcp90/ios.c                                 |  114 +-
 dlls/msvcp90/misc.c                                |  184 ++-
 dlls/msvcp90/msvcp_main.c                          |   50 +-
 dlls/msvcr100/msvcr100.spec                        |    4 +-
 dlls/msvcr110/msvcr110.spec                        |    6 +-
 dlls/msvcr120/msvcr120.spec                        |   16 +-
 dlls/msvcr120/tests/msvcr120.c                     |   49 +
 dlls/msvcr120_app/msvcr120_app.spec                |   16 +-
 dlls/msvcr80/msvcr80.spec                          |    4 +-
 dlls/msvcr90/msvcr90.spec                          |    4 +-
 dlls/msvcr90/tests/msvcr90.c                       |   88 ++
 dlls/msvcrt/except_x86_64.c                        |    1 -
 dlls/msvcrt/locale.c                               |   25 +
 dlls/msvcrt/math.c                                 |   34 +
 dlls/msvcrt/mbcs.c                                 |    3 +
 dlls/msvcrt/msvcrt.h                               |    2 +
 dlls/msvcrt/msvcrt.spec                            |    2 +-
 dlls/msvcrt/printf.h                               |   11 +-
 dlls/msvcrt/scanf.c                                |   17 +
 dlls/msvcrt/string.c                               |    3 +
 dlls/msvcrt/tests/time.c                           |   10 +
 dlls/msvcrt/time.c                                 |   60 +-
 dlls/msvcrt20/msvcrt20.spec                        |  144 +--
 dlls/msvcrt40/msvcrt40.spec                        |  144 +--
 dlls/ntdll/directory.c                             |   13 +-
 dlls/ntdll/large_int.c                             |   50 +
 dlls/ntdll/ntdll.spec                              |   14 +-
 dlls/ntdll/process.c                               |   20 +
 dlls/ntdll/signal_x86_64.c                         |  299 +++--
 dlls/ntdll/tests/directory.c                       |    2 +
 dlls/ntdll/tests/exception.c                       |   83 ++
 dlls/ntdll/tests/info.c                            |   18 +-
 dlls/ntdll/threadpool.c                            |    2 +-
 dlls/ntdll/virtual.c                               |    4 +-
 dlls/ntoskrnl.exe/ntoskrnl.c                       |   11 +-
 dlls/ntoskrnl.exe/ntoskrnl.exe.spec                |    8 +-
 dlls/odbc32/proxyodbc.c                            |    2 +-
 dlls/ole32/tests/clipboard.c                       |   70 +-
 dlls/ole32/tests/compobj.c                         |    4 +-
 dlls/ole32/tests/propvariant.c                     |   11 +-
 dlls/oleaut32/tests/safearray.c                    |    4 +-
 dlls/oledb32/datainit.c                            |   24 +-
 dlls/oledb32/tests/database.c                      |    4 +
 dlls/powrprof/powrprof.c                           |    6 +
 dlls/powrprof/powrprof.spec                        |    1 +
 dlls/quartz/dsoundrender.c                         |    6 +-
 dlls/quartz/filtergraph.c                          |   50 +-
 dlls/quartz/videorenderer.c                        |    4 +-
 dlls/quartz/vmr9.c                                 |    4 +-
 dlls/riched20/editor.c                             |   10 +-
 dlls/riched20/paint.c                              |   43 +-
 dlls/rpcrt4/tests/ndr_marshall.c                   |    4 +-
 dlls/scrrun/tests/dictionary.c                     |    8 +-
 dlls/setupapi/misc.c                               |    9 +
 dlls/setupapi/setupapi.spec                        |    2 +-
 dlls/setupapi/tests/misc.c                         |   10 +
 dlls/shell32/tests/appbar.c                        |    4 +-
 dlls/shell32/tests/shelldispatch.c                 |    4 +-
 dlls/shell32/tests/shellole.c                      |    4 +-
 dlls/shlwapi/tests/ordinal.c                       |    4 +-
 dlls/strmbase/mediatype.c                          |   13 +-
 dlls/t2embed/main.c                                |   23 +-
 dlls/t2embed/tests/Makefile.in                     |    2 +-
 dlls/t2embed/tests/t2embed.c                       |   55 +
 dlls/ucrtbase/tests/printf.c                       |   19 +
 dlls/ucrtbase/ucrtbase.spec                        |   18 +-
 dlls/user32/dialog.c                               |    3 +
 dlls/user32/mdi.c                                  |   11 -
 dlls/user32/tests/clipboard.c                      |  372 ++++++
 dlls/user32/tests/dde.c                            |    6 -
 dlls/user32/tests/dialog.c                         |   50 +
 dlls/user32/tests/input.c                          |    6 +-
 dlls/user32/tests/menu.c                           |    6 +-
 dlls/user32/tests/win.c                            |  193 ++-
 dlls/user32/win.c                                  |    2 +
 dlls/usp10/tests/usp10.c                           |   71 +-
 dlls/usp10/usp10.c                                 |   29 +-
 dlls/usp10/usp10_internal.h                        |    4 +-
 dlls/vcomp/main.c                                  |    3 -
 dlls/vcomp100/Makefile.in                          |    3 -
 dlls/vcomp100/main.c                               |   46 -
 dlls/vcomp110/Makefile.in                          |    3 -
 dlls/vcomp110/main.c                               |   46 -
 dlls/vcomp120/Makefile.in                          |    3 -
 dlls/vcomp120/main.c                               |   47 -
 dlls/vcomp140/Makefile.in                          |    1 +
 dlls/vcomp140/vcomp140.spec                        |  113 ++
 dlls/vcomp90/Makefile.in                           |    3 -
 dlls/vcomp90/main.c                                |   46 -
 dlls/webservices/channel.c                         |   65 +-
 dlls/webservices/msg.c                             |  414 ++++++-
 dlls/webservices/tests/channel.c                   |   15 +-
 dlls/webservices/tests/msg.c                       |  218 ++++
 dlls/webservices/tests/writer.c                    |   40 +
 dlls/webservices/webservices.spec                  |    8 +-
 dlls/webservices/webservices_private.h             |    2 +-
 dlls/webservices/writer.c                          |   38 +-
 dlls/winealsa.drv/mmdevdrv.c                       |    2 +-
 dlls/winecoreaudio.drv/mmdevdrv.c                  |    2 +-
 dlls/wined3d/buffer.c                              |   20 +-
 dlls/wined3d/cs.c                                  |    3 +
 dlls/wined3d/device.c                              |   15 +-
 dlls/wined3d/directx.c                             |    6 +
 dlls/wined3d/glsl_shader.c                         |    2 +-
 dlls/wined3d/resource.c                            |    5 +
 dlls/wined3d/state.c                               |  148 +--
 dlls/wined3d/texture.c                             |   22 +-
 dlls/wined3d/utils.c                               |    4 +
 dlls/wined3d/wined3d.spec                          |    3 +-
 dlls/wined3d/wined3d_private.h                     |    4 +
 dlls/winejoystick.drv/joystick_linux.c             |   35 +-
 dlls/wineoss.drv/mmdevdrv.c                        |    2 +-
 dlls/winepulse.drv/mmdevdrv.c                      |    2 +-
 dlls/winex11.drv/clipboard.c                       |   77 +-
 dlls/winex11.drv/keyboard.c                        |    5 +-
 dlls/winhttp/session.c                             |    9 +-
 dlls/winhttp/tests/url.c                           |   71 +-
 dlls/winhttp/tests/winhttp.c                       |    4 +-
 dlls/winhttp/url.c                                 |  158 ++-
 dlls/wininet/http.c                                |   11 +-
 dlls/wininet/tests/http.c                          |   65 +-
 dlls/winmm/tests/joystick.c                        |    5 +-
 dlls/winmm/tests/wave.c                            |    1 +
 dlls/winmm/waveform.c                              |    2 +
 dlls/wlanapi/main.c                                |    6 +
 dlls/wlanapi/wlanapi.spec                          |    2 +-
 dlls/wshom.ocx/tests/wshom.c                       |    4 +-
 include/cfgmgr32.h                                 |    1 +
 include/commctrl.h                                 |    2 +-
 include/config.h.in                                |    9 +
 include/d3d11.idl                                  |    5 +
 include/d3dx10async.h                              |    8 +
 include/d3dx11async.h                              |    8 +
 include/ddk/wdm.h                                  |    3 +
 include/devpkey.h                                  |    6 +-
 include/dinput.h                                   |    3 +-
 include/msvcrt/limits.h                            |    6 +-
 include/powrprof.h                                 |    3 +
 include/webservices.h                              |   38 +
 include/winbase.h                                  |    6 +
 include/wine/exception.h                           |    1 +
 include/wine/server_protocol.h                     |   25 +-
 include/wine/svcctl.idl                            |    2 +-
 include/wine/wined3d.h                             |    7 +-
 include/winnt.h                                    |   13 +
 include/wlanapi.h                                  |    1 +
 loader/preloader.c                                 |    2 +
 loader/wine.inf.in                                 |    2 +-
 po/zh_CN.po                                        | 1269 +++++++++----------
 programs/reg/reg.c                                 |   26 +-
 programs/reg/tests/reg.c                           |  269 ++++
 programs/regedit/regproc.c                         |   56 +-
 programs/services/rpc.c                            |  289 ++---
 programs/services/services.c                       |  152 ++-
 programs/services/services.h                       |   15 +-
 programs/services/tests/service.c                  |   31 +
 programs/wineconsole/dialog.c                      |   25 +-
 programs/wineconsole/registry.c                    |   66 +-
 programs/wineconsole/user.c                        |   15 +-
 programs/wineconsole/winecon_private.h             |    4 +-
 programs/wineconsole/wineconsole.c                 |   24 +
 programs/winedevice/device.c                       |  185 ++-
 server/console.c                                   |   18 +-
 server/mapping.c                                   |    2 +-
 server/protocol.def                                |   24 +-
 server/request.h                                   |   34 +-
 server/trace.c                                     |   22 +-
 tools/make_specfiles                               |    3 +
 285 files changed, 13290 insertions(+), 3816 deletions(-)

diff --cc debian/changelog
index 81d578d,fb6e4bb..9a6620c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,22 +1,31 @@@
+ wine-development (1.9.17-1) unstable; urgency=medium
+ 
+   * New upstream release 1.9.17, released Aug 19, 2016.
+     - Better exception handling on 64-bit.
+     - Various improvements in joystick support.
+     - Some more stream support in the C++ runtime.
+     - Font embedding improvements.
+     - More metafile support in GDI+.
+     - Various bug fixes.
+     - Check for sysinfo function to fix FTBFS on hurd and kfreebsd
+       (closes: #833956). Thanks Pino Toscano and Sebastian Lackner.
+     - Correct wrong symlink in wine.inf to fix regedit exporting the
+       registry (closes: #832129). Thanks Joerg Schiermeier.
+   * Refresh patches.
+   * Make "update-alternatives --remove" quiet.
+   * Make libc6-dev dependency portable.
+ 
+  -- Jens Reyer <jre.winesim at gmail.com>  Mon, 22 Aug 2016 15:08:33 +0200
+ 
 +wine-development (1.9.16-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>  Tue, 16 Aug 2016 03:18:57 +0200
 +
  wine-development (1.9.16-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